Commit Graph

198 Commits

Author SHA1 Message Date
Jitendra Singh 298c24d0f9
Merge pull request #1765 from thyseus/add-missing-manifests
add resources/manifest.php skeletons for Webkul packages
2019-11-15 19:56:28 +05:30
Prashant Singh b861435554 Fixed issues related to discount calculations 2019-11-14 17:15:55 +05:30
Prashant Singh d17191efe0 Fixed issues related to discount calculations 2019-11-14 17:08:28 +05:30
Prashant Singh e35d3ec1cd Fixed issue #1547, #1453 2019-11-14 16:46:36 +05:30
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
jitendra 77d35fc1e6 Fixed discount code standard 2019-11-12 18:27:41 +05:30
jitendra 257392cd2a Issue #1118 fixed 2019-11-07 17:39:59 +05:30
Prashant Singh e55dd37619 Fixed issue #1730 2019-11-01 18:46:54 +05:30
Prashant Singh b01fdc7496 Fixed issue #1728 2019-11-01 17:05:15 +05:30
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
Prashant Singh 3046662d45 Fixed issue #1715 2019-10-31 15:02:29 +05:30
Prashant Singh 77958e4dda Uncommented some needed code 2019-10-23 19:02:33 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
jitendra 49230b7071 Discount updted 2019-09-16 19:06:12 +05:30
Prashant Singh c5aec7445d Fixed a bug in sku finding which was using like instead of equals operator 2019-09-16 16:16:45 +05:30
Prashant Singh 685aedf528 getEligble items in action fixed as its was not working as boolean expression 2019-09-13 12:22:50 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
Prashant Singh d5bbc0230d Fixed issue #1288 2019-09-11 20:15:41 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Prashant Singh b4872b5c21 Missed a ! symbol in conditions object's attribute validation 2019-09-10 14:42:59 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
jitendra 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
Prashant Singh 9c174202c3 Refactoring convertXToProductID 2019-09-08 07:12:06 +05:30
Prashant Singh 2efffafab1 Fixed translation issue in catalog rule delete notification 2019-09-07 18:59:04 +05:30
Prashant Singh 6a24ed723e Rogue statement found in discount amount initialization 2019-09-07 16:29:33 +05:30
Prashant Singh c190f6f230 Cart rule form variables normalized 2019-09-07 04:28:42 +05:30
Prashant Singh 557a5b0143 Fixes in checking json data of attribute conditions on server side 2019-09-06 18:49:07 +05:30
Prashant Singh 57f3cbb8af JSON parsing in cart rule update form fixes 2019-09-06 16:58:35 +05:30
Prashant Singh b1f0416ca0 Spell correction 2019-09-06 16:29:56 +05:30
Prashant Singh b3472204c7 Edge case condition fixed in FixedAmount 2019-09-06 15:24:15 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
Prashant Singh 6ca065544c Edge case fix for Cart Rule actions 2019-09-06 13:46:20 +05:30
Prashant Singh c9cd73b67e Fixed edge case conditions and a bug in application of couponable rule 2019-09-06 13:38:05 +05:30
Prashant Singh 44c5ebc4f8 refactoring 2019-09-06 12:41:46 +05:30
Prashant Singh adad426228 missed a semicolon 2019-09-06 12:40:52 +05:30
Prashant Singh 2ac298cb68 Refactoring cart rule actions 2019-09-06 12:39:25 +05:30
Prashant Singh 5e47c5b2af More refactoring of discount assign to cart item 2019-09-06 12:37:46 +05:30
Prashant Singh 9c23179d6e Whole cart to fixed and whole cart to percent eligible items conditions corrected 2019-09-06 12:29:16 +05:30
Prashant Singh 4a3bfd6e2c Refactored actions of cart rules 2019-09-06 05:45:16 +05:30
Prashant Singh 256556a872 Fixed issue #1391 2019-09-05 19:51:02 +05:30
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