Commit Graph

38 Commits

Author SHA1 Message Date
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
ghermans 7b47e1f173 Added customer overview 2020-06-15 04:29:00 +02:00
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
Jitendra Singh a72401dbba Improved attribute package code style 2020-02-19 17:09:17 +05:30
Jitendra Singh eb3fdc12c6 Removed Developement menu 2020-01-17 14:48:39 +05:30
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
Alexey 8cdc984565 Minified back the admin UI.CSS file 2019-11-13 01:23:50 +04:00
Alexey 25ea011960 Adding Laravel Web Console to the Bagisto 2019-11-13 01:15:56 +04:00
Prashant Singh e5082cca3b Added logo, favicon in fillable of channel model 2019-10-30 10:40:12 +05:30
Prashant Singh 23237f9921 Made Catalog Rules made compatible with new product types and updated issue templates 2019-10-23 19:00:22 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
jitendra 53baa66db9 Refund system completed 2019-09-18 18:57:40 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
Prashant Singh 62d1b23a14 New issue template for filing issue and cut the issue filing hassle 2019-08-31 14:37:40 +05:30
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
Prashant Singh 8a9198e5d9 Catalog rules tie break in progress, squased a line of dead code in CartRuleController 2019-08-19 12:36:43 +05:30
Prashant Singh 1d1018ac50 Refactoring of cart rules and syntax standard sugar 2019-08-17 17:40:17 +05:30
Prashant Singh 8c96bca9b3 Base sync 2019-08-14 16:54:13 +05:30
Prashant Singh 44c33825e0 Cart discount helper namespace fix 2019-08-14 16:53:05 +05:30
Prashant Singh 9425b39b78 Fixed issue #1294 2019-08-14 13:42:27 +05:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Prashant Singh 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +05:30
Prashant Singh 6d41d37c3b Catalog rules migrations finalized 2019-08-08 07:28:08 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 70267e29cb disabled catalog rule 2019-07-22 13:01:54 +05:30
Prashant Singh 0bd422db97 translation fixes in cart rule forms 2019-07-22 13:01:07 +05:30
Prashant Singh 9cf1ea2516 disabled catalog rule till final migrations 2019-07-22 12:54:46 +05:30
Prashant Singh 52e3a64380 Made all submit buttons of create and update buttons style to fixed 2019-07-18 10:10:49 +05:30
Prashant Singh 2a6e43de28 Part of convertxtoid frontend complete in cart rule create form, fixed sort order for catalog in admin panel 2019-07-15 14:11:00 +05:30
Prashant Singh ba31ecd527 Cart rule create and edit forms bug fixes 2019-06-16 22:18:19 +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 a781594b10 Translations added for menu and acl lables 2019-01-15 16:03:55 +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
rahul shukla ef72b4d629 export button & review 2018-12-20 16:38:47 +05:30
jitendra 0bdd9e1a2a Refactor Menu system and core config data system 2018-12-13 16:28:28 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +05:30