Commit Graph

1493 Commits

Author SHA1 Message Date
Prashant Singh 5efd8b88ef Altered cart rules to some extent 2019-06-10 13:17:53 +05:30
Prashant Singh a6a114c652 altered some frontend variables on onepage checkout 2019-06-08 21:08:42 +05:30
Prashant Singh 9058124f81 base sync with master 2019-06-08 20:38:21 +05:30
Prashant Singh 194fc51261 Cart rule frontend work done 2019-06-08 20:34:41 +05:30
Prashant Singh 3c16cbba73 provision to remove the couponable and non couponable rule had been added 2019-06-08 16:13:17 +05:30
Prashant Singh c791833425 cart rule bug fixes 2019-06-07 19:51:45 +05:30
Prashant Singh ccba7afbe2 Discount rule implemented. 2019-06-07 19:00:05 +05:30
jitendra 66bd3e7989 Optional index for datagrid action 2019-06-07 17:59:38 +05:30
jitendra 5585b503cf Car controller updated 2019-06-07 16:36:50 +05:30
jitendra ca4d9ef9ba Fixed js issue buy now button not exist 2019-06-07 15:42:58 +05:30
jitendra c6a44b5414 Updated cart for custom_price 2019-06-07 11:18:46 +05:30
Jitendra Singh 87542306a2
Merge pull request #980 from rahulshukla-webkul/development
Development
2019-06-07 11:14:43 +05:30
rahul shukla dc96dfb7b2 custom price default to null 2019-06-07 11:12:40 +05:30
rahul shukla f924e7ed01 custom price nullable in cart items 2019-06-07 10:06:00 +05:30
Prashant Singh cd1ea82d12 added checks 2019-06-07 07:06:19 +05:30
Prashant Singh b6d64b251b Refactoring cart rule on front end 2019-06-06 19:33:52 +05:30
Jitendra Singh 9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development
Development
2019-06-06 17:47:37 +05:30
Jitendra Singh 796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
clean up
2019-06-06 17:47:10 +05:30
imanghafoori 99ccac943d fix bug 2019-06-06 16:25:06 +04:30
Jitendra Singh d399811206
Merge pull request #978 from jitendra-webkul/jitendra
totalQuantity function added to product and product flat model
2019-06-06 16:44:31 +05:30
jitendra 2d00679901 totalQuantity function added to product and product flat model 2019-06-06 16:43:36 +05:30
rahul shukla af67516c36 object added with event 2019-06-06 15:16:16 +05:30
Prashant Singh a78cc0b3b7 removed margin classes from shop to UI 2019-06-06 11:14:54 +05:30
rahul shukla b7b42ffc15 translation updated 2019-06-04 18:25:54 +05:30
Prashant Singh 71c67b3451 base sync 2019-06-04 18:15:43 +05:30
rahul shukla 255664c4c0 back button implemented on checkout page 2019-06-04 16:36:42 +05:30
imanghafoori 9f039cb9a5 clean up
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
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
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 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 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
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