Commit Graph

240 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 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 40e8c85813 issue #945 product image of variant 2019-06-04 10:17:00 +05:30
rahul shukla 93324e021e issue #896 product special price 2019-06-03 17:11:11 +05:30
jitendra 8202f58284 Issue #932 fixed 2019-05-31 17:52:52 +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
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
rahul shukla 8678a865f0 column added in product flat table 2019-05-23 12:10:02 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 2d782cab79 issue #917 & #923 2019-05-21 10:51:39 +05:30
Jitendra Singh 4455ce6849
Merge pull request #912 from jitendra-webkul/jitendra
Refactored ProductController
2019-05-09 16:50:45 +05:30
jitendra 165e6aef5b Refactored ProductController 2019-05-09 16:49:52 +05:30
rahul shukla 4c2a895b08 Issue #897 & change in valdation message for category image 2019-05-09 11:36:21 +05:30
jitendra 0ff492ae80 Fixed product repository search index issue 2019-05-07 17:54:43 +05:30
jitendra a72d054cb5 Added api for front shop 2019-05-07 17:06:21 +05:30
Jitendra Singh a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra
price issue fixed
2019-04-29 15:42:13 +05:30
jitendra 5c68618416 price issue fixed 2019-04-29 15:41:31 +05:30
Jitendra Singh 34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra
Jitendra
2019-04-26 12:44:24 +05:30
jitendra 10e92dada3 Now variant's super attributes values are saving in product_flat table 2019-04-26 12:43:42 +05:30
rahul shukla fb15e48c4d issue #865 description 2019-04-24 16:14:35 +05:30
rahul shukla 148ff7c1e8 merge with master 2019-04-23 12:36:05 +05:30
jitendra 9d65030779 Issue #851 fixed 2019-04-23 11:16:34 +05:30
jitendra e18fd4e5c4 Issue #855 fixed 2019-04-23 11:03:05 +05:30
rahul shukla 148f942c4a issue #848 2019-04-18 19:15:14 +05:30
jitendra f9e174ea70 Fixed urldecode issue in search temm 2019-04-18 17:16:36 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
rahul shukla f1c263805c issues #815 2019-04-10 16:45:52 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
rahul shukla 8e7c3c7f22 restore migration 2019-04-09 12:12:35 +05:30
rahul shukla dbde05e0cd change in delete query 2019-04-09 12:05:52 +05:30