Commit Graph

1395 Commits

Author SHA1 Message Date
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964)
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
2019-06-10 13:19: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
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
rahul shukla b7b42ffc15 translation updated 2019-06-04 18:25:54 +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
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
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
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
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
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
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
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
Jitendra Singh eee546da6a
Merge pull request #955 from rahulshukla-webkul/development
Development
2019-05-28 17:06:25 +05:30
rahul shukla 7281cfeb78 issue #922 2019-05-28 13:32:13 +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
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
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
rahul shukla 7efcdefc6a changes in prouduct flat new migration 2019-05-23 18:49:29 +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