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

1557 Commits

Author SHA1 Message Date
rahul shukla 79b5e1c4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 14:38:48 +05:30
rahul shukla a9090e991c download for image & file type 2019-06-27 14:38:24 +05:30
Jitendra Singh fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra 
Removed propaganistas/laravel-intl dependency
 2019-06-27 13:03:12 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Jitendra Singh 367f1771a8
Merge pull request #1116 from prashant-webkul/development 
Added remove logic in coupon rule class
 2019-06-27 13:00:04 +05:30
Prashant Singh 5073226872 Added remove logic in coupon rule class 2019-06-27 12:58:41 +05:30
Jitendra Singh e45fee03c6
Merge pull request #1115 from prashant-webkul/development 
Cart rule guest issues and discount price not visible in cart summary…
 2019-06-27 12:58:07 +05:30
Prashant Singh 64a6f06357 Cart rule guest issues and discount price not visible in cart summary is now fixed 2019-06-27 12:56:31 +05:30
Jitendra Singh 0102dd0c30
Merge pull request #1111 from prashant-webkul/development 
Development
 2019-06-27 11:45:23 +05:30
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