merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,375 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

1648 Commits

Author SHA1 Message Date
Prashant Singh 3e4d2603c4 Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount 2019-06-27 04:35:26 +05:30
Prashant Singh 8a37088b9f Omitted the applicable rules that gives 0 value discounts 2019-06-27 02:25:44 +05:30
Prashant Singh 7e8ae8022b Some conditions changed according to end_other_rules attribute 2019-06-27 02:18:47 +05:30
Prashant Singh 72cf1c0226 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 01:36:18 +05:30
Prashant Singh 6d40b54d1d Remote sync 2019-06-27 01:36:11 +05:30
Prashant Singh c783ffa966 Added more checks for noncouponable and couponable rule interfaces 2019-06-27 01:32:32 +05:30
rahul shukla 54fa3419f3 admin name for attribute 2019-06-26 21:03:52 +05:30
rahul shukla 62cb90e014 status for customer 2019-06-26 18:02:14 +05:30
Prashant Singh 73d9966a12 Fixed issue #1108 2019-06-26 16:42:53 +05:30
rahul shukla 9a92a61724 try & catch added in buynow 2019-06-26 16:40:15 +05:30
Jitendra Singh fe14287b07
Merge pull request #1106 from prashant-webkul/development 
Development
 2019-06-26 14:33:29 +05:30
Prashant Singh 00ba0f2e71 Fixed issue with guest checkout when looking for cart rules based on guest customer groups 2019-06-26 14:30:32 +05:30
Prashant Singh 02be744066 Removed is_guest check from couponable and non couponable rules 2019-06-25 15:36:41 +05:30
Jitendra Singh a60e339218
Merge pull request #1105 from prashant-webkul/development 
Development
 2019-06-25 15:02:46 +05:30
Prashant Singh ddb2f1b59f Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-06-25 14:57:57 +05:30
Prashant Singh ecd766cb81 Some changes in frontend regarding coupon form on checkout 2019-06-25 14:57:26 +05:30
Prashant Singh 68c22f38f6 improvements in cart rules 2019-06-25 14:44:14 +05:30
Jyoti Singh 44947074a4 added discount threshold check in fixed amount cart rule 2019-06-25 13:37:24 +05:30
Prashant Singh 35a87aa7fd Added more security fixes for cart rules 2019-06-25 13:19:58 +05:30
Prashant Singh 463ff5a8ac Fixed issues with cart rules and made a validation function that checks the applied rule for any changes made in cart 2019-06-25 13:14:12 +05:30
Prashant Singh 1a262e0f27 Fixed some bugs in cart rules 2019-06-25 12:27:13 +05:30
Prashant Singh eedc0c6153 eliminated the column is_guest column from cart rules in favor of guest as a customer group 2019-06-25 11:10:21 +05:30
rahul shukla b0efd192e2 removed undefined variable rule from checkout/save payment 2019-06-24 18:03:31 +05:30
Jitendra Singh 754d99d3ba
Merge pull request #1094 from rahulshukla-webkul/development 
issue #1015 pagination responsive
 2019-06-21 16:29:08 +05:30
Jitendra Singh d547ab5058
Merge pull request #1090 from prashant-webkul/development 
Development
 2019-06-21 16:28:59 +05:30
rahul shukla 7d2b751479 issue #1015 pagination responsive 2019-06-21 16:17:37 +05:30
rahul shukla a35c997a56 issue #1014 2019-06-21 15:01:51 +05:30
rahul shukla ba26a39f74 issue #951 2019-06-21 14:41:22 +05:30
rahul shukla df57ef9f84 issue #1086 2019-06-21 12:05:37 +05:30
rahul shukla 9080f1e278 removed inline css 2019-06-21 11:37:31 +05:30
rahul shukla b0c35ead9f icon issue in admin dashboard 2019-06-21 11:23:27 +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
rahul shukla 048585853d repository insted of model in attribute create & edit for locale 2019-06-20 15:12:28 +05:30
Jitendra Singh bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development 
issue of discount amount in order #1053
 2019-06-20 14:34:11 +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 f72529f0fb issue of discount amount in order #1053 2019-06-20 12:17:11 +05:30
Jitendra Singh f1f7d03f6f
Merge pull request #1078 from rahulshukla-webkul/development 
flash message for discount & error
 2019-06-20 11:04:55 +05:30
