Commit Graph

3857 Commits

Author SHA1 Message Date
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0
Product multiple image select feature added
2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
rahulshukla-home 83cb0ff3d8 Issue #2987 2020-05-06 11:39:45 +05:30
rahulshukla-home af3b152681 Issue #2987 2020-05-06 11:36:07 +05:30
Jitendra Singh 7f3e564c14
Merge pull request #2966 from Haendlerbund/add_tests_for_cart_rules
Add tests for cart rules
2020-05-01 18:11:03 +05:30
Jitendra Singh 7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid
introduce channel and customer group filter for cart rule grid
2020-05-01 18:09:48 +05:30
Jitendra Singh e6ed484e19
Merge pull request #2978 from rahulcs0082/development
favicon for admin login
2020-05-01 16:06:53 +05:30
Jitendra Singh 0aaa1fd030
Merge pull request #2983 from Haendlerbund/fix-randomly-failing-tax-cest
Fix randomly failing TaxCest and CartTaxesCest
2020-05-01 16:05:48 +05:30
Steffen Mahler 95f190375e set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too 2020-05-01 11:18:56 +02:00
Jitendra Singh b405ebf57f
Merge pull request #2977 from shubhwebkul/master
minor bug fix
2020-05-01 14:18:38 +05:30
Jitendra Singh f163abe1f8
Merge pull request #2965 from Haendlerbund/issue-2964/bugfix-api-exception-buying-nonstockable-item
resolve issue 2964
2020-05-01 14:00:53 +05:30
rahulshukla-home 584b2ae9bd favicon for admin login 2020-04-30 18:31:41 +05:30
Shubham Mehrotra 9603befdec Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-30 17:21:46 +05:30
Shubham Mehrotra 235b0e6809 #2974 2020-04-30 17:21:41 +05:30
rahulshukla-home 40db94bf25 Issue #2969 2020-04-29 17:21:07 +05:30
rahulshukla-home 2753c7b1d5 configuration added for favicon in admin 2020-04-29 16:35:04 +05:30
rahulshukla-home fee6645138 Issue #2942 2020-04-29 14:35:49 +05:30
rahulshukla-home 65f894689b Issue #2942 2020-04-29 14:32:56 +05:30
Steffen Mahler da90ed31b5 refactoring, variable renamed 2020-04-29 10:49:36 +02:00
Steffen Mahler 214d7a8161 merge branch 'add_tests_for_cart_rules' of https://github.com/Haendlerbund/bagisto into add_tests_for_cart_rules 2020-04-29 10:42:31 +02:00
Steffen Mahler 5d43e2b8bb type hint changed 2020-04-29 10:40:41 +02:00
SteffenMahler ede46da84b
Merge branch 'master' into add_tests_for_cart_rules 2020-04-29 10:31:06 +02:00
rahulshukla-home 6118cabbde localization error message added in velocity theme 2020-04-29 13:55:04 +05:30
Annika Wolff 5e1c0ac5d2 resolve issue 2964 2020-04-29 10:03:37 +02:00
Herbert Maschke 3154d27f52 introduce channel and customer group filter for cart rule grid 2020-04-29 09:19:47 +02:00
Steffen Mahler d973ec94c0 add CartRuleCest 2020-04-28 18:15:40 +02:00
Jitendra Singh be3fe03e27
Merge pull request #2959 from jitendra-webkul/1.0
Issue #2945 fixed
2020-04-28 20:48:08 +05:30
Pranshu Tomar b5ebfe79ea Issue #2945 fixed 2020-04-28 20:34:14 +05:30
Jitendra Singh a8c969d019
Merge pull request #2958 from jitendra-webkul/1.0
Issue #2954 fixed
2020-04-28 20:03:36 +05:30
Pranshu Tomar 1a716047ac Issue #2954 fixed 2020-04-28 19:57:30 +05:30
Pranshu Tomar 16fcb02502 Removed unnecessary code from CartController 2020-04-28 19:32:50 +05:30
Pranshu Tomar 559954e88d Issue #2954 fixed 2020-04-28 19:22:30 +05:30
namvarii cd8e994efa
fix translation in add attribute button
fix add button not translated to other language.
2020-04-28 18:09:21 +04:30
Jitendra Singh 10b05e58b1
Merge pull request #2955 from rahulcs0082/development
max price issue in category
2020-04-28 17:30:50 +05:30
rahulshukla-home abac3a297f max price issue in category 2020-04-28 14:40:08 +05:30
Jitendra Singh 73ca29c476
Merge pull request #2953 from rahulcs0082/development
fix category issue and change country,state order
2020-04-28 11:19:07 +05:30
Jitendra Singh 0e4a5e792f
Merge pull request #2947 from shubhwebkul/master
resolved issue with product images carousel
2020-04-28 11:18:52 +05:30
rahulshukla-home 837c5d44fa fix category issue and change country,state order 2020-04-28 08:14:53 +05:30
Jitendra Singh 22b4079fdb
Merge pull request #2952 from jitendra-webkul/1.0
Auto exchange rate feature added
2020-04-27 20:08:26 +05:30
Pranshu Tomar b3b20a904c Auto exchange rate feature added 2020-04-27 19:57:13 +05:30
Shubham Mehrotra 2a5c65bcea Merge branch 'master' of https://github.com/bagisto/bagisto 2020-04-27 13:44:07 +05:30
Shubham Mehrotra 0242a0cf2e resolved issue with product images carousel 2020-04-27 13:43:22 +05:30
Jitendra Singh b3e18c063e
Merge pull request #2946 from jitendra-webkul/1.0
Cancel feature added in customer order
2020-04-27 13:14:41 +05:30
Pranshu Tomar 579490779c Cancel feature added in customer order 2020-04-27 12:56:09 +05:30
Jitendra Singh 8d82b19d83
Merge pull request #2777 from gfd6th/master
Add Cacheable Trait to Repository
2020-04-27 11:34:57 +05:30
Jitendra Singh 30061b8f8d
Merge pull request #2924 from cagartner/added_new_events_to_core
Added new events to customer update and checkou, fixed some view rend…
2020-04-27 11:31:09 +05:30
Jitendra Singh 4115a3a4df
Merge pull request #2932 from shubhwebkul/master
misc. bug fixes
2020-04-27 11:22:12 +05:30
Jitendra Singh aababbf66e
Merge pull request #2934 from Haendlerbund/add-booking-product-template-only-if-view-exists
Booking Products: Inject template only if exists
2020-04-27 11:20:19 +05:30
Vivek d653cbd1b4 [Updated: getBaseImage() method updated for configurable product.] 2020-04-24 22:25:08 +05:30
Annika Wolff 7ab7654c6b add check if view exists 2020-04-24 14:54:53 +02:00