Commit Graph

132 Commits

Author SHA1 Message Date
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30
jitendra 366a5fdd20 Refactor code standard 2019-07-01 17:03:36 +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
rahul shukla 8d64ba656a option attribute in layred navigation & category changes 2019-04-26 19:06:18 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +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
Prashant Singh 1aa9bf78aa Removed unforced controller file from attribute package's Repositories directory 2019-04-16 14:41:12 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +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
Prashant Singh 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
rahul shukla dbde05e0cd change in delete query 2019-04-09 12:05:52 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 747f214739 fix in progress for get routes performing actions more than redirect 2019-04-08 04:51:02 +05:30
jitendra e83a27a31b Issue #803 fixed 2019-04-05 11:42:52 +05:30
rahul shukla 19f4429de0 issue #670 2019-03-11 17:57:15 +05:30
jitendra 70c4e69aaf Excluded image swatch attributes from layed navigation 2019-03-05 10:53:50 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla b019a248cf interfaces & proxy class implemented 2019-02-18 13:00:40 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +05:30
jitendra 6fff4701a6 Flat rate implemented 2019-01-25 17:24:48 +05:30
Prashant Singh 07daf7d310 product flat now showing up with relevant attributes data 2019-01-22 18:53:17 +05:30
Prashant Singh f553dcdc71 assets compiled for production 2019-01-21 15:52:56 +05:30
Prashant Singh 66c74af6ca attribute update event for product flat is suppressed for now as code and type never gets changed when updating the attribute 2019-01-18 18:56:46 +05:30
Prashant Singh 14dfec8365 attribute creation and deletion now syncing with columns of product_flat, label is now also creating when attribute type is select or multiselect 2019-01-18 18:49:51 +05:30
Prashant Singh 50a0a71196 product flat column creation and deletion on the basis of attributes 2019-01-18 17:36:58 +05:30
Prashant Singh bcb2661722 Datagrids display issue fixed when toggling massactions 2019-01-18 14:59:19 +05:30
Prashant Singh 0edebcf5c7 Table display issues when use mass actions filters and products flat events 2019-01-18 13:08:42 +05:30
rahul shukla 00ac9bbc01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-18 12:06:34 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30
Prashant Singh eb373d7ecb More changes in datagrid, regarding implementation of wrapper columns 2019-01-17 15:24:58 +05:30
Prashant Singh 25e485274e read me changes 2019-01-17 11:59:51 +05:30
rahul shukla 8c32a21521 export changes 2019-01-16 16:43:36 +05:30
rahul shukla 4747f8fb59 customer design fixex 2019-01-16 14:08:39 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
jitendra c0da6fbd73 Attribute family creation issue fixed 2019-01-14 19:41:34 +05:30
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +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
jitendra abd3bba617 Moved catalog event from controllers to repositories 2018-12-27 18:57:39 +05:30
jitendra 9581082f56 Removed auth middleware from controllers 2018-12-27 17:05:05 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
jitendra a1c7e4c73a Mass attribute deletion issue fixed 2018-12-19 16:42:29 +05:30
prashant-webkul d9f0ddc89d Fixed issues 314 and 315 2018-12-13 18:51:54 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30
prashant-webkul 1e05840c7d Regular merge with master 2018-12-07 15:44:03 +05:30
prashant-webkul 45903d3c0a Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes 2018-12-07 14:45:31 +05:30
jitendra e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
prashant-webkul 7a309fbf9c search issues fixed with is active check for the prooducts and the pagination has been applied on the search page 2018-12-05 16:52:54 +05:30
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
jitendra fafbcb432b Issues #175, #176 fixed and added bootstrap.js in main js file 2018-11-28 10:56:54 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
jitendra 7f1675e37c Order cancel implemented 2018-10-15 16:09:09 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
jitendra 6f57a51152 Fixed cart issues 2018-10-10 15:56:27 +05:30
rahul shukla d0e0b64445 merge conflict 2018-09-08 14:22:46 +05:30
rahul shukla 149c98ff03 customer & review 2018-09-08 14:11:36 +05:30
prashant-webkul e07be27d8b Merged with master 2018-09-06 12:19:22 +05:30
prashant-webkul df199f0728 Taxes, long intended routes, ACL now prevents login if user already logged in. 2018-08-31 11:33:11 +05:30
jitendra 0c8b5a03e2 Product details page added 2018-08-30 18:52:15 +05:30
jitendra bc087010ee Repository pattern changes 2018-08-22 15:14:35 +05:30
prashant-webkul eaf721f062 merging with master 2018-08-21 16:35:43 +05:30
jitendra 7e95b89ec8 For demo 2018-08-21 16:28:55 +05:30
prashant-webkul 5c5bccd293 product grid theme restructuring in mid way 2018-08-20 19:17:42 +05:30
prashant-webkul 989990fc78 Merged with master 2018-08-17 12:05:18 +05:30
jitendra bde79be88e Theme manager completed 2018-08-17 11:18:21 +05:30
prashant-webkul 3da39943f1 Datagrid bug fixes 2018-08-16 13:37:37 +05:30
jitendra ff50784aa8 Added product creation page 2018-08-09 10:05:13 +05:30
jitendra f99d9ebcad Product edit page added with all attribuite type fields 2018-08-02 09:49:45 +05:30
jitendra f236da61ab Added Repository Pattern to User 2018-07-31 13:20:54 +05:30
jitendra 36d50061c7 Product Package Added 2018-07-27 15:00:48 +05:30
jitendra 5f7c432dc5 Channel and families completed 2018-07-27 11:52:12 +05:30
jitendra 3a7ab61082 Currency, Exchange Rate completed 2018-07-24 16:41:32 +05:30
jitendra c87f71427a Attribute Family Feature Added 2018-07-17 18:58:34 +05:30
jitendra 30a5784d75 Attribute Package Added 2018-07-11 11:11:27 +05:30