From ca32ca161ccec190c9149916b18e23ae9be45e6f Mon Sep 17 00:00:00 2001 From: AntonKhabiuk Date: Mon, 16 Dec 2024 13:28:00 +0200 Subject: [PATCH 01/10] CC-34932 Add Merchant Discount feature IG --- ...rchant-promotions-and-discounts-feature.md | 85 +++++++++++++++++++ ...rchant-promotions-and-discounts-feature.md | 8 ++ 2 files changed, 93 insertions(+) create mode 100644 _includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md create mode 100644 docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md new file mode 100644 index 0000000000..4acc9f2719 --- /dev/null +++ b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md @@ -0,0 +1,85 @@ +This document describes how to install the Merchant + Promotions & Discounts feature. + +## Install feature core + +Follow the steps below to install the feature core. + +### Prerequisites + +Install the required features: + +| NAME | VERSION | INSTALLATION GUIDE | +|------------------------|------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Marketplace Merchant | {{page.version}} | [Install the Marketplace Merchant feature](/docs/pbc/all/merchant-management/{{page.version}}/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-feature.html) | +| Promotions & Discounts | {{page.version}} | [Install the Promotions & Discounts feature](/docs/pbc/all/discount-management/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-promotions-and-discounts-feature.html) | +| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | + +### 1) Install the required modules + +Install the required modules using Composer: + +```bash +composer require spryker/merchant-discount-connector:"^1.0.0" --update-with-dependencies +``` + +{% info_block warningBox "Verification" %} + +Make sure the following modules have been installed: + +| MODULE | EXPECTED DIRECTORY | +|---------------------------|--------------------------------------------| +| MerchantDiscountConnector | vendor/spryker/merchant-discount-connector | + +{% endinfo_block %} + +### 2) Set up behavior + +Set up the following behaviors: + +| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | +|--------------------------------------------------|------------------------------------------------------------------------------------------|---------------|---------------------------------------------------------------------| +| MerchantReferenceDecisionRulePlugin | Defines if a discount can be applied to a cart item with a merchant reference specified. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | +| MerchantReferenceDiscountableItemCollectorPlugin | Collects the cart items with merchant reference to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | + +**src/Pyz/Zed/Discount/DiscountDependencyProvider.php** + +```php + + */ + protected function getDecisionRulePlugins(): array + { + return array_merge(parent::getDecisionRulePlugins(), [ + new MerchantReferenceDecisionRulePlugin(), + ]); + } + + /** + * @return list<\Spryker\Zed\DiscountExtension\Dependency\Plugin\DiscountableItemCollectorPluginInterface> + */ + protected function getCollectorPlugins(): array + { + return array_merge(parent::getCollectorPlugins(), [ + new MerchantReferenceDiscountableItemCollectorPlugin(), + ]); + } +} +``` + +{% info_block warningBox "Verification" %} + +1. [Create a discount](/docs/pbc/all/discount-management/{{site.version}}/base-shop/manage-in-the-back-office/create-discounts.html) and define its condition as a query string with a `merchant-refernce` field. +2. Add a product sold by the defined merchant to the cart. +3. Verify that the discount is applied to the cart. + +{% endinfo_block %} diff --git a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md new file mode 100644 index 0000000000..00b213b612 --- /dev/null +++ b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md @@ -0,0 +1,8 @@ +--- +title: Install the Merchant + Promotions & Discounts feature +description: Learn how to integrate the Merchant + Promotions & Discounts feature into a Spryker project. +last_updated: Dec 16, 2024 +template: feature-integration-guide-template +--- + +{% include pbc/all/install-features/{{page.version}}/install-the-merchant-promotions-and-discounts-feature.md %} From 6ed95d42cb7468c2d4f0cf430bc9e9ac257237d2 Mon Sep 17 00:00:00 2001 From: AntonKhabiuk Date: Tue, 17 Dec 2024 11:43:20 +0200 Subject: [PATCH 02/10] CC-34932 Fixes after CR --- .../install-the-merchant-promotions-and-discounts-feature.md | 4 ++-- .../install-the-merchant-promotions-and-discounts-feature.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md index 4acc9f2719..c4b5daa5e4 100644 --- a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md +++ b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md @@ -78,8 +78,8 @@ class DiscountDependencyProvider extends SprykerDiscountDependencyProvider {% info_block warningBox "Verification" %} -1. [Create a discount](/docs/pbc/all/discount-management/{{site.version}}/base-shop/manage-in-the-back-office/create-discounts.html) and define its condition as a query string with a `merchant-refernce` field. -2. Add a product sold by the defined merchant to the cart. +1. [Create a discount](/docs/pbc/all/discount-management/{{site.version}}/base-shop/manage-in-the-back-office/create-discounts.html) and define its condition as a query string with a `merchant-reference` field. +2. Add a product sold by the merchant defined in the newly created discount to the cart. 3. Verify that the discount is applied to the cart. {% endinfo_block %} diff --git a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md index 00b213b612..fa66fce894 100644 --- a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md +++ b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md @@ -5,4 +5,4 @@ last_updated: Dec 16, 2024 template: feature-integration-guide-template --- -{% include pbc/all/install-features/{{page.version}}/install-the-merchant-promotions-and-discounts-feature.md %} +{% include pbc/all/install-features/{{page.version}}/marketplace/install-the-merchant-promotions-and-discounts-feature.md %} From 86c853727cb2db02375807626ef73e635aaf4005 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 19 Dec 2024 11:33:18 +0200 Subject: [PATCH 03/10] tw-review --- ...-merchant-promotions-and-discounts-feature.md | 16 ++++++---------- ...-merchant-promotions-and-discounts-feature.md | 0 2 files changed, 6 insertions(+), 10 deletions(-) rename docs/pbc/all/{discount-management => merchant-management}/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md (100%) diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md index c4b5daa5e4..4509e0207f 100644 --- a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md +++ b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md @@ -1,10 +1,6 @@ This document describes how to install the Merchant + Promotions & Discounts feature. -## Install feature core - -Follow the steps below to install the feature core. - -### Prerequisites +## Prerequisites Install the required features: @@ -14,7 +10,7 @@ Install the required features: | Promotions & Discounts | {{page.version}} | [Install the Promotions & Discounts feature](/docs/pbc/all/discount-management/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-promotions-and-discounts-feature.html) | | Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | -### 1) Install the required modules +## 1) Install the required modules Install the required modules using Composer: @@ -32,14 +28,14 @@ Make sure the following modules have been installed: {% endinfo_block %} -### 2) Set up behavior +## 2) Set up behavior Set up the following behaviors: | PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | |--------------------------------------------------|------------------------------------------------------------------------------------------|---------------|---------------------------------------------------------------------| | MerchantReferenceDecisionRulePlugin | Defines if a discount can be applied to a cart item with a merchant reference specified. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | -| MerchantReferenceDiscountableItemCollectorPlugin | Collects the cart items with merchant reference to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | +| MerchantReferenceDiscountableItemCollectorPlugin | Collects cart items with a merchant reference to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | **src/Pyz/Zed/Discount/DiscountDependencyProvider.php** @@ -79,7 +75,7 @@ class DiscountDependencyProvider extends SprykerDiscountDependencyProvider {% info_block warningBox "Verification" %} 1. [Create a discount](/docs/pbc/all/discount-management/{{site.version}}/base-shop/manage-in-the-back-office/create-discounts.html) and define its condition as a query string with a `merchant-reference` field. -2. Add a product sold by the merchant defined in the newly created discount to the cart. -3. Verify that the discount is applied to the cart. +2. Add a product sold by the merchant you've defined in the discount to cart. + Make sure the discount has been applied. {% endinfo_block %} diff --git a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md similarity index 100% rename from docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md rename to docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md From f6ebb4f0182dde3fc343ce5b6ba6417ca62393c9 Mon Sep 17 00:00:00 2001 From: AntonKhabiuk Date: Thu, 19 Dec 2024 13:17:01 +0200 Subject: [PATCH 04/10] CC-34932 Fixes after CR --- ...ketplace-merchant-promotions-and-discounts-feature.md} | 2 +- ...rketplace-merchant-promotions-and-discounts-feature.md | 8 ++++++++ ...stall-the-merchant-promotions-and-discounts-feature.md | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) rename _includes/pbc/all/install-features/202505.0/marketplace/{install-the-merchant-promotions-and-discounts-feature.md => install-the-marketplace-merchant-promotions-and-discounts-feature.md} (97%) create mode 100644 docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md delete mode 100644 docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md similarity index 97% rename from _includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md rename to _includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md index c4b5daa5e4..75dc9f3744 100644 --- a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md +++ b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md @@ -1,4 +1,4 @@ -This document describes how to install the Merchant + Promotions & Discounts feature. +This document describes how to install the Marketplace Merchant + Promotions & Discounts feature. ## Install feature core diff --git a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md new file mode 100644 index 0000000000..f146f1ad96 --- /dev/null +++ b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md @@ -0,0 +1,8 @@ +--- +title: Install the Marketplace Merchant + Promotions & Discounts feature +description: Learn how to integrate the Marketplace Merchant + Promotions & Discounts feature into a Spryker project. +last_updated: Dec 19, 2024 +template: feature-integration-guide-template +--- + +{% include pbc/all/install-features/{{page.version}}/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md %} diff --git a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md deleted file mode 100644 index fa66fce894..0000000000 --- a/docs/pbc/all/discount-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Install the Merchant + Promotions & Discounts feature -description: Learn how to integrate the Merchant + Promotions & Discounts feature into a Spryker project. -last_updated: Dec 16, 2024 -template: feature-integration-guide-template ---- - -{% include pbc/all/install-features/{{page.version}}/marketplace/install-the-merchant-promotions-and-discounts-feature.md %} From 2a33ea9d05ca45cc03c601d50f14acb87d7fa873 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 2 Jan 2025 17:32:23 +0200 Subject: [PATCH 05/10] rename --- ...-the-marketplace-merchant-promotions-and-discounts-feature.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _includes/pbc/all/install-features/202505.0/marketplace/{install-the-merchant-promotions-and-discounts-feature.md => _includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md} (100%) diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md similarity index 100% rename from _includes/pbc/all/install-features/202505.0/marketplace/install-the-merchant-promotions-and-discounts-feature.md rename to _includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md From 0189a6fd5bb0618ab7b650ca070ffc47fc7aeda0 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 2 Jan 2025 17:34:14 +0200 Subject: [PATCH 06/10] rename --- ...the-marketplace-merchant-promotions-and-discounts-feature.md | 2 +- ...he-marketplace-merchant-promotions-and-discounts-feature.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/{install-the-merchant-promotions-and-discounts-feature.md => install-the-marketplace-merchant-promotions-and-discounts-feature.md} (100%) diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md index 4509e0207f..8e418473d1 100644 --- a/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md +++ b/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md @@ -1,4 +1,4 @@ -This document describes how to install the Merchant + Promotions & Discounts feature. +This document describes how to install the Marketplace Merchant + Promotions & Discounts feature. ## Prerequisites diff --git a/docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md b/docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md similarity index 100% rename from docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-merchant-promotions-and-discounts-feature.md rename to docs/pbc/all/merchant-management/202505.0/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.md From b69088087bbac5847ed699beaaed243e61b53a72 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 2 Jan 2025 17:41:45 +0200 Subject: [PATCH 07/10] Delete install-the-marketplace-merchant-promotions-and-discounts-feature.md --- ...rchant-promotions-and-discounts-feature.md | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 _includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md deleted file mode 100644 index 8e418473d1..0000000000 --- a/_includes/pbc/all/install-features/202505.0/marketplace/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md +++ /dev/null @@ -1,81 +0,0 @@ -This document describes how to install the Marketplace Merchant + Promotions & Discounts feature. - -## Prerequisites - -Install the required features: - -| NAME | VERSION | INSTALLATION GUIDE | -|------------------------|------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Marketplace Merchant | {{page.version}} | [Install the Marketplace Merchant feature](/docs/pbc/all/merchant-management/{{page.version}}/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-feature.html) | -| Promotions & Discounts | {{page.version}} | [Install the Promotions & Discounts feature](/docs/pbc/all/discount-management/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-promotions-and-discounts-feature.html) | -| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | - -## 1) Install the required modules - -Install the required modules using Composer: - -```bash -composer require spryker/merchant-discount-connector:"^1.0.0" --update-with-dependencies -``` - -{% info_block warningBox "Verification" %} - -Make sure the following modules have been installed: - -| MODULE | EXPECTED DIRECTORY | -|---------------------------|--------------------------------------------| -| MerchantDiscountConnector | vendor/spryker/merchant-discount-connector | - -{% endinfo_block %} - -## 2) Set up behavior - -Set up the following behaviors: - -| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | -|--------------------------------------------------|------------------------------------------------------------------------------------------|---------------|---------------------------------------------------------------------| -| MerchantReferenceDecisionRulePlugin | Defines if a discount can be applied to a cart item with a merchant reference specified. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | -| MerchantReferenceDiscountableItemCollectorPlugin | Collects cart items with a merchant reference to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | - -**src/Pyz/Zed/Discount/DiscountDependencyProvider.php** - -```php - - */ - protected function getDecisionRulePlugins(): array - { - return array_merge(parent::getDecisionRulePlugins(), [ - new MerchantReferenceDecisionRulePlugin(), - ]); - } - - /** - * @return list<\Spryker\Zed\DiscountExtension\Dependency\Plugin\DiscountableItemCollectorPluginInterface> - */ - protected function getCollectorPlugins(): array - { - return array_merge(parent::getCollectorPlugins(), [ - new MerchantReferenceDiscountableItemCollectorPlugin(), - ]); - } -} -``` - -{% info_block warningBox "Verification" %} - -1. [Create a discount](/docs/pbc/all/discount-management/{{site.version}}/base-shop/manage-in-the-back-office/create-discounts.html) and define its condition as a query string with a `merchant-reference` field. -2. Add a product sold by the merchant you've defined in the discount to cart. - Make sure the discount has been applied. - -{% endinfo_block %} From 6943b35f8d8ba999d52a5808cd1f253b1691d623 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 2 Jan 2025 18:45:21 +0200 Subject: [PATCH 08/10] sidebar --- _data/sidebars/pbc_all_sidebar.yml | 4 ++++ ...e-marketplace-merchant-promotions-and-discounts-feature.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/_data/sidebars/pbc_all_sidebar.yml b/_data/sidebars/pbc_all_sidebar.yml index e578fe42a3..c30ce3fe1b 100644 --- a/_data/sidebars/pbc_all_sidebar.yml +++ b/_data/sidebars/pbc_all_sidebar.yml @@ -1479,6 +1479,10 @@ entries: nested: - title: Marketplace Merchant url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-feature.html + - title: Marketplace Merchant + Promotions & Discounts + url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-promotions-and-discounts-feature.html + include_versions: + - "202505.0" - title: Marketplace Merchant B2B Contract Requests url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-marketplace-merchant-b2b-contract-requests-feature.html include_versions: diff --git a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md index 8e418473d1..cf2d04c0b7 100644 --- a/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md +++ b/_includes/pbc/all/install-features/202505.0/marketplace/install-the-marketplace-merchant-promotions-and-discounts-feature.md @@ -35,7 +35,7 @@ Set up the following behaviors: | PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | |--------------------------------------------------|------------------------------------------------------------------------------------------|---------------|---------------------------------------------------------------------| | MerchantReferenceDecisionRulePlugin | Defines if a discount can be applied to a cart item with a merchant reference specified. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | -| MerchantReferenceDiscountableItemCollectorPlugin | Collects cart items with a merchant reference to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | +| MerchantReferenceDiscountableItemCollectorPlugin | Collects cart items with the reference of a merchant to which a discount should be applied. | | Spryker\Zed\MerchantDiscountConnector\Communication\Plugin\Discount | **src/Pyz/Zed/Discount/DiscountDependencyProvider.php** From 8d8a37d7e536de846e068bbb657762bf273a2914 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Thu, 2 Jan 2025 18:51:29 +0200 Subject: [PATCH 09/10] links --- .../install-recommended-vs-code-extensions.md | 2 +- docs/ca/dev/access/connect-to-services-via-ssh.md | 2 +- docs/ca/dev/getting-started-with-cloud-administration.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/about/all/about-the-docs/contribute-to-the-docs/install-recommended-vs-code-extensions.md b/docs/about/all/about-the-docs/contribute-to-the-docs/install-recommended-vs-code-extensions.md index d7ac4f6fb8..7b3377b95f 100644 --- a/docs/about/all/about-the-docs/contribute-to-the-docs/install-recommended-vs-code-extensions.md +++ b/docs/about/all/about-the-docs/contribute-to-the-docs/install-recommended-vs-code-extensions.md @@ -44,7 +44,7 @@ When Vale identifies an issue, it highlights the relevant text and displays an i Additionally, Vale displays feedback in the VS Code **PROBLEMS** pane, which provides a list of all the issues found in the file. To navigate directly to the relevant line of code in the file and make corrections, you need to click an issue in the **PROBLEMS** pane. -For more information about Vale, see [Vale's official documentation](https://vale.sh/docs/vale-cli/overview/). +For more information about Vale, see [Vale's official documentation](https://vale.sh/docs/cli). ## Install Vale diff --git a/docs/ca/dev/access/connect-to-services-via-ssh.md b/docs/ca/dev/access/connect-to-services-via-ssh.md index a64f20e661..c3ff4b8bf4 100644 --- a/docs/ca/dev/access/connect-to-services-via-ssh.md +++ b/docs/ca/dev/access/connect-to-services-via-ssh.md @@ -11,7 +11,7 @@ redirect_from: - /docs/cloud/dev/spryker-cloud-commerce-os/access/connecting-to-services-via-ssh.html --- -We add your SSH public key to the [bastion host](https://docs.aws.amazon.com/quickstart/latest/linux-bastion/overview.html) during the onboarding, so you can access your environments' internal networks via SSH right after. +We add your SSH public key to the [bastion host](https://docs.aws.amazon.com/managedservices/latest/userguide/using-bastions.html) during the onboarding, so you can access your environments' internal networks via SSH right after. You can use SSH in two ways: diff --git a/docs/ca/dev/getting-started-with-cloud-administration.md b/docs/ca/dev/getting-started-with-cloud-administration.md index d134941c2d..ab5d518a27 100644 --- a/docs/ca/dev/getting-started-with-cloud-administration.md +++ b/docs/ca/dev/getting-started-with-cloud-administration.md @@ -36,8 +36,8 @@ After the initial setup, the following is configured and available: You can access your cloud environments via the following means: * IAM account: provides access to the AWS Management Console. For instructions, see [Access AWS Management Console](/docs/ca/dev/access/access-the-aws-management-console.html). -* SSH: provides access to internal services via [bastion host](https://docs.aws.amazon.com/quickstart/latest/linux-bastion/overview.html). For instructions, see [Connect to services via SSH](/docs/ca/dev/access/connect-to-services-via-ssh.html). -* VPN: provides access to internal services via [bastion host](https://docs.aws.amazon.com/quickstart/latest/linux-bastion/overview.html). You receive these access details during the onboarding. +* SSH: provides access to internal services via [bastion host](https://docs.aws.amazon.com/managedservices/latest/userguide/using-bastions.html). For instructions, see [Connect to services via SSH](/docs/ca/dev/access/connect-to-services-via-ssh.html). +* VPN: provides access to internal services via [bastion host](https://docs.aws.amazon.com/managedservices/latest/userguide/using-bastions.html). You receive these access details during the onboarding. * SFTP: provides access to the SFTP folder mounted inside the Jenkins container. You receive these access details during the onboarding. From d86bdfc12ddd27264285cc4f513b6ba0508d35e1 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Fri, 3 Jan 2025 17:45:22 +0200 Subject: [PATCH 10/10] Update data-virtuality.md --- .../operational-tools-monitoring-legal/data-virtuality.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pbc/all/miscellaneous/202410.0/third-party-integrations/operational-tools-monitoring-legal/data-virtuality.md b/docs/pbc/all/miscellaneous/202410.0/third-party-integrations/operational-tools-monitoring-legal/data-virtuality.md index ccc723530e..aaf03946e8 100644 --- a/docs/pbc/all/miscellaneous/202410.0/third-party-integrations/operational-tools-monitoring-legal/data-virtuality.md +++ b/docs/pbc/all/miscellaneous/202410.0/third-party-integrations/operational-tools-monitoring-legal/data-virtuality.md @@ -11,7 +11,7 @@ redirect_from: ## Partner Information -[ABOUT DATA VIRTUALITY](https://datavirtuality.com/) +[ABOUT DATA VIRTUALITY](https://www.cdata.com/virtuality/) Data Virtuality successfully became the fastest growing big data start-up in Germany with offices in Leipzig, Frankfurt am Main and San Francisco.The Data Virtuality Platform enables detailed insights from real time and historical data with any BI tool. By combining data virtualization with an automated ETL engine, customers benefit from reducing their data integration effort by 80% and gaining faster business insights. Make your decisions based on facts. Become data driven while using and accessing all your data from multiple data sources! And everything just by using SQL.