Commit Graph

7 Commits

Author SHA1 Message Date
Annika Wolff 752ff116bd
bagisto master backmerge (#26)
* introduce cronjob to automatically deactivate expired events

* remove irrelevant code

* extend cart rule validation with search in cart item additional

* add additional to all languages

* add ValidatorCest

* add ValidatorCest

* Fixed case sensitivity typo in Bundle class

* Update 503.blade.php

* Added customer group price

* Fixed bundle type class compatablity issue

* Refactor some changes

Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>

* add english translation to foreign languages

* fix compatibility issue to AbstractType

* check if product_id exists

* make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication

* add table, lists, link and hr functionality to editor

* Issue #3164 fixed

* Turkish Language added and English language duplicate rows deleted.

* Turkish Language added and English language duplicate rows deleted.

* Turkish Language added and English language duplicate rows deleted.

* Issue #3113 fixed

* fix tiny issues due to code guidelines

* add default value for search term

* fix typo

* Fixed typo in customer group price migration

* Issue #3171 fixed

* Issue #3070 fixed

* minified jquery-ez-plus file

* Issue #3160 fixed

Co-authored-by: Shubham Mehrotra <shubh0896m@gmail.com>
Co-authored-by: Matt April <matthew.japril@gmail.com>
Co-authored-by: bhumikaisarani <63963172+bhumikaisarani@users.noreply.github.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Co-authored-by: Florian Bosdorff <26360670+bosix@users.noreply.github.com>
Co-authored-by: Herbert Maschke <thyseus@pm.me>
Co-authored-by: phillipmohr <phillip.mohr@sellerboost.de>
Co-authored-by: İlyas Okay <ilyasokay@hotmail.com>
Co-authored-by: Florian Bosdorff <florian.bosdorff@haendlerbund.de>
Co-authored-by: phillipcodes <57101430+phillipcodes@users.noreply.github.com>
2020-06-09 07:55:56 +02:00
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +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 b019a248cf interfaces & proxy class implemented 2019-02-18 13:00:40 +05:30