Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SUPESC-727 Replaced discount product label conditions with IN and NOT IN comparators. #201

Merged
merged 3 commits into from
Mar 28, 2023
Merged

SUPESC-727 Replaced discount product label conditions with IN and NOT IN comparators. #201

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56cf824
SUPESC-727: replaced discount product label conditions with IN and NO…
romanhavrylko Mar 23, 2023
50adbaa
Merge remote-tracking branch 'origin/internal' into bugfix/supesc-727…
romanhavrylko Mar 27, 2023
aeec7b5
SUPESC-727: merged internal branch.
romanhavrylko Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
139 changes: 97 additions & 42 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/Pyz/Zed/Discount/DiscountDependencyProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -51,7 +51,7 @@ protected function getDecisionRulePlugins(): array
new ShipmentMethodDecisionRulePlugin(),
new ShipmentPriceDecisionRulePlugin(),
new CustomerGroupDecisionRulePlugin(),
new ProductLabelDecisionRulePlugin(),
new ProductLabelListDecisionRulePlugin(),
new ProductAttributeDecisionRulePlugin(),
new CategoryDecisionRulePlugin(),
]);
Expand All @@ -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(),
Expand Down