Commit Graph

18 Commits

Author SHA1 Message Date
Herbert Maschke fa6103df09 code style improvements 2020-02-26 18:31:49 +01:00
Herbert Maschke 13d73a3b1c Merge branch 'bagisto/master' into discount-issue 2020-02-26 16:43:33 +01:00
Herbert Maschke 6810339191 also fix discount apply WITH taxes (full amount) instead of BEFORE taxes 2020-02-26 16:41:59 +01:00
rahul shukla b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
Steffen Mahler d3c7682974 remove unnecessary line 2020-02-25 10:33:13 +01:00
Steffen Mahler c7cd5f5f51 remove line 2020-02-25 10:09:00 +01:00
SteffenMahler 24dd893de1
fix issue in coupon handling
I found a little issue on handling coupons in cart.

To reproduce this issue you have to do:
- create three simple products
- create a cart rule with coupon
- assign conditions, so that sku of product 1 and product 2 will match the coupon
- add product 1 to cart
- add product 2 to cart
- last add product 3 to cart (which has no coupon matching)
- apply the coupon

You get an error message.

So therefore I made some little changes.
2020-02-25 09:33:47 +01:00
Herbert Maschke f7219767ed fix CartRuleRepository once more 2020-02-20 13:26:14 +01:00
Herbert Maschke 75d22eaf3a improve validation style of starts_from and ends_till in CartRuleRepository 2020-02-20 11:26:12 +01:00
rahul shukla e82fb888ab merge with master 2020-02-20 11:00:34 +05:30
rahul shukla 8835ab75dd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-20 10:59:29 +05:30
rahul shukla e5a0bc8a0e Issue #2500 and chaneelog updated 2020-02-20 10:56:59 +05:30
rahul shukla d999bc18d9 Issue #2500 fixed 2020-02-19 21:16:20 +05:30
rahul shukla 229117c7b9 change log updated and Isssue #2500 fixed 2020-02-19 21:10:27 +05:30
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
jitendra 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30