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

2371 Commits

Author SHA1 Message Date
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
Jitendra Singh 996579d640
Merge pull request #1055 from rahulshukla-webkul/development 
Development
 2019-06-18 18:10:58 +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
Jitendra Singh 106cd039db
Merge pull request #1047 from prashant-webkul/development 
Development
 2019-06-17 14:23:31 +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 Singh 7121baa457
Merge pull request #1046 from jitendra-webkul/jitendra 
Fixed js error in checkout page
 2019-06-15 22:29:20 +05:30
jitendra b93bc11c65 Fixed js error in checkout page 2019-06-15 22:28:21 +05:30
Jitendra Singh bac887b0a3
Merge pull request #1045 from jitendra-webkul/jitendra 
Checkout coupon apply issue fixed
 2019-06-15 22:23:35 +05:30
jitendra 27b4ee19e5 Checkout coupon apply issue fixed 2019-06-15 22:22:40 +05:30
Jitendra Singh 308c48aeae
Merge pull request #1044 from jitendra-webkul/jitendra 
Added v-debounce directive
 2019-06-15 19:52:54 +05:30
jitendra ba240925a4 Added v-debounce directive 2019-06-15 19:51:10 +05:30
Jitendra Singh aa39c6e22f
Merge pull request #1043 from jitendra-webkul/jitendra 
Column 'code' added in customer_groups table
 2019-06-15 18:51:20 +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 86c1b453ee
Merge pull request #1042 from bagisto/revert-1034-revert-1032-development 
Revert "Revert "Development""
 2019-06-15 16:50:49 +05:30
Jitendra Singh 1f5d8a8f28
Revert "Revert "Development"" 2019-06-15 16:50:37 +05:30
Jitendra Singh 3d8144a75a
Merge pull request #1041 from bagisto/revert-1037-revert-1033-development 
Revert "Revert "Fixed issue with order summary rendering on cart page""
 2019-06-15 16:49: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 f0f8d7c059
Merge pull request #1040 from bagisto/revert-1036-revert-1028-jitendra 
Revert "Revert "Added Guest default customer group with id 0""
 2019-06-15 16:48:47 +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 1482628316
Merge pull request #1034 from bagisto/revert-1032-development 
Revert "Development"
 2019-06-15 15:13:08 +05:30
Jitendra Singh 426cbe0ae5
Revert "Added Guest default customer group with id 0" 2019-06-15 15:10:11 +05:30