rahul shukla d76d8bd129 flash message for discount & error 2019-06-19 21:18:16 +05:30
Prashant Singh acad17af67 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-19 18:21:26 +05:30
Prashant Singh 052afb4faf Fixed issues with apply to shipping and free shipping in create and edit of cart rules 2019-06-19 18:18:21 +05:30
Prashant Singh 423824b531 Fixed issue #1075 and #1074 2019-06-19 18:13:41 +05:30
rahul shukla 144bda6590 review page render in onepage 2019-06-19 17:08:36 +05:30
rahul shukla 5b98b9a86d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-19 16:32:48 +05:30
rahul shukla be8c11aa98 issue #1069 2019-06-19 16:32:38 +05:30
Prashant Singh de445279d2 Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules 2019-06-19 16:27:32 +05:30
Jitendra Singh 10e60dd4d7
Merge pull request #1071 from jitendra-webkul/jitendra 
Fixed checkout summary refresh issue
 2019-06-19 15:16:28 +05:30
jitendra aa1a5451bd Fixed checkout summary refresh issue 2019-06-19 15:15:27 +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 68e0ba1ac1 Fixed issue #1054 2019-06-19 10:58:02 +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 be62623022 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-18 19:16:14 +05:30
Prashant Singh e0f93aae56 Fixed issue in cart rule actions 2019-06-18 19:14:49 +05:30
Jitendra Singh 210be70779
Merge pull request #1049 from prashant-webkul/development 
all calculations now changed to base price
 2019-06-18 19:02:39 +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
rahul shukla d25cc60351 issues #1056 & 1058 2019-06-18 18:05:52 +05:30
rahul shukla 9166daa31b issues #1056 & 1058 2019-06-18 17:58:34 +05:30
rahul shukla 3af3996439 buy now issue 2019-06-18 17:42:11 +05:30
Prashant Singh bcdb4efb6c Fixed a bug in application of cart rule 2019-06-17 18:48:54 +05:30
rahul shukla 1144ce7e10 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-17 18:32:12 +05:30
rahul shukla 94b67d00c1 admin css changes 2019-06-17 18:31:52 +05:30
rahul shukla 0b5f50f1b0 depandent field added in configuaration 2019-06-17 18:22:23 +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 4b99f5acf9 Summary template now re rendering on applying and removal of coupon 2019-06-17 14:16:51 +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 d18667351c Base sync 2019-06-17 12:38:29 +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
jitendra b93bc11c65 Fixed js error in checkout page 2019-06-15 22:28:21 +05:30
jitendra 27b4ee19e5 Checkout coupon apply issue fixed 2019-06-15 22:22:40 +05:30
jitendra ba240925a4 Added v-debounce directive 2019-06-15 19:51:10 +05:30
jitendra a2d1e1aa85 Column 'code' added in customer_groups table 2019-06-15 18:50:38 +05:30
Prashant Singh 9ae4f8a801 Fixed issues with cart rule customer groups 2019-06-15 18:47:53 +05:30
Jitendra Singh 1f5d8a8f28
Revert "Revert "Development"" 2019-06-15 16:50:37 +05:30
Jitendra Singh 545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page"" 2019-06-15 16:49:02 +05:30
Jitendra Singh d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0"" 2019-06-15 16:48:29 +05:30
Jitendra Singh 1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra 
Reset changes
 2019-06-15 16:47:36 +05:30
jitendra e3946a79dd Reset changes 2019-06-15 16:46:55 +05:30
Jitendra Singh 65f899dcfe
Merge pull request #1038 from jitendra-webkul/jitendra 
Guest removed from customer pages
 2019-06-15 16:35:42 +05:30
jitendra ff64d23319 Guest removed from customer pages 2019-06-15 16:34:56 +05:30
Jitendra Singh c06bc39a7f
Merge pull request #1037 from bagisto/revert-1033-development 
Revert "Fixed issue with order summary rendering on cart page"
 2019-06-15 15:13:43 +05:30
Jitendra Singh 4427ec8205
Merge pull request #1036 from bagisto/revert-1028-jitendra 
Revert "Added Guest default customer group with id 0"
 2019-06-15 15:13:24 +05:30
