diff --git a/composer.json b/composer.json index 3b576ab779..373c9baeb8 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "spryker-feature/product-rating-reviews": "^202212.0", "spryker-feature/product-relations": "^202212.0", "spryker-feature/product-sets": "^202212.0", - "spryker-feature/promotions-discounts": "^202212.0", + "spryker-feature/promotions-discounts": "dev-master as 202304.0", "spryker-feature/reclamations": "^202212.0", "spryker-feature/refunds": "^202212.0", "spryker-feature/reorder": "^202212.0", @@ -160,7 +160,7 @@ "spryker/product-discount-connector": "^5.1.0", "spryker/product-image-cart-connector": "^1.2.3", "spryker/product-image-sets-rest-api": "^1.0.5", - "spryker/product-label-discount-connector": "^3.0.3", + "spryker/product-label-discount-connector": "^3.1.0", "spryker/product-labels-rest-api": "^1.3.0", "spryker/product-option-cart-connector": "^7.1.2", "spryker/product-options-rest-api": "^1.2.0", diff --git a/composer.lock b/composer.lock index d2bdd23afb..906b96b7b2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc987c36f9501b06cec025f30316acc6", + "content-hash": "8a1de3cc8fc99ee3742993e31d0beefc", "packages": [ { "name": "async-aws/core", @@ -5971,7 +5971,7 @@ }, { "name": "spryker-feature/promotions-discounts", - "version": "202212.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/spryker-feature/promotions-discounts.git", @@ -5992,6 +5992,7 @@ "spryker/discount": "^9.28.0", "spryker/discount-promotion": "^4.9.0" }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -22406,20 +22407,21 @@ }, { "name": "spryker/discount", - "version": "9.28.0", + "version": "9.32.0", "source": { "type": "git", "url": "https://github.com/spryker/discount.git", - "reference": "ba2be23dce54fcef7355e45f8b03d78bfbe34b1f" + "reference": "ed4d7e273ed6d50d39f16141712859ac9f7b400f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/discount/zipball/ba2be23dce54fcef7355e45f8b03d78bfbe34b1f", - "reference": "ba2be23dce54fcef7355e45f8b03d78bfbe34b1f", + "url": "https://api.github.com/repos/spryker/discount/zipball/ed4d7e273ed6d50d39f16141712859ac9f7b400f", + "reference": "ed4d7e273ed6d50d39f16141712859ac9f7b400f", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=8.0", + "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/cart-code-extension": "^1.1.0", "spryker/cart-extension": "^1.0.0 || ^2.0.0 || ^4.0.0", "spryker/currency": "^3.1.0", @@ -22477,9 +22479,9 @@ ], "description": "Discount module", "support": { - "source": "https://github.com/spryker/discount/tree/9.28.0" + "source": "https://github.com/spryker/discount/tree/9.32.0" }, - "time": "2022-09-19T06:48:51+00:00" + "time": "2023-03-10T14:11:16+00:00" }, { "name": "spryker/discount-calculation-connector", @@ -32253,23 +32255,25 @@ }, { "name": "spryker/product-label-discount-connector", - "version": "3.0.3", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/spryker/product-label-discount-connector.git", - "reference": "eb1e1c5977e2935c1081da9b9b0e7573ad67dbdb" + "reference": "006a4e5b7864d27cc89355373dea78a5fa3106d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-label-discount-connector/zipball/eb1e1c5977e2935c1081da9b9b0e7573ad67dbdb", - "reference": "eb1e1c5977e2935c1081da9b9b0e7573ad67dbdb", + "url": "https://api.github.com/repos/spryker/product-label-discount-connector/zipball/006a4e5b7864d27cc89355373dea78a5fa3106d1", + "reference": "006a4e5b7864d27cc89355373dea78a5fa3106d1", "shasum": "" }, "require": { - "php": ">=7.2", - "spryker/discount": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^9.0.0", + "php": ">=8.0", + "spryker/discount": "^4.7.0 || ^5.3.0 || ^6.5.0 || ^7.6.0 || ^9.30.0", + "spryker/discount-extension": "^1.2.0", "spryker/kernel": "^3.30.0", - "spryker/product-label": "^1.1.0 || ^2.0.0 || ^3.0.0" + "spryker/product-label": "^1.2.0 || ^2.9.0 || ^3.6.0", + "spryker/transfer": "^3.27.0" }, "require-dev": { "spryker/code-sniffer": "*", @@ -32294,9 +32298,9 @@ ], "description": "ProductLabelDiscountConnector module", "support": { - "source": "https://github.com/spryker/product-label-discount-connector/tree/master" + "source": "https://github.com/spryker/product-label-discount-connector/tree/3.1.0" }, - "time": "2020-05-29T13:08:37+00:00" + "time": "2023-03-10T13:03:26+00:00" }, { "name": "spryker/product-label-gui", @@ -32359,23 +32363,23 @@ }, { "name": "spryker/product-label-search", - "version": "2.3.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/spryker/product-label-search.git", - "reference": "3323f9a742adeaa7f6e90be39621d9885233ae5f" + "reference": "05b4df6c9d86626c0377f3427f118c9886f93a26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-label-search/zipball/3323f9a742adeaa7f6e90be39621d9885233ae5f", - "reference": "3323f9a742adeaa7f6e90be39621d9885233ae5f", + "url": "https://api.github.com/repos/spryker/product-label-search/zipball/05b4df6c9d86626c0377f3427f118c9886f93a26", + "reference": "05b4df6c9d86626c0377f3427f118c9886f93a26", "shasum": "" }, "require": { "php": ">=8.0", "spryker/event-behavior": "^1.1.0", "spryker/kernel": "^3.30.0", - "spryker/product-label": "^3.4.0", + "spryker/product-label": "^3.7.0", "spryker/product-page-search": "^0.1.0 || ^1.0.0 || ^2.2.0 || ^3.0.0", "spryker/product-page-search-extension": "^1.0.0", "spryker/publisher-extension": "^1.0.0", @@ -32412,9 +32416,9 @@ ], "description": "ProductLabelSearch module", "support": { - "source": "https://github.com/spryker/product-label-search/tree/2.3.0" + "source": "https://github.com/spryker/product-label-search/tree/2.5.0" }, - "time": "2023-01-16T13:42:24+00:00" + "time": "2023-03-15T13:52:45+00:00" }, { "name": "spryker/product-label-storage", @@ -55323,6 +55327,12 @@ "alias": "202304.0", "alias_normalized": "202304.0" }, + { + "package": "spryker-feature/promotions-discounts", + "version": "9999999-dev", + "alias": "202304.0", + "alias_normalized": "202304.0" + }, { "package": "spryker-feature/tax", "version": "9999999-dev", @@ -55340,6 +55350,7 @@ "spryker-feature/product": 20, "spryker-feature/product-labels": 20, "spryker-feature/product-lists": 20, + "spryker-feature/promotions-discounts": 20, "spryker-feature/tax": 20, "spryker-feature/development-tools": 20, "spryker-sdk/integrator": 20, diff --git a/src/Pyz/Zed/Discount/DiscountDependencyProvider.php b/src/Pyz/Zed/Discount/DiscountDependencyProvider.php index dd278b94c2..5c397a4eda 100644 --- a/src/Pyz/Zed/Discount/DiscountDependencyProvider.php +++ b/src/Pyz/Zed/Discount/DiscountDependencyProvider.php @@ -28,8 +28,8 @@ use Spryker\Zed\MoneyGui\Communication\Plugin\Form\MoneyCollectionFormTypePlugin; use Spryker\Zed\ProductDiscountConnector\Communication\Plugin\Collector\ProductAttributeCollectorPlugin; use Spryker\Zed\ProductDiscountConnector\Communication\Plugin\DecisionRule\ProductAttributeDecisionRulePlugin; -use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\Collector\ProductLabelCollectorPlugin; -use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\DecisionRule\ProductLabelDecisionRulePlugin; +use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\Discount\ProductLabelDiscountableItemCollectorPlugin; +use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\Discount\ProductLabelListDecisionRulePlugin; use Spryker\Zed\SalesQuantity\Communication\Plugin\DiscountExtension\NonSplittableDiscountableItemTransformerStrategyPlugin; use Spryker\Zed\ShipmentDiscountConnector\Communication\Plugin\DecisionRule\ShipmentCarrierDecisionRulePlugin; use Spryker\Zed\ShipmentDiscountConnector\Communication\Plugin\DecisionRule\ShipmentMethodDecisionRulePlugin; @@ -51,7 +51,7 @@ protected function getDecisionRulePlugins(): array new ShipmentMethodDecisionRulePlugin(), new ShipmentPriceDecisionRulePlugin(), new CustomerGroupDecisionRulePlugin(), - new ProductLabelDecisionRulePlugin(), + new ProductLabelListDecisionRulePlugin(), new ProductAttributeDecisionRulePlugin(), new CategoryDecisionRulePlugin(), ]); @@ -63,7 +63,7 @@ protected function getDecisionRulePlugins(): array protected function getCollectorPlugins(): array { return array_merge(parent::getCollectorPlugins(), [ - new ProductLabelCollectorPlugin(), + new ProductLabelDiscountableItemCollectorPlugin(), new ItemByShipmentCarrierPlugin(), new ItemByShipmentMethodPlugin(), new ItemByShipmentPricePlugin(),