Commit Graph

2307 Commits

Author SHA1 Message Date
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
Jitendra Singh 1700bf1aa2
Merge pull request #1135 from rahulshukla-webkul/development
Development
2019-06-28 17:52:12 +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
Jitendra Singh a2bf855fbe
Merge pull request #1136 from prashant-webkul/development
Updated changelog for release of stable version 0.1.6
2019-06-28 16:42:34 +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
Jitendra Singh 5514952c95
Merge pull request #1134 from prashant-webkul/development
Fixed conditions issue
2019-06-28 15:15:38 +05:30
rahul shukla 07ec9cd28a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-28 15:15:33 +05:30
rahul shukla fa65e46725 check for phone column & verrion last digit check in installer 2019-06-28 15:15:17 +05:30
Prashant Singh c4ec5853e2 Fixed conditions issue 2019-06-28 15:13:57 +05:30
Jitendra Singh f9f1f9d82e
Merge pull request #1133 from prashant-webkul/development
Development
2019-06-28 14:50:48 +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
Jitendra Singh 338fd38fdd
Merge pull request #1128 from prashant-webkul/development
Apply to shipping and free shipping now added in normal flow
2019-06-28 13:00:41 +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
Jitendra Singh 3ab5e7dc70
Merge pull request #1126 from prashant-webkul/development
Development
2019-06-27 17:05:59 +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