Jitendra Singh ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development 
Revert "buy now issue"
 2019-06-15 15:13:16 +05:30
Jitendra Singh 426cbe0ae5
Revert "Added Guest default customer group with id 0" 2019-06-15 15:10:11 +05:30
Jitendra Singh fb5687c451
Revert "buy now issue" 2019-06-15 15:10:10 +05:30
Jitendra Singh 668f92185b
Revert "Development" 2019-06-15 15:10:04 +05:30
Jitendra Singh 7ac715e93d
Revert "Fixed issue with order summary rendering on cart page" 2019-06-15 15:09:59 +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 fc43b158dd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-15 10:49:04 +05:30
Prashant Singh 3a8b923f5c Discount rule 2019-06-14 23:48:08 +05:30
rahul shukla 076f197de7 buy now issue 2019-06-14 21:04:22 +05:30
Prashant Singh c36950c609 applied translation string in apply coupon responses 2019-06-14 20:26:54 +05:30
Prashant Singh 0188644fce Prepared standard responses when applying couponable rules 2019-06-14 20:04:32 +05:30
Prashant Singh bb097be557 Added error message provision in the same when coupon application fails 2019-06-14 19:58:25 +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 da82f2935c removed some dead code 2019-06-14 17:55:03 +05:30
jitendra e26c2b4d89 Added Guest default customer group with id 0 2019-06-14 16:41:18 +05:30
jitendra 3f814d9253 Fixed checkout issue 2019-06-14 15:13:20 +05:30
Jitendra Singh 8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra 
Fixed checkout issue
 2019-06-14 15:00:15 +05:30
jitendra 5b81968bae Fixed checkout issue 2019-06-14 14:59:29 +05:30
rahul shukla c8fb37698c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-14 14:22:50 +05:30
rahul shukla 0bdd03b331 ticket 201 error & admin css for back icon 2019-06-14 14:22:22 +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
rahul shukla 5afef79ac2 merge with master 2019-06-13 20:24:52 +05:30
rahul shukla 1a36cd32c7 change query for min price of variant 2019-06-13 20:22:16 +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 769f17a196 Fixed some syntax issue in cart rule controller 2019-06-13 19:00:33 +05:30
Prashant Singh 0aaf3d68e1 Ui package assets compiled for production 2019-06-13 18:20:09 +05:30
rahul shukla 7b14de69c6 changes in config & composer 2019-06-13 14:56:04 +05:30
rahul shukla 0fc78c5d83 Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development 2019-06-13 14:51:24 +05:30
Prashant Singh d2e8e822d7 Fixed issue #1007 2019-06-13 12:51:18 +05:30
Prashant Singh 6c0ee913ed added mass actions in admin customers grid 2019-06-13 12:47:58 +05:30
Prashant Singh 23467d9389 Added message when seller is blocked 2019-06-13 06:37:16 +05:30
Prashant Singh c86a699f69 Added status check in customer auth session creation function 2019-06-13 06:34:46 +05:30
Prashant Singh 619b8b6c8b Added status and notes in customer model fillables 2019-06-13 06:28:29 +05:30
Prashant Singh ec27ed4c8d added credit max in configuration 2019-06-13 01:05:29 +05:30
Prashant Singh 4542c96b17 Fixed issue in core regarding buynow button passing static quantity as 1 is now removed 2019-06-12 15:16:06 +05:30
Prashant Singh 76e43dcd58 added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated 2019-06-12 01:05:24 +05:30
rahul shukla 6a8c7a8784 assests compile for production 2019-06-11 16:40:13 +05:30
rahul shukla 5b1f300abf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-11 16:22:15 +05:30
rahul shukla 1a84a016fa bulk add to cart 2019-06-11 16:22:01 +05:30
Prashant Singh 22a81efdb3 fixed issue #1011 2019-06-11 14:51:28 +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 de126e38ed fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation 2019-06-11 12:32:34 +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
rahul shukla 8e37ebe7d5 conflict resolve 2019-06-10 17:13:30 +05:30
rahul shukla 80ac7bba72 customer document 2019-06-10 17:11:56 +05:30
Prashant Singh e20e29b0bd Fixed bug in cart rule form 2019-06-10 16:44:39 +05:30