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

2229 Commits

Author SHA1 Message Date
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
Jitendra Singh 7ed43fabec
Merge pull request #1104 from rahulshukla-webkul/development 
removed undefined variable rule from checkout/save payment
 2019-06-24 18:23:49 +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
Jitendra Singh b06b034441
Merge pull request #1093 from rahulshukla-webkul/development 
issue #1014
 2019-06-21 15:05:58 +05:30
rahul shukla a35c997a56 issue #1014 2019-06-21 15:01:51 +05:30
Jitendra Singh 0c6d36e666
Merge pull request #1092 from rahulshukla-webkul/development 
issue #951
 2019-06-21 14:45:35 +05:30
rahul shukla ba26a39f74 issue #951 2019-06-21 14:41:22 +05:30
Jitendra Singh e34d8f8ace
Merge pull request #1087 from rahulshukla-webkul/development 
issue #1086
 2019-06-21 12:07:35 +05:30
rahul shukla df57ef9f84 issue #1086 2019-06-21 12:05:37 +05:30
Jitendra Singh 9ab17a0d1c
Merge pull request #1085 from rahulshukla-webkul/development 
removed inline css
 2019-06-21 11:40:59 +05:30
rahul shukla 9080f1e278 removed inline css 2019-06-21 11:37:31 +05:30
Jitendra Singh 95f8147fa6
Merge pull request #1084 from rahulshukla-webkul/development 
icon issue in admin dashboard
 2019-06-21 11:26:36 +05:30
rahul shukla b0c35ead9f icon issue in admin dashboard 2019-06-21 11:23:27 +05:30
Jitendra Singh 58d1c15869
Merge pull request #1083 from rahulshukla-webkul/development 
disable strict mode in installer
 2019-06-21 11:17:09 +05:30
rahul shukla 511acd7930 disable strict mode in installer 2019-06-21 10:23:49 +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
Jitendra Singh f070f4f6de
Merge pull request #1082 from rahulshukla-webkul/development 
quantity issue in discount
 2019-06-20 17:58:54 +05:30
rahul shukla 12846df91c quantity issue in discount 2019-06-20 17:49:14 +05:30
Jitendra Singh 7451279fa1
Merge pull request #1081 from rahulshukla-webkul/development 
repository insted of model in attribute create & edit for locale
 2019-06-20 16:25:27 +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
Jitendra Singh 88a6b819ef
Merge pull request #1076 from prashant-webkul/development 
Development
 2019-06-20 11:04:45 +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
Jitendra Singh 47c9630276
Merge pull request #1073 from rahulshukla-webkul/development 
Development
 2019-06-19 17:12:11 +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
Jitendra Singh 5db1dd73d7
Merge pull request #1072 from prashant-webkul/development 
Fixed bug in product creation changed the name of product type config…
 2019-06-19 16:28:51 +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
Jitendra Singh c1eab0ca41
Merge pull request #1070 from prashant-webkul/development 
Development
 2019-06-19 14:59:20 +05:30