Commit Graph

741 Commits

Author SHA1 Message Date
Prashant Singh b6d64b251b Refactoring cart rule on front end 2019-06-06 19:33:52 +05:30
Prashant Singh a78cc0b3b7 removed margin classes from shop to UI 2019-06-06 11:14:54 +05:30
Prashant Singh 71c67b3451 base sync 2019-06-04 18:15:43 +05:30
rahul shukla fc456c785f issue #850 2019-06-03 16:29:00 +05:30
Prashant Singh 6705f07e27 some bug fixes 2019-05-31 19:27:37 +05:30
Prashant Singh 42e346f400 Removed bugs and added coupon based cart rule removal functionality 2019-05-31 19:17:56 +05:30
jitendra 96e8556b54 Fixed mini cart layout 2019-05-31 18:30:09 +05:30
jitendra 8202f58284 Issue #932 fixed 2019-05-31 17:52:52 +05:30
Prashant Singh 06f2216850 fixed bugs in discount helper 2019-05-31 16:13:15 +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 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
Prashant Singh d6101e1f82 calculation for automatic cart rules complete 2019-05-29 13:26:17 +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
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
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
Prashant Singh 79ba3ebcf3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-24 16:49:47 +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
rahul shukla 27812ccd15 shipping title & footer text 2019-05-22 18:45:47 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 30942b3d25 product page changes 2019-05-21 19:36:20 +05:30
rahul shukla 898214e81e issue #925 2019-05-21 12:00:43 +05:30
Prashant Singh 7508efb51d currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel 2019-05-14 09:32:05 +05:30
Prashant Singh d2a5768ba6 fixed product card image not found issue 2019-05-11 17:30:27 +05:30
Prashant Singh 80bb31800b base sync with master and catalog rule channel and customer groups migrations added 2019-05-09 16:59:31 +05:30
rahul shukla ce99a4d9bb icon issue in layred navigation #issue 903 2019-05-09 12:28:48 +05:30
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
Prashant Singh 3115722fc8 catalog rule form changed to muliti attribute set for single condition 2019-05-08 05:46:00 +05:30
rahul shukla 6f494cc04b IE changes 2019-05-07 21:09:27 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30
rahul shukla b4a95b8d0c cart pages changes 2019-05-06 21:15:26 +05:30