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

1725 Commits

Author SHA1 Message Date
rahul shukla 6fec08f814 check updated, issue #1162 2019-07-08 15:45:15 +05:30
rahul shukla 3511c08e46 issue #1062 2019-07-08 15:38:05 +05:30
rahul shukla 79d25c7d2e issue #1060 2019-07-08 15:09:42 +05:30
rahul shukla 746a17dcf6 conflict resolve 2019-07-08 13:13:34 +05:30
rahul shukla c7add7e2fe removal of excess code in search, locale & currency 2019-07-08 13:10:41 +05:30
Jitendra Singh 2c45ddee13
Merge pull request #1157 from danielpinon/patch-1 
Updating translations of languages ​​in pt_BR
 2019-07-08 12:13:54 +05:30
Daniel Pinon 723f6ad639
Clearing duplicity 2019-07-06 23:59:59 -03:00
Daniel Pinon c5fe78014c
Updating translations of languages ​​in pt_BR 2019-07-06 23:58:01 -03:00
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
rahul shukla 54481ebbfe slider edit issue 2019-07-05 18:15:22 +05:30
rahul shukla 2f2f97a6d0 category check condition for sorting 2019-07-05 13:33:06 +05:30
rahul shukla f9863f440f category check condition for sorting 2019-07-05 13:24:46 +05:30
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
rahul shukla 9eb4b89344 json removed 2019-07-04 13:25:08 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla 60435b724f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-04 12:38:36 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
Prashant Singh f8d38e9bbd Enabled usage parameters of cart rule in create and edit form 2019-07-03 11:37:09 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development 
Development
 2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
Prashant Singh be2b55a898 fixed event fire on movetocart from wishlist 2019-06-29 18:44:23 +05:30
Jitendra Singh 337c45426f
Merge pull request #1142 from rahulshukla-webkul/development 
style for dashboard
 2019-06-29 18:16:39 +05:30
rahul shukla 2f905203a2 style for dashboard 2019-06-29 18:12:07 +05:30
Jitendra Singh 842a0f77d4
Merge pull request #1141 from prashant-webkul/development 
Added cart item add before event
 2019-06-29 17:50:14 +05:30
Prashant Singh e3bc993c99 Added cart item add before event 2019-06-29 17:24:41 +05:30
Jitendra Singh 44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development 
css changes for overflow
 2019-06-29 17:09:32 +05:30
Jitendra Singh 77af67ffd1
Merge pull request #1140 from prashant-webkul/development 
Development
 2019-06-29 17:09:19 +05:30
Prashant Singh ec2baa1be9 bug fix for event fire 2019-06-29 17:07:19 +05:30
Prashant Singh ff863fcc54 Added cart item add after event for move to cart from wishlist 2019-06-29 17:04:18 +05:30
rahul shukla b8c0f4aed6 css changes for overflow 2019-06-29 15:26:26 +05:30
rahul shukla e6c20fa11e table in email template 2019-06-28 17:20:47 +05:30
rahul shukla 34fd4e3840 assets compile for production 2019-06-28 17:11:26 +05:30
rahul shukla 8e9768f947 assets compile for production 2019-06-28 17:08:30 +05:30
rahul shukla d5b66ebf9e table in email template 2019-06-28 17:05:08 +05:30
rahul shukla beabada35e acl added for cart rule & dashboard css changes 2019-06-28 16:30:36 +05:30
Prashant Singh 8a5d57bcc6 new compiled assets for production 2019-06-28 16:30:36 +05:30
Prashant Singh fce7ec8586 Assets compiled for production and updated the changelog for new release v0.1.6 2019-06-28 16:29:41 +05:30
rahul shukla 0088bf7709 check in phone column unique removal 2019-06-28 15:44:17 +05:30
rahul shukla 7c8dc15c58 check in phone column unique removal 2019-06-28 15:43:53 +05:30
rahul shukla fdb9252b2a check for phone column & verrion last digit check in installer 2019-06-28 15:18:48 +05:30
Prashant Singh c4ec5853e2 Fixed conditions issue 2019-06-28 15:13:57 +05:30
Prashant Singh 5174c02bb0 Problem with does not contains condition is not fixed 2019-06-28 14:49:37 +05:30
Prashant Singh 35b8af8d47 Non argument fix for reset shipping 2019-06-28 13:29:39 +05:30
Prashant Singh a304795c36 Fixed issues with buy atleast 2019-06-28 12:59:40 +05:30
Prashant Singh e8dd4219a7 Apply on shipping working on cart rule 2019-06-28 12:57:19 +05:30
Prashant Singh 02faaf7415 Added reset shipping when applying coupon cart rule 2019-06-28 11:30:01 +05:30
Prashant Singh e4612d8629 Fixed some discrepancies in apply to shipping in cart rules 2019-06-28 10:56:44 +05:30
Prashant Singh 4339475e70 CheckOnShipping method added to check where rule applies on shipping or not 2019-06-27 19:55:36 +05:30
Prashant Singh 25007824eb Shipping now getting applied according to selected shipping method 2019-06-27 19:51:17 +05:30
Prashant Singh 4db41973fd Removed the option of BuyAGetB as its current functionality was same as Fixed amount 2019-06-27 18:34:37 +05:30
Prashant Singh 216b409531 Apply to shipping and free shipping now added in normal flow 2019-06-27 17:09:56 +05:30
Prashant Singh e17da6fdfa Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 16:41:46 +05:30
Prashant Singh 5135ef5f34 Optimized validates discount class as it was creating redundancy with discount class 2019-06-27 16:40:57 +05:30
Jitendra Singh 5bf6f30f4a
Merge pull request #1125 from prashant-webkul/development 
Fixed issue with cart rule validation when placing order
 2019-06-27 16:28:36 +05:30
Prashant Singh db12a1587f Fixed issue with cart rule validation when placing order 2019-06-27 16:27:06 +05:30
Jitendra Singh 4feeffaf51
Merge pull request #1124 from prashant-webkul/development 
Fixed issue #1080
 2019-06-27 16:18:13 +05:30
Prashant Singh 9b83fb8025 Fixed issue #1080 2019-06-27 16:14:24 +05:30
Jitendra Singh 9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development 
Product export now added
 2019-06-27 14:59:42 +05:30
Prashant Singh 487484f86d Product export now added 2019-06-27 14:55:32 +05:30
Jitendra Singh 4627c6a519
Merge pull request #1122 from prashant-webkul/development 
Development
 2019-06-27 14:43:51 +05:30
Prashant Singh c245eab856 Fixed issue #1086 for customer edit 2019-06-27 14:41:01 +05:30
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
Prashant Singh d1395ba145 Fixed issue #1086 2019-06-27 14:24:26 +05:30
Prashant Singh 3f79f2b89a Fixed issue #1114, #1112 2019-06-27 13:30:45 +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
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