Commit Graph

3152 Commits

Author SHA1 Message Date
Prashant Singh 3c95e11df7 Cart rule labels bug fixed 2019-06-04 14:54:42 +05:30
Jitendra Singh 68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard
Clean up
2019-06-04 14:21:19 +05:30
Jitendra Singh 8ef4a22087
Merge pull request #969 from rahulshukla-webkul/development
Development
2019-06-04 14:19:34 +05:30
rahul shukla d232722b5d issue #916 2019-06-04 12:49:10 +05:30
rahul shukla 40e8c85813 issue #945 product image of variant 2019-06-04 10:17:00 +05:30
imanghafoori e0dd74c06c clean up 2019-06-04 00:52:37 +04:30
Prashant Singh db3b35ff4c cart rule labels refactoring in midway 2019-06-03 17:52:52 +05:30
rahul shukla 93324e021e issue #896 product special price 2019-06-03 17:11:11 +05:30
rahul shukla 642a5a8ce3 insertion of installer 2019-06-03 16:32:50 +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
Prashant Singh e6e12ae601
Update README.md 2019-05-31 19:10:53 +05:30
Jitendra Singh 4ed068b00b
Merge pull request #967 from jitendra-webkul/jitendra
Fixed mini cart layout
2019-05-31 18:31:41 +05:30
jitendra 96e8556b54 Fixed mini cart layout 2019-05-31 18:30:09 +05:30
Jitendra Singh fa87ecab3d
Merge pull request #966 from jitendra-webkul/jitendra
Issue #932 fixed
2019-05-31 17:54:26 +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
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
rahul shukla ba076f15f5 readme updated 2019-05-31 12:41:26 +05:30
rahul shukla 3f0fee01e5 readme updated 2019-05-31 12:39:33 +05:30
rahul shukla 68e945c04d readme updated 2019-05-31 12:36:09 +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 Singh c3fa46d8c9
Merge pull request #963 from jitendra-webkul/jitendra
Issues #948, #949 fixed
2019-05-30 18:32:47 +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