Commit Graph

1452 Commits

Author SHA1 Message Date
Prashant Singh 06f2216850 fixed bugs in discount helper 2019-05-31 16:13:15 +05:30
Jitendra Singh 746d7e5204
Merge pull request #965 from rahulshukla-webkul/development
Development
2019-05-31 13:20:27 +05:30
rahul shukla 12e93b3f58 cart updated for convert price 2019-05-31 12:48:04 +05:30
Prashant Singh fe347d345a some bug fixes 2019-05-31 11:58:06 +05:30
Prashant Singh 9a4c17066e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-30 19:05:13 +05:30
Prashant Singh 33774c4c46 added the table for cart rule cart for managing rules with cart and removed various bug fixes 2019-05-30 19:04:44 +05:30
jitendra 445b648b0a Issues #948, #949 fixed 2019-05-30 18:32:01 +05:30
Jitendra Singh 49d8388d49
Merge pull request #962 from rahulshukla-webkul/development
UI fixes for project
2019-05-30 13:25:59 +05:30
rahul shukla 3663391bf6 UI fixes for project 2019-05-30 11:52:06 +05:30
Prashant Singh 26270979fd removed some bugs from summary blade for cart rule 2019-05-29 19:04:09 +05:30
Prashant Singh 131c73ce04 some bug fixes 2019-05-29 18:00:44 +05:30
Prashant Singh 751222828f some conditions improvements in couponable cart rules 2019-05-29 17:19:10 +05:30
Prashant Singh 0e07902064 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-29 17:11:03 +05:30
Prashant Singh c6637d90b7 non couponable cart rules implemented, now moving on to binding them on frontend 2019-05-29 17:10:24 +05:30
Jitendra Singh 219b9fae03
Merge pull request #960 from rahulshukla-webkul/development
channel added for payment & shiping method's status
2019-05-29 14:29:32 +05:30
rahul shukla 6804deae76 channel added for payment & shiping method's status 2019-05-29 13:31:53 +05:30
Prashant Singh d6101e1f82 calculation for automatic cart rules complete 2019-05-29 13:26:17 +05:30
Jitendra Singh ef2f9659f4
Merge pull request #959 from rahulshukla-webkul/development
configuration added to admin logo
2019-05-29 12:45:08 +05:30
rahul shukla 573df3818c configuration added to admin logo 2019-05-29 12:42:18 +05:30
Jitendra Singh 3cec2d1935
Merge pull request #958 from rahulshukla-webkul/development
Development
2019-05-29 11:48:55 +05:30
rahul shukla d1199a6f26 issue #956 2019-05-29 11:35:17 +05:30
rahul shukla fe8ac5abf1 issue #957 change in event 2019-05-29 09:56:28 +05:30
Prashant Singh 82293d5f71 some bug fixes 2019-05-29 09:04:01 +05:30
Prashant Singh 9068528c41 made some changes in cart rule coupon application on checkout related to new designs 2019-05-28 20:04:32 +05:30
Prashant Singh 09afec0a87 Nearing to completion of coupon based rules 2019-05-28 18:25:20 +05:30
Jitendra Singh eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
Development
2019-05-28 17:06:25 +05:30
Prashant Singh 088bccf7ab removed the conditions empty bug 2019-05-28 14:20:16 +05:30
rahul shukla 7281cfeb78 issue #922 2019-05-28 13:32:13 +05:30
Prashant Singh 5ca9e67cad added coupon box on checkout screen 2019-05-28 09:09:17 +05:30
Prashant Singh 62a7954c33 cart rules working 2019-05-27 18:49:09 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
Prashant Singh 3bc27604b6 cart rule coupon implementation in progress for discount coupon in shop checkout pages 2019-05-27 16:30:55 +05:30
Prashant Singh f681397958 added helpers in cart and discount to apply rules on cart at checkout or not 2019-05-27 07:48:56 +05:30
Prashant Singh 6f14ad7a42 cart rule form completed 2019-05-27 03:59:37 +05:30
Prashant Singh 4ab1e86d98 designing process to get suitable discount rules 2019-05-24 20:07:58 +05:30
jitendra 37ba923e9e Backorder implemented 2019-05-24 18:45:47 +05:30
Jitendra Singh d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development
Development
2019-05-24 17:18:17 +05:30
Prashant Singh 79ba3ebcf3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-24 16:49:47 +05:30
Prashant Singh 22bafe1e11 base sync with master 2019-05-24 16:49:39 +05:30
Prashant Singh b354b4ce15 Models and Repositories updated for cart rule usage 2019-05-24 15:12:32 +05:30
Prashant Singh 41c8793f64 Cart rule form and migrations complete 2019-05-24 13:09:53 +05:30
rahul shukla b8561d4d5e schema condition in product flat table 2019-05-24 12:15:30 +05:30
rahul shukla 308b3be1d8 installer file deletion after install 2019-05-24 11:53:11 +05:30
Prashant Singh 4c844c12ce cart rule submission problem due to repository issue 2019-05-24 03:35:53 +05:30
Prashant Singh 9057f4bd48 added cart rule preferences for coupon codes 2019-05-23 19:04:15 +05:30
rahul shukla 7efcdefc6a changes in prouduct flat new migration 2019-05-23 18:49:29 +05:30
Prashant Singh bab740b4d9 added cart attributes and their conditions in cart rule form. Added migrations for cart rule coupons and related to it 2019-05-23 18:46:14 +05:30
jitendra fb394d974c Discount calculation added to the cart and discount added to the sales views 2019-05-23 18:44:16 +05:30
jitendra edec481f26 Sales discount calculation implemented 2019-05-23 17:00:11 +05:30