Commit Graph

114 Commits

Author SHA1 Message Date
Prashant Singh 4bfefd3a07 base sync 2019-06-14 13:22:37 +05:30
Prashant Singh c52238e45e Cart rule frontend normalization 2019-06-14 13:21:17 +05:30
Prashant Singh 7f9409bd8e Checkout and cart page now coupled with cart rules 2019-06-14 12:10:03 +05:30
Prashant Singh e9a0588185 discount rule fixes 2019-06-13 22:19:44 +05:30
jitendra 806f8f71f6 Added discount amount to cart item 2019-06-13 19:34:13 +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
jitendra c6a44b5414 Updated cart for custom_price 2019-06-07 11:18:46 +05:30
rahul shukla fc456c785f issue #850 2019-06-03 16:29:00 +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 fb394d974c Discount calculation added to the cart and discount added to the sales views 2019-05-23 18:44:16 +05:30
jitendra c4c55bc48d Refactored cart class 2019-04-24 17:09:46 +05:30
jitendra 28fc43fbfa Fixed guard spell mistake 2019-04-24 16:05:29 +05:30
jitendra ee056ee917 Update Cart in order make compatible for api and session guard 2019-04-24 15:55:49 +05:30
jitendra dd90e63ade Fixed add to cart issue 2019-04-16 16:32:30 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
Prashant Singh b59c25bfb8 Bug fix 2019-03-19 16:19:41 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Prashant Singh 7ae4be56b8 fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed 2019-03-05 16:28:55 +05:30
rahul shukla 704f6851a3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 20:10:58 +05:30
rahul shukla 36cb09bc58 address while checkout & reduces code 2019-02-15 20:10:47 +05:30
jitendra d2f620bb9f Issue fixed (If configurable product added to cart without options) 2019-02-15 19:38:10 +05:30
rahul shukla 0b0f425bf4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 11:29:05 +05:30
rahul shukla 4a648f549a checkout with multiple address #210 2019-02-14 21:20:10 +05:30
Prashant Singh 550cabcbcb Translation strings for datagrid and removal of dead code and pretty syntax 2019-02-14 19:24:44 +05:30
Prashant Singh ad1b2c5f7c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-04 15:29:33 +05:30
jitendra 49ddcd0256 Issue #191 fixed 2019-02-04 15:18:24 +05:30
Prashant Singh 8f78d8f2be issue #368 readdressed and same fix applied again after reviewal 2019-02-04 15:14:02 +05:30
Prashant Singh 072d61f20e Wishlist move to cart when product quantity is exhausted, showing improper validation message. Issue #402 fixed. 2019-02-04 13:51:26 +05:30
Prashant Singh 3a69f76b96 Fixed issue #368 2019-01-29 16:05:30 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
jitendra ce06916b3a Cart issue fixed 2019-01-07 17:27:07 +05:30
jitendra 264e2b2a16 Cart item custom price implemented 2019-01-07 16:40:26 +05:30
jitendra 16cb592130 Event added to cart 2019-01-07 16:00:28 +05:30
rahul shukla b430d4d4b5 merge with master 2019-01-02 20:15:05 +05:30
jitendra 98e2d0e52c Merged with master 2019-01-02 20:07:00 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
Prashant Singh 0a2a6c4234 conflicts in class attribute of storefront search and datagrid's search box 2018-12-27 16:22:44 +05:30
Prashant Singh 2b8e198d0d cart customer details fetched when user logged in 2018-12-21 18:48:31 +05:30
Prashant Singh 6fba17ea81 Fixed issues #300 & Updated inventory in product grid after order received 2018-12-21 16:14:20 +05:30
prashant-webkul 510f6e6f63 minor fixes in the merge cart function of cart 2018-12-03 18:37:29 +05:30
prashant-webkul 1ba21f281d Cart flash message fixed 2018-11-30 13:24:54 +05:30
prashant-webkul 36f6783db8 cart bug fixes and small css fix 2018-11-30 13:10:41 +05:30
prashant-webkul 311701b00a tax category sync fix and select rates fixed 2018-11-28 14:05:44 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul f93716a801 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-26 10:27:07 +05:30
prashant-webkul 4e6c462317 onepage cart api implemented 2018-11-25 19:13:30 +05:30
jitendra 4c21d8ead6 Issues #134 fixed and Inventory source add/edit validation issue fixed 2018-11-21 16:44:07 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30