Commit Graph

51 Commits

Author SHA1 Message Date
Jitendra Singh d547ab5058
Merge pull request #1090 from prashant-webkul/development
Development
2019-06-21 16:28:59 +05:30
rahul shukla df57ef9f84 issue #1086 2019-06-21 12:05:37 +05:30
Prashant Singh 8c9fb32ab1 Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days 2019-06-21 04:15:45 +05:30
Prashant Singh 937d91ea5b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-20 18:10:07 +05:30
rahul shukla 12846df91c quantity issue in discount 2019-06-20 17:49:14 +05:30
Prashant Singh 264d2e3c9e Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule 2019-06-20 13:03:01 +05:30
rahul shukla d76d8bd129 flash message for discount & error 2019-06-19 21:18:16 +05:30
Prashant Singh d1c0be06ae Cart rule coupons sync bugs fixed 2019-06-19 14:57:13 +05:30
Prashant Singh 8e648af885 Fixed issue #1003 2019-06-19 14:52:30 +05:30
Prashant Singh bf6a6109f4 Fixed issue #1057 2019-06-19 11:16:01 +05:30
Prashant Singh e404465cc7 Fixed an issue when only one cart rule was getting applied it was also returning db instance of cart rule with it 2019-06-18 20:16:51 +05:30
Prashant Singh c2320410ab cart rule issue fix 2019-06-18 19:17:16 +05:30
Prashant Singh e0f93aae56 Fixed issue in cart rule actions 2019-06-18 19:14:49 +05:30
Prashant Singh 9e80687960 Fixed customer group bug in cart rule and fixed a bug in coupon apply rule 2019-06-18 19:00:24 +05:30
Prashant Singh bcdb4efb6c Fixed a bug in application of cart rule 2019-06-17 18:48:54 +05:30
Prashant Singh 9c379f1ba4 Bug fix in cart rule 2019-06-17 16:22:18 +05:30
Prashant Singh 82d916c646 cart rule action percent of product changed to base price of item 2019-06-17 16:20:53 +05:30
Prashant Singh d0c5589800 all calculations now changed to base price 2019-06-17 14:25:38 +05:30
Prashant Singh c2c0836b85 Couponable rule getting over ride by previously applied non-couponable rule 2019-06-17 13:09:21 +05:30
Prashant Singh b79e45ee7b Clearing discount when applying or updating a new rule over current cart 2019-06-17 12:34:56 +05:30
Prashant Singh f3437ee214 Fixed issues with discount as collect totals was not getting called on applying couponable rule 2019-06-17 12:33:34 +05:30
Prashant Singh 90c229442d Fixed issues with testing criteria of cart rule conditions 2019-06-17 12:24:19 +05:30
Prashant Singh ea185aad7b Discount package bug fixes and complete refactor with overriding features for actions 2019-06-17 08:56:30 +05:30
Prashant Singh b390d668f0 Added customer groups conditions in non couponable rules 2019-06-16 22:56:26 +05:30
Prashant Singh ba31ecd527 Cart rule create and edit forms bug fixes 2019-06-16 22:18:19 +05:30
Prashant Singh 15abe379e0 Changed frontend attributes and syntax fixes in checkout 2019-06-16 17:26:06 +05:30
Prashant Singh 9ae4f8a801 Fixed issues with cart rule customer groups 2019-06-15 18:47:53 +05:30
Prashant Singh 0927786cee Fixed issue with order summary rendering on cart page 2019-06-15 14:56:24 +05:30
Prashant Singh eaa755bbea Fixed discount on frontend 2019-06-15 13:13:07 +05:30
Prashant Singh 8d68be8e07 Rule condition discount calculation now working properly 2019-06-15 12:27:54 +05:30
Prashant Singh 3a8b923f5c Discount rule 2019-06-14 23:48:08 +05:30
Prashant Singh 0188644fce Prepared standard responses when applying couponable rules 2019-06-14 20:04:32 +05:30
Prashant Singh bec9ebe7fb coupon section fix in review-order component 2019-06-14 19:52:58 +05:30
Prashant Singh 1e865986c4 improved conditions check in applying cart rules 2019-06-14 19:24:15 +05:30
Prashant Singh 4bfefd3a07 base sync 2019-06-14 13:22:37 +05:30
Prashant Singh c52238e45e Cart rule frontend normalization 2019-06-14 13:21:17 +05:30
Prashant Singh 7f9409bd8e Checkout and cart page now coupled with cart rules 2019-06-14 12:10:03 +05:30
Prashant Singh e9a0588185 discount rule fixes 2019-06-13 22:19:44 +05:30
jitendra 6e8c0da054 Fixed conflicts 2019-06-13 19:48:30 +05:30
jitendra 806f8f71f6 Added discount amount to cart item 2019-06-13 19:34:13 +05:30
Prashant Singh abf46c8a99 Added discount amount in cart item table 2019-06-13 19:30:00 +05:30
Prashant Singh a27bae1c2d All assets compiled for production 2019-06-13 19:08:42 +05:30
Prashant Singh 0aaf3d68e1 Ui package assets compiled for production 2019-06-13 18:20:09 +05:30
Prashant Singh 6b9be23cb0 fixed issue in cart rule for add condition button and exception while updating cart rule 2019-06-11 14:38:57 +05:30
Prashant Singh a7592b233d Fixed bug #1003 2019-06-11 12:26:54 +05:30
Prashant Singh 64c249983d Fixed 2019-06-10 18:28:17 +05:30
Prashant Singh 8b5ac835e0 Fixed bugs in creation of cart rule form 2019-06-10 18:26:12 +05:30
Prashant Singh e20e29b0bd Fixed bug in cart rule form 2019-06-10 16:44:39 +05:30
Prashant Singh 451000c0d5 disabled customer groups from cart rules 2019-06-10 16:41:31 +05:30
Prashant Singh cfb16da64a fixed issue #994 2019-06-10 15:21:45 +05:30