Commit Graph

157 Commits

Author SHA1 Message Date
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Prashant Singh 0e51a9eab2 Changed minimum php version to 7.2 2019-09-04 11:39:20 +05:30
Prashant Singh 60413b252a Fixed issue #1379 2019-09-02 22:47:03 +05:30
Prashant Singh ca3dfe804c Fixed issue #1380 2019-09-02 13:52:28 +05:30
Prashant Singh f8e9f37c5d Current discount actions are normalized again with safe conditions implemented 2019-08-31 18:18:28 +05:30
Prashant Singh d31d9d9916 Isolation case for FixedAction in CartRule fixed 2019-08-31 17:59:00 +05:30
Prashant Singh c19159ddc2 Validation case for cart rule fix, the rule was not getting deleted from cart and cartrulecart's table 2019-08-31 17:20:55 +05:30
Prashant Singh f78d9e8487 Fixed the issue #1372 2019-08-31 15:21:23 +05:30
Prashant Singh 44aff5f761 FixedAmount action class added provision to check more if rule's disc is greater than item's then discount will be equal to item's price 2019-08-27 14:51:47 +05:30
Prashant Singh 75ccc47923 The non attribute case of Cart rule action AdjustWholeCartToPercent was checking for product id and it didn't needed any product_id checks there. 2019-08-27 13:28:08 +05:30
Prashant Singh fb52c4bffc WIP: Frontend resolution of catalog rule pricing 2019-08-22 18:57:35 +05:30
Prashant Singh c21ad00ece Cart rules normalization complete 2019-08-22 16:54:25 +05:30
Prashant Singh cf5cc40acb Normalized cart action rules 2019-08-22 16:03:08 +05:30
Prashant Singh 5b33eb4a56 Fixed issue #1286 2019-08-22 15:59:54 +05:30
Prashant Singh ee4c4c43cb Fixed all actions of Cart rules 2019-08-22 15:18:27 +05:30
Prashant Singh 852a6b91af More normalization added in cart rule actions for FixedAmount & PercetnOfProduct 2019-08-22 11:05:25 +05:30
Prashant Singh 7a1b73f1c7 Cart rule action PercentOfProduct max discount quantity fixes 2019-08-21 17:26:23 +05:30
Prashant Singh 151c7a830a Fixed issues related to empty attribute conditions 2019-08-21 16:10:39 +05:30
Prashant Singh 171b48453e Made cart rule conditions interpreter fault tolerant to missing attributes 2019-08-21 15:22:37 +05:30
Prashant Singh 05c5425c96 Added home page SEO under channel edit and create forms and fixed issue #1319 2019-08-21 13:38:07 +05:30
Prashant Singh ec89315b42 Fixed issue #1324 2019-08-21 11:16:01 +05:30
Prashant Singh 8cf6c41fc5 Fixed issue #1268 2019-08-20 13:31:59 +05:30
Prashant Singh 0ea994502d Fixed issues with Carbon instance and applied redirect to catalog rule index after applying rules 2019-08-20 11:46:20 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Prashant Singh 8a9198e5d9 Catalog rules tie break in progress, squased a line of dead code in CartRuleController 2019-08-19 12:36:43 +05:30
Prashant Singh aca7b4c6c7 Catalog rule tie breaker content in progress 2019-08-17 20:18:39 +05:30
Prashant Singh 1d1018ac50 Refactoring of cart rules and syntax standard sugar 2019-08-17 17:40:17 +05:30
Prashant Singh bb972c6e48 CMS Bug fixes and updated readme 2019-08-17 15:42:24 +05:30
Prashant Singh 44c33825e0 Cart discount helper namespace fix 2019-08-14 16:53:05 +05:30
Prashant Singh 2a36c6bd0e Catalog rule implementation in progress 2019-08-12 19:23:33 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Prashant Singh 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +05:30
Prashant Singh 3ca4b48ac3 Catalog rule update form in progress 2019-08-09 04:10:45 +05:30
Prashant Singh 55ead412ce Catalog rule create form implemented 2019-08-08 11:38:23 +05:30
Prashant Singh 6d41d37c3b Catalog rules migrations finalized 2019-08-08 07:28:08 +05:30
Prashant Singh bb12e07212 Cart rules refactored 2019-08-08 05:53:28 +05:30
Prashant Singh 845f34038b Fixed bug in contains condition check 2019-08-06 16:24:35 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
Prashant Singh c661992a1a Non couponable rules refactoring 2019-08-06 14:06:25 +05:30
Prashant Singh c751c16e6a Cart rule refactorization 2019-08-05 19:38:17 +05:30
Prashant Singh cff0b7f4b2 refactroring of vart rules 2019-08-05 05:06:51 +05:30
Prashant Singh e4a5e84fb6 Refactoring cart rules 2019-08-03 19:54:02 +05:30
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30
Prashant Singh 2acad0e540 Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage 2019-07-23 13:43:37 +05:30
Prashant Singh dfd6ea8c25 Translations fixes in promotions sections 2019-07-23 13:07:22 +05:30
Prashant Singh 27ca4cb622 Minor fixes 2019-07-22 12:50:06 +05:30
Prashant Singh 38e029463e transition of cart rule from old method is now complete, now need to verify actions 2019-07-22 12:44:40 +05:30