Commit Graph

94 Commits

Author SHA1 Message Date
Jitendra Singh dd634691fe Issue #2207 fixed 2020-01-31 12:23:52 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 5cc7b4aae2 Issue #2075 fixed 2020-01-21 12:58:11 +05:30
Jitendra Singh 176feecb55 Resolved conflicts 2020-01-20 19:59:04 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
Jitendra Singh dfa4272cf2
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
2020-01-20 13:27:04 +05:30
Jitendra Singh b4319e1f38 Issue #1863 fixed 2020-01-15 17:08:37 +05:30
peternuernberger 910a5d6967 optimized some tree methods 2020-01-07 16:52:30 +01:00
peternuernberger 90a182ec94 fixed getRootCategory 2020-01-06 16:52:48 +01:00
peternuernberger 6f4b7474cb Merge remote-tracking branch 'bagisto-hb/category-url-structure-multiple-roots' into 18472-bugfix/add-category-url-path 2020-01-06 16:28:00 +01:00
peternuernberger fcb5cdec46 multiple root categories fix 2020-01-06 16:26:20 +01:00
MonaHartdegen f4499b4728 altered trigger to be compatible with multi root categories environment; tests still WIP 2020-01-03 15:22:09 +01:00
peternuernberger 97dcf89740 refactored model reference 2019-12-30 13:28:09 +01:00
peternuernberger 04fee503d8 added space after ! 2019-12-30 12:56:15 +01:00
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +05:30
peternuernberger a2f2c650a4 added method that returns path categories 2019-12-23 17:13:48 +01:00
peternuernberger 405c979375 added use statement 2019-12-23 17:13:12 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
MonaHartdegen 1d9892699d use method touch in CategoryObserver 2019-12-10 08:43:45 +01:00
MonaHartdegen 8f010045e7 final commit on this pr: added trick in CategoryObserver to make it unit testable (unit tests not included) 2019-12-09 15:57:46 +01:00
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
MonaHartdegen 0eb9cfc86d added comment to db column; added @property-read to Category and CategoryTranslation model 2019-12-03 13:24:11 +01:00
Mona Hartdegen 25c2a15b65 introduced url structure for categories and products (SEO improvements) 2019-11-21 17:14:53 +01:00
Herbert 4261590102 add resources/manifest.php skeletons for Webkul packages 2019-11-13 12:02:56 +01:00
Prashant Singh 832c845091 Fixed issue #1543 and Cart rule related issues 2019-11-01 15:40:11 +05:30
jitendra b24c2507e8 Issue #1250 fixed 2019-10-14 12:22:58 +05:30
jitendra 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
rahul shukla 1cd6916c2b issue #1351 2019-09-06 15:11:21 +05:30
rahul shukla 6e32b928ac issue #1351 2019-09-06 15:08:17 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
rahul shukla 561803cd3c filterable attribute for category, tax price update on cart and issue #1234 2019-07-31 17:44:29 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh 42d067c44a Optimization in exception handling for separate admin and shop providers, whilst convertxtoproductid is in UI development 2019-07-14 07:30:16 +05:30
rahul shukla 20a205deba locale id in cstegory trnaslation 2019-07-11 19:45:48 +05:30
jitendra 318857b785 Now images will be deleted too if the model gets deleted 2019-07-01 19:42:12 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +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 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 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 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30