Commit Graph

2044 Commits

Author SHA1 Message Date
Prashant Singh 64c249983d Fixed 2019-06-10 18:28:17 +05:30
Prashant Singh 8b5ac835e0 Fixed bugs in creation of cart rule form 2019-06-10 18:26:12 +05:30
Prashant Singh e20e29b0bd Fixed bug in cart rule form 2019-06-10 16:44:39 +05:30
Prashant Singh 451000c0d5 disabled customer groups from cart rules 2019-06-10 16:41:31 +05:30
Prashant Singh 0d3539f3c9 fixed validation issues in cart rule #993 & #997 2019-06-10 15:29:19 +05:30
Prashant Singh cfb16da64a fixed issue #994 2019-06-10 15:21:45 +05:30
Prashant Singh 3b0ef1bade Removed php loc from require dev of composer.json 2019-06-10 13:57:09 +05:30
Prashant Singh 0161488948
Merge pull request #991 from prashant-webkul/development
Development
2019-06-10 13:41:14 +05:30
Prashant Singh c8f7608c46
Development (#990)
* 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

* removed an extra dependency from composer.json
2019-06-10 13:35:48 +05:30
Prashant Singh e495232c53 removed an extra dependency from composer.json 2019-06-10 13:34:24 +05:30
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
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 Singh b37ac65e13
Merge pull request #984 from jitendra-webkul/jitendra
Optional index for datagrid action
2019-06-07 18:00:22 +05:30
jitendra 66bd3e7989 Optional index for datagrid action 2019-06-07 17:59:38 +05:30
Jitendra Singh 6cdbcdc2dc
Merge pull request #983 from jitendra-webkul/jitendra
Car controller updated
2019-06-07 16:52:16 +05:30
jitendra 5585b503cf Car controller updated 2019-06-07 16:36:50 +05:30
Jitendra Singh 5398569e4b
Merge pull request #982 from jitendra-webkul/jitendra
Fixed js issue buy now button not exist
2019-06-07 15:43:42 +05:30
jitendra ca4d9ef9ba Fixed js issue buy now button not exist 2019-06-07 15:42:58 +05:30
Jitendra Singh 799266e531
Merge pull request #981 from jitendra-webkul/jitendra
Updated cart for custom_price
2019-06-07 11:19:28 +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
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