From 6690187e68912a5a5ae0d25f2c7c8f601d03bb0b Mon Sep 17 00:00:00 2001 From: Yuliia Sakharova Date: Thu, 24 Jun 2021 11:41:17 +0300 Subject: [PATCH 01/11] BO-2260: Add IG for merchant portal forgot password functionality. --- _data/sidebars/marketplace_dev_sidebar.yml | 3 + ...ant-portal-core-cms-feature-integration.md | 106 ++++++++++++++++ ...erchant-portal-core-feature-integration.md | 115 ++++++++++++++++-- 3 files changed, 215 insertions(+), 9 deletions(-) create mode 100644 docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-cms-feature-integration.md diff --git a/_data/sidebars/marketplace_dev_sidebar.yml b/_data/sidebars/marketplace_dev_sidebar.yml index 15065db7767..86d5f5c0609 100644 --- a/_data/sidebars/marketplace_dev_sidebar.yml +++ b/_data/sidebars/marketplace_dev_sidebar.yml @@ -93,6 +93,9 @@ entries: - title: Merchant Portal - Core feature integration url: /docs/marketplace/dev/feature-integration-guides/merchant-portal-core-feature-integration.html + - title: Merchant Portal - Core + CMS feature integration + url: /docs/marketplace/dev/feature-integration-guides/merchant-portal-core-cms-feature-integration.html + - title: Merchant Portal - Marketplace Merchant feature integration url: /docs/marketplace/dev/feature-integration-guides/merchant-portal-marketplace-merchant-feature-integration.html diff --git a/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-cms-feature-integration.md b/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-cms-feature-integration.md new file mode 100644 index 00000000000..d9e0ba637ff --- /dev/null +++ b/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-cms-feature-integration.md @@ -0,0 +1,106 @@ +--- +title: Marketplace Merchant Portal Core feature + CMS integration +last_updated: Mar 31, 2021 +description: This document describes how to integrate the Merchant Portal Core feature into a Spryker project. +template: feature-integration-guide-template +--- + +This document describes how to integrate the Marketplace Merchant Portal Core + CMS feature into a Spryker project. + +## Install feature core + +Follow the steps below to install the Merchant Portal Core + CMS feature core. + +## Prerequisites + +To start feature integration, integrate the required features: + +| NAME | VERSION | INTEGRATION GUIDE | +| -------------------- | ---------- | ---------| +| Spryker Core | dev-master | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | +| CMS | 202009.0 | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) +| Marketplace Merchant Portal Core | dev-master | [Marketplace Merchant Portal Cor](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) + +### 1) Create merchant restore password email templates + +Set up templates as follows: + +1. Create the following templates: + +**src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.html.twig** + +```html +{{ renderCmsBlockAsTwig( +'merchant_restore_password--html', +constant('APPLICATION_STORE'), +mail.locale.localeName, +{mail: mail} +) }} +``` + +**src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.text.twig** + +```html +{{ renderCmsBlockAsTwig( +'merchant_restore_password--text', +constant('APPLICATION_STORE'), +mail.locale.localeName, +{mail: mail} +) }} +``` + +### 2) Create CMS blocks + +Import CMS blocks as follows (or create them via zed backoffice): + +1. Add the following csv file: + +**data/import/common/common/cms_block.csv** + +```csv +block_key,block_name,template_name,template_path,active,placeholder.title.de_DE,placeholder.title.en_US,placeholder.description.de_DE,placeholder.description.en_US,placeholder.link.de_DE,placeholder.link.en_US,placeholder.content.de_DE,placeholder.content.en_US +cms-block-email--merchant_restore_password--html,merchant_restore_password--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.twig,1,,,,,,,"

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
","

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
" +cms-block-email--merchant_restore_password--text,merchant_restore_password--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) +``` + +2. Add the following csv file: + +Import cms blocks: + +```bash +console data:import:cms-block +``` + +3. Enable cms blocks per needed store via importing the next data (or enable them via zed backoffice) + +**data/import/common/AT/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,AT +cms-block-email--merchant_restore_password--text,AT +``` + +**data/import/common/DE/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,DE +cms-block-email--merchant_restore_password--text,DE +``` +**data/import/common/US/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,US +cms-block-email--merchant_restore_password--text,US +``` + +Import cms blocks per needed store: +```bash +console data:import:cms-block-store +``` + +{% info_block warningBox "Verification" %} + +Make sure that the following data has been added ti the database diff --git a/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-feature-integration.md b/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-feature-integration.md index 1f0bb3eaa4a..0a15fcfe0b6 100644 --- a/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-feature-integration.md +++ b/docs/marketplace/dev/feature-integration-guides/202106.0/merchant-portal-core-feature-integration.md @@ -38,9 +38,11 @@ Make sure that the following modules have been installed: | DashboardMerchantPortalGui | vendor/spryker/dashboard-merchant-portal-gui | | DashboardMerchantPortalGuiExtension | vendor/spryker/dashboard-merchant-portal-gui-extension | | SecurityMerchantPortalGui | vendor/spryker/security-merchant-portal-gui | +| MerchantUserPasswordResetMail | vendor/spryker/merchant-user-password-reset-mail | | ZedUi | vendor/spryker/zed-ui | | GuiTable | vendor/spryker/gui-table | + {% endinfo_block %} ### 2) Set up behavior @@ -52,10 +54,12 @@ Set up behavior as follows: | PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | | ----------- | ------------ | ------------- | --------- | | MerchantUserSecurityPlugin | Sets security firewalls (rules, handlers) for Marketplace users. | | Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\Security | -| BooleanToStringTwigPlugin | Adds a new Twig function for converting Boolean to String | | Spryker\Zed\ZedUi\Communication\Plugin\Twig | -| ZedUiNavigationTwigPlugin | Adds a new Twig function for rendering Navigation using web components | | Spryker\Zed\ZedUi\Communication\Plugin | -| GuiTableApplicationPlugin | Enables GuiTable infrastructure for Zed | | Spryker\Zed\GuiTable\Communication\Plugin\Application | -| GuiTableConfigurationTwigPlugin | Add a new Twig function for rendering GuiTableConfiguration for the GuiTable web component | | Spryker\Zed\GuiTable\Communication\Plugin\Twigextend(static::MAIL_TYPE_COLLECTION, function (MailTypeCollectionAddInterface $mailCollection) { + $mailCollection + ->add(new MerchantUserPasswordResetMailTypePlugin()); + + return $mailCollection; + }); + + return $container; + } +} +``` + + + Open access to the Merchant Portal login page by default: **config/Shared/config_default.php** @@ -146,15 +208,45 @@ Open access to the Merchant Portal login page by default: $config[AclConstants::ACL_DEFAULT_RULES] = [ [ 'bundle' => 'security-merchant-portal-gui', - 'controller' => 'login', - 'action' => 'index', + 'controller' => '*', + 'action' => '*', 'type' => 'allow', ], ]; ``` +### 3) Add translations +Add Merchant Portal translations: + +1. Append glossary according to your configuration: + +**data/import/common/common/glossary.csv** +``` +mail.merchant.restore_password.subject,Neues Passwort für Ihren Spryker Merchant Portal Account,de_DE +mail.merchant.restore_password.subject,New password for your Spryker Merchant Portal account,en_US +mail.merchant.restore_password.text,"""Es wurde ein neues Passwort für Ihren Spryker Merchant Portal Account angefordert. Wenn Sie nicht um um eine Neueinrichtung des Passworts gebeten haben, ignorieren Sie bitte diese Email. Klicken Sie auf den folgedenen Link, um Ihr Passwort zu ändern:""",de_DE +mail.merchant.restore_password.text,"""Somebody has requested a new password for your Spryker Merchant Portal account. If it's not you, just ignore this email. If it's you, please follow the link bellow:""",en_US +mail.merchant.restore_password.label,Passwort ändern,de_DE +mail.merchant.restore_password.label,Change Password,en_US +mail.trans.merchant.restore_password.subtitle,"Somebody has requested a new password for your Spryker Merchant Portal account. If it was not you, please ignore this email. If it was you, please follow the instructions in the button bellow",en_US +mail.trans.merchant.restore_password.subtitle,"Es wurde ein neues Passwort für dein Merchant Portal-Konto angefordert. Wenn du es nicht warst, kannst du diese E-Mail ignorieren. Wenn du es warst, klicke bitte den Knopf unten an:",de_DE +mail.trans.merchant.restore_password.title,New password for your Spryker Merchant Portal account,en_US +mail.trans.merchant.restore_password.title,Neues Passwort für dein Spryker Merchant Portal-Konto,de_DE +``` + +2. Import data: + +```bash +console data:import glossary +``` + +{% info_block warningBox "Verification" %} + +Make sure that the configured data has been added to the `spy_glossary` table in the database. + +{% endinfo_block %} -### 3) Set up transfer objects +### 4) Set up transfer objects Apply database changes and generate transfer changes: @@ -170,8 +262,13 @@ Make sure that the following changes have been applied in transfer objects: | TRANSFER | TYPE | EVENT | PATH | | ----------- | ----- | ------- | -------------------- | -| MerchantDashboardCard | class | created | src/Generated/Shared/Transfer/MerchantDashboardCard | -| MerchantDashboardActionButton | class | created | src/Generated/Shared/Transfer/MerchantDashboardActionButton | +| MerchantDashboardCard | class | created | src/Generated/Shared/Transfer/MerchantDashboardCardTransfer | +| MerchantDashboardActionButton | class | created | src/Generated/Shared/Transfer/MerchantDashboardActionButtonTransfer | +| Mail | class | created | src/Generated/Shared/Transfer/MailTransfer | +| UserPasswordResetRequest | class | created | src/Generated/Shared/Transfer/UserPasswordResetRequestTransfer | +| User | class | created | src/Generated/Shared/Transfer/UserTransfer | +| MerchantUser | class | created | src/Generated/Shared/Transfer/MerchantUserTransfer | +| MerchantUserCriteria | class | created | src/Generated/Shared/Transfer/MerchantUserCriteriaTransfer | {% endinfo_block %} From 8b02787dfc086d0b80a2811ba9a35b083217c9e6 Mon Sep 17 00:00:00 2001 From: Oksana Karasyova Date: Mon, 20 Dec 2021 14:10:50 +0200 Subject: [PATCH 02/11] Update merchant-portal-core-cms-feature-integration.md --- .../merchant-portal-core-cms-feature-integration.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md index d9e0ba637ff..95fdd432d82 100644 --- a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md +++ b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md @@ -1,7 +1,7 @@ --- title: Marketplace Merchant Portal Core feature + CMS integration last_updated: Mar 31, 2021 -description: This document describes how to integrate the Merchant Portal Core feature into a Spryker project. +description: This document describes how to integrate the Merchant Portal Core + CMS feature into a Spryker project. template: feature-integration-guide-template --- @@ -17,9 +17,9 @@ To start feature integration, integrate the required features: | NAME | VERSION | INTEGRATION GUIDE | | -------------------- | ---------- | ---------| -| Spryker Core | dev-master | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | -| CMS | 202009.0 | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) -| Marketplace Merchant Portal Core | dev-master | [Marketplace Merchant Portal Cor](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) +| Spryker Core | {{page.version}} | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | +| CMS | {{page.version}} | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) +| Marketplace Merchant Portal Core | {{page.version}} | [Marketplace Merchant Portal Core](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) ### 1) Create merchant restore password email templates From a99537aa4f85494cf5e65bd729b8efd7a6492397 Mon Sep 17 00:00:00 2001 From: Yuliia Sakharova Date: Tue, 21 Dec 2021 10:46:43 +0200 Subject: [PATCH 03/11] BO-2260: Fix Verification block. --- .../merchant-portal-core-cms-feature-integration.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md index 95fdd432d82..e20031d87f0 100644 --- a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md +++ b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md @@ -103,4 +103,9 @@ console data:import:cms-block-store {% info_block warningBox "Verification" %} -Make sure that the following data has been added ti the database +Make sure that the following data has been added to the database + +* `spy_cms_block` +* `spy_cms_block_store` + +{% endinfo_block %} From e16ba44d785645484e8a99e2f617535a5f654e4a Mon Sep 17 00:00:00 2001 From: Yuliia Sakharova Date: Tue, 21 Dec 2021 12:33:10 +0200 Subject: [PATCH 04/11] BO-2260: Fix whitespaces. --- .../merchant-portal-core-cms-feature-integration.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md index e20031d87f0..f6c2acd6181 100644 --- a/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md +++ b/docs/marketplace/dev/feature-integration-guides/202108.0/merchant-portal-core-cms-feature-integration.md @@ -34,8 +34,7 @@ Set up templates as follows: 'merchant_restore_password--html', constant('APPLICATION_STORE'), mail.locale.localeName, -{mail: mail} -) }} +{mail: mail}) }} ``` **src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.text.twig** @@ -45,8 +44,7 @@ mail.locale.localeName, 'merchant_restore_password--text', constant('APPLICATION_STORE'), mail.locale.localeName, -{mail: mail} -) }} +{mail: mail}) }} ``` ### 2) Create CMS blocks From 89f2457da4f06bbe2292b8ca13be149fd97e5cf7 Mon Sep 17 00:00:00 2001 From: Anton Smarovydlo Date: Thu, 2 Jan 2025 17:39:52 +0100 Subject: [PATCH 05/11] BO-2260 Adjustments after review. --- _data/sidebars/pbc_all_sidebar.yml | 2 + ...nstall-merchant-portal-core-cms-feature.md | 109 ++++++++++++++++++ ...arketplace-merchant-portal-core-feature.md | 100 +++++++++++++++- 3 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 _includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md diff --git a/_data/sidebars/pbc_all_sidebar.yml b/_data/sidebars/pbc_all_sidebar.yml index fdd09949a95..0789efbfc86 100644 --- a/_data/sidebars/pbc_all_sidebar.yml +++ b/_data/sidebars/pbc_all_sidebar.yml @@ -1517,6 +1517,8 @@ entries: url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-merchant-portal-marketplace-merchant-feature.html - title: Merchant Portal + Marketplace Order Management url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-merchant-portal-marketplace-order-management-feature.html + - title: Merchant Portal + CMS feature integration + url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-merchant-portal-core-cms-feature.html - title: Merchant Portal - Marketplace Product url: /docs/pbc/all/merchant-management/marketplace/install-and-upgrade/install-features/install-the-merchant-portal-marketplace-product-feature.html - title: Merchant Portal - Marketplace Product + Inventory Management diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md new file mode 100644 index 00000000000..891667fdf68 --- /dev/null +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -0,0 +1,109 @@ +--- +title: Marketplace Merchant Portal Core feature + CMS integration +last_updated: Mar 31, 2021 +description: This document describes how to integrate the Merchant Portal Core + CMS feature into a Spryker project. +template: feature-integration-guide-template +--- + +This document describes how to integrate the Marketplace Merchant Portal Core + CMS feature into a Spryker project. + +## Install feature core + +Follow the steps below to install the Merchant Portal Core + CMS feature core. + +## Prerequisites + +To start feature integration, integrate the required features: + +| NAME | VERSION | INTEGRATION GUIDE | +| -------------------- | ---------- | ---------| +| Spryker Core | {{page.version}} | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | +| CMS | {{page.version}} | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) +| Marketplace Merchant Portal Core | {{page.version}} | [Marketplace Merchant Portal Core](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) + +### 1) Create merchant restore password email templates + +Set up templates as follows: + +1. Create the following templates: + +**src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.html.twig** + +```html +{{ renderCmsBlockAsTwig( +'merchant_restore_password--html', +constant('APPLICATION_STORE'), +mail.locale.localeName, +{mail: mail}) }} +``` + +**src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.text.twig** + +```html +{{ renderCmsBlockAsTwig( +'merchant_restore_password--text', +constant('APPLICATION_STORE'), +mail.locale.localeName, +{mail: mail}) }} +``` + +### 2) Data Import + +Import CMS blocks as follows (or create them via zed backoffice): + +1. Add the following csv file: + +**data/import/common/common/cms_block.csv** + +```csv +block_key,block_name,template_name,template_path,active,placeholder.title.de_DE,placeholder.title.en_US,placeholder.description.de_DE,placeholder.description.en_US,placeholder.link.de_DE,placeholder.link.en_US,placeholder.content.de_DE,placeholder.content.en_US +cms-block-email--merchant_restore_password--html,merchant_restore_password--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.twig,1,,,,,,,"

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
","

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
" +cms-block-email--merchant_restore_password--text,merchant_restore_password--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) +``` + +2. Add the following csv file: + +Import cms blocks: + +```bash +console data:import:cms-block +``` + +3. Enable cms blocks per needed store via importing the next data (or enable them via zed backoffice) + +**data/import/common/AT/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,AT +cms-block-email--merchant_restore_password--text,AT +``` + +**data/import/common/DE/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,DE +cms-block-email--merchant_restore_password--text,DE +``` +**data/import/common/US/cms_block_store.csv** + +```csv +block_key,store_name +cms-block-email--merchant_restore_password--html,US +cms-block-email--merchant_restore_password--text,US +``` + +Import cms blocks per needed store: +```bash +console data:import:cms-block-store +``` + +{% info_block warningBox "Verification" %} + +Make sure that the following data has been added to the database + +* `spy_cms_block` +* `spy_cms_block_store` + +{% endinfo_block %} \ No newline at end of file diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md index 91e61b18063..08a552f80f9 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md @@ -250,6 +250,8 @@ Set up the following behaviors. | MerchantUserUserRoleFilterPlugin | Filters `ROLE_BACK_OFFICE_USER` to prevent a merchant user from logging into the Back Office. | | Spryker\Zed\MerchantUser\Communication\Plugin\SecurityGui | | ProductViewerForOfferCreationAclInstallerPlugin | Provides `ProductViewerForOfferCreation` roles with rules and groups to create on installation. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | | AclGroupMerchantUserLoginRestrictionPlugin | Checks if the merchant user login is restricted. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\SecurityMerchantPortalGui | +| MailMerchantUserPasswordResetRequestStrategyPlugin | Checks if strategy is applicable for a password reset request. Returns true if merchant user exists, false otherwise. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\UserPasswordReset | +| MerchantUserPasswordResetMailTypePlugin | Builds the mail of merchant password restore type. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\Mail | **src/Pyz/Zed/Twig/TwigDependencyProvider.php** @@ -330,6 +332,62 @@ class SecurityDependencyProvider extends SprykerSecurityDependencyProvider } ``` +**src/Pyz/Zed/UserPasswordReset/UserPasswordResetDependencyProvider.php** + +```php +extend(static::MAIL_TYPE_COLLECTION, function (MailTypeCollectionAddInterface $mailCollection) { + $mailCollection + ->add(new MerchantUserPasswordResetMailTypePlugin()); + + return $mailCollection; + }); + + return $container; + } +} +``` + **src/Pyz/Zed/SecurityGui/SecurityGuiDependencyProvider.php** ```php @@ -663,12 +721,43 @@ $config[AclConstants::ACL_DEFAULT_RULES][] = [ [ 'bundle' => 'security-merchant-portal-gui', 'controller' => 'login', - 'action' => 'index', - 'type' => 'allow', + 'action' => '*', + 'type' => '*', ], ]; ``` +### 3) Add translations +Add Merchant Portal translations: + +1. Append glossary according to your configuration: + +**data/import/common/common/glossary.csv** +``` +mail.merchant.restore_password.subject,Neues Passwort für Ihren Spryker Merchant Portal Account,de_DE +mail.merchant.restore_password.subject,New password for your Spryker Merchant Portal account,en_US +mail.merchant.restore_password.text,"""Es wurde ein neues Passwort für Ihren Spryker Merchant Portal Account angefordert. Wenn Sie nicht um um eine Neueinrichtung des Passworts gebeten haben, ignorieren Sie bitte diese Email. Klicken Sie auf den folgedenen Link, um Ihr Passwort zu ändern:""",de_DE +mail.merchant.restore_password.text,"""Somebody has requested a new password for your Spryker Merchant Portal account. If it's not you, just ignore this email. If it's you, please follow the link bellow:""",en_US +mail.merchant.restore_password.label,Passwort ändern,de_DE +mail.merchant.restore_password.label,Change Password,en_US +mail.trans.merchant.restore_password.subtitle,"Somebody has requested a new password for your Spryker Merchant Portal account. If it was not you, please ignore this email. If it was you, please follow the instructions in the button bellow",en_US +mail.trans.merchant.restore_password.subtitle,"Es wurde ein neues Passwort für dein Merchant Portal-Konto angefordert. Wenn du es nicht warst, kannst du diese E-Mail ignorieren. Wenn du es warst, klicke bitte den Knopf unten an:",de_DE +mail.trans.merchant.restore_password.title,New password for your Spryker Merchant Portal account,en_US +mail.trans.merchant.restore_password.title,Neues Passwort für dein Spryker Merchant Portal-Konto,de_DE +``` + +2. Import data: + +```bash +console data:import glossary +``` + +{% info_block warningBox "Verification" %} + +Make sure that the configured data has been added to the `spy_glossary` table in the database. + +{% endinfo_block %} + 3. Add a console command for warming up the Merchant Portal router cache: **src/Pyz/Zed/Console/ConsoleDependencyProvider.php** @@ -871,6 +960,13 @@ Make sure the following changes have been applied in transfer objects: |-------------------------------|--------|---------|---------------------------------------------------------------------| | MerchantDashboardCard | object | Created | src/Generated/Shared/Transfer/MerchantDashboardCardTransfer | | MerchantDashboardActionButton | object | Created | src/Generated/Shared/Transfer/MerchantDashboardActionButtonTransfer | +| MerchantDashboardCard | class | created | src/Generated/Shared/Transfer/MerchantDashboardCardTransfer | +| MerchantDashboardActionButton | class | created | src/Generated/Shared/Transfer/MerchantDashboardActionButtonTransfer | +| Mail | class | created | src/Generated/Shared/Transfer/MailTransfer | +| UserPasswordResetRequest | class | created | src/Generated/Shared/Transfer/UserPasswordResetRequestTransfer | +| User | class | created | src/Generated/Shared/Transfer/UserTransfer | +| MerchantUser | class | created | src/Generated/Shared/Transfer/MerchantUserTransfer | +| MerchantUserCriteria | class | created | src/Generated/Shared/Transfer/MerchantUserCriteriaTransfer | {% endinfo_block %} From e8bea89db148d97614d0deb1266f5298814de9c8 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Sat, 4 Jan 2025 12:49:56 +0200 Subject: [PATCH 06/11] Update install-merchant-portal-core-cms-feature.md --- ...nstall-merchant-portal-core-cms-feature.md | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md index 891667fdf68..b6ce0215863 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -5,17 +5,14 @@ description: This document describes how to integrate the Merchant Portal Core + template: feature-integration-guide-template --- -This document describes how to integrate the Marketplace Merchant Portal Core + CMS feature into a Spryker project. +This document describes how to install the Marketplace Merchant Portal Core + CMS feature. -## Install feature core - -Follow the steps below to install the Merchant Portal Core + CMS feature core. ## Prerequisites -To start feature integration, integrate the required features: +Install the required features: -| NAME | VERSION | INTEGRATION GUIDE | +| NAME | VERSION | INSTALLATION GUIDE | | -------------------- | ---------- | ---------| | Spryker Core | {{page.version}} | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | | CMS | {{page.version}} | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) @@ -23,13 +20,8 @@ To start feature integration, integrate the required features: ### 1) Create merchant restore password email templates -Set up templates as follows: - -1. Create the following templates: - **src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.html.twig** - -```html +```twig {{ renderCmsBlockAsTwig( 'merchant_restore_password--html', constant('APPLICATION_STORE'), @@ -38,8 +30,7 @@ mail.locale.localeName, ``` **src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.text.twig** - -```html +```twig {{ renderCmsBlockAsTwig( 'merchant_restore_password--text', constant('APPLICATION_STORE'), @@ -47,13 +38,14 @@ mail.locale.localeName, {mail: mail}) }} ``` -### 2) Data Import +### 2) Data import Import CMS blocks as follows (or create them via zed backoffice): 1. Add the following csv file: -**data/import/common/common/cms_block.csv** +
+ data/import/common/common/cms_block.csv ```csv block_key,block_name,template_name,template_path,active,placeholder.title.de_DE,placeholder.title.en_US,placeholder.description.de_DE,placeholder.description.en_US,placeholder.link.de_DE,placeholder.link.en_US,placeholder.content.de_DE,placeholder.content.en_US @@ -61,15 +53,17 @@ cms-block-email--merchant_restore_password--html,merchant_restore_password--html cms-block-email--merchant_restore_password--text,merchant_restore_password--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ``` +
+ 2. Add the following csv file: -Import cms blocks: +Import CMS blocks: ```bash console data:import:cms-block ``` -3. Enable cms blocks per needed store via importing the next data (or enable them via zed backoffice) +3. Enable CMS blocks per needed store via importing the next data (or enable them via zed backoffice) **data/import/common/AT/cms_block_store.csv** @@ -94,7 +88,7 @@ cms-block-email--merchant_restore_password--html,US cms-block-email--merchant_restore_password--text,US ``` -Import cms blocks per needed store: +Import CMS blocks per needed store: ```bash console data:import:cms-block-store ``` @@ -106,4 +100,4 @@ Make sure that the following data has been added to the database * `spy_cms_block` * `spy_cms_block_store` -{% endinfo_block %} \ No newline at end of file +{% endinfo_block %} From fdeaf53f94f961098842d250ffd89fb213bfa6b9 Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Sat, 4 Jan 2025 12:53:19 +0200 Subject: [PATCH 07/11] Update install-merchant-portal-core-cms-feature.md --- .../marketplace/install-merchant-portal-core-cms-feature.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md index b6ce0215863..35a1c1fd653 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -63,7 +63,7 @@ Import CMS blocks: console data:import:cms-block ``` -3. Enable CMS blocks per needed store via importing the next data (or enable them via zed backoffice) +3. Prepare data import files per store to enable CMS blocks: (or enable them via zed backoffice) **data/import/common/AT/cms_block_store.csv** @@ -88,14 +88,14 @@ cms-block-email--merchant_restore_password--html,US cms-block-email--merchant_restore_password--text,US ``` -Import CMS blocks per needed store: +4. To enable CMS blocks import the files: ```bash console data:import:cms-block-store ``` {% info_block warningBox "Verification" %} -Make sure that the following data has been added to the database +Make sure that the following data has been added to the database: * `spy_cms_block` * `spy_cms_block_store` From 2c7b1183f6af094f3cb1d0669696254fe8188bbd Mon Sep 17 00:00:00 2001 From: Andrii Tserkovnyi Date: Sat, 4 Jan 2025 13:34:26 +0200 Subject: [PATCH 08/11] Update install-the-marketplace-merchant-portal-core-feature.md --- .../install-the-marketplace-merchant-portal-core-feature.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md index 08a552f80f9..d4c318b9103 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md @@ -250,7 +250,7 @@ Set up the following behaviors. | MerchantUserUserRoleFilterPlugin | Filters `ROLE_BACK_OFFICE_USER` to prevent a merchant user from logging into the Back Office. | | Spryker\Zed\MerchantUser\Communication\Plugin\SecurityGui | | ProductViewerForOfferCreationAclInstallerPlugin | Provides `ProductViewerForOfferCreation` roles with rules and groups to create on installation. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | | AclGroupMerchantUserLoginRestrictionPlugin | Checks if the merchant user login is restricted. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\SecurityMerchantPortalGui | -| MailMerchantUserPasswordResetRequestStrategyPlugin | Checks if strategy is applicable for a password reset request. Returns true if merchant user exists, false otherwise. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\UserPasswordReset | +| MailMerchantUserPasswordResetRequestStrategyPlugin | Checks if the strategy is applicable for a password reset request. Returns true if merchant user exists; false otherwise. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\UserPasswordReset | | MerchantUserPasswordResetMailTypePlugin | Builds the mail of merchant password restore type. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\Mail | **src/Pyz/Zed/Twig/TwigDependencyProvider.php** @@ -727,8 +727,8 @@ $config[AclConstants::ACL_DEFAULT_RULES][] = [ ]; ``` -### 3) Add translations -Add Merchant Portal translations: +### 3) Add Merchant Portal translations + 1. Append glossary according to your configuration: From 20d6f4072f64834867ed4d910023af64b08f7df3 Mon Sep 17 00:00:00 2001 From: Anton Smarovydlo Date: Mon, 6 Jan 2025 15:59:46 +0100 Subject: [PATCH 09/11] BO-2260 Adjustments after review. --- _data/sidebars/pbc_all_sidebar.yml | 6 ++++ ...nstall-merchant-portal-core-cms-feature.md | 28 ++++++--------- ...arketplace-merchant-portal-core-feature.md | 34 +++++++++---------- ...nstall-cms-merchant-portal-core-feature.md | 8 +++++ 4 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 docs/pbc/all/content-management-system/202410.0/marketplace/install-features/install-cms-merchant-portal-core-feature.md diff --git a/_data/sidebars/pbc_all_sidebar.yml b/_data/sidebars/pbc_all_sidebar.yml index 0789efbfc86..ee22463797a 100644 --- a/_data/sidebars/pbc_all_sidebar.yml +++ b/_data/sidebars/pbc_all_sidebar.yml @@ -860,6 +860,12 @@ entries: - title: Marketplace nested: + - title: Install + nested: + - title: Install features + nested: + - title: Install the CMS + Marketplace Merchant Portal Core feature + url: /docs/pbc/all/content-management-system/marketplace/install-features/install-cms-merchant-portal-core-feature.html - title: "Glue API: Retrieve abstract products in abstract product lists" url: /docs/pbc/all/content-management-system/marketplace/glue-api-retrieve-abstract-products-in-abstract-product-lists.html diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md index 891667fdf68..987c7c85d98 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -1,10 +1,3 @@ ---- -title: Marketplace Merchant Portal Core feature + CMS integration -last_updated: Mar 31, 2021 -description: This document describes how to integrate the Merchant Portal Core + CMS feature into a Spryker project. -template: feature-integration-guide-template ---- - This document describes how to integrate the Marketplace Merchant Portal Core + CMS feature into a Spryker project. ## Install feature core @@ -17,8 +10,8 @@ To start feature integration, integrate the required features: | NAME | VERSION | INTEGRATION GUIDE | | -------------------- | ---------- | ---------| -| Spryker Core | {{page.version}} | [Spryker Core feature integration](https://documentation.spryker.com/docs/spryker-core-feature-integration) | -| CMS | {{page.version}} | [Spryker CMS feature integration](https://documentation.spryker.com/docs/cms) +| Spryker Core | {{page.version}} | [Spryker Core feature integration](/docs/pbc/all/miscellaneous/{{ page.version }}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | +| CMS | {{page.version}} | [Spryker CMS feature integration](/docs/pbc/all/content-management-system/{{ page.version }}/base-shop/install-and-upgrade/install-features/install-the-cms-feature.html) | Marketplace Merchant Portal Core | {{page.version}} | [Marketplace Merchant Portal Core](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) ### 1) Create merchant restore password email templates @@ -30,28 +23,28 @@ Set up templates as follows: **src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.html.twig** ```html -{{ renderCmsBlockAsTwig( +\{\{ renderCmsBlockAsTwig( 'merchant_restore_password--html', constant('APPLICATION_STORE'), mail.locale.localeName, -{mail: mail}) }} +{mail: mail}) \}\} ``` **src/Pyz/Zed/MerchantUserPasswordResetMail/Presentation/Mail/merchant_restore_password.text.twig** ```html -{{ renderCmsBlockAsTwig( +\{\{ renderCmsBlockAsTwig( 'merchant_restore_password--text', constant('APPLICATION_STORE'), mail.locale.localeName, -{mail: mail}) }} +{mail: mail}) \}\} ``` ### 2) Data Import Import CMS blocks as follows (or create them via zed backoffice): -1. Add the following csv file: +1. Add cms blocks: **data/import/common/common/cms_block.csv** @@ -61,15 +54,13 @@ cms-block-email--merchant_restore_password--html,merchant_restore_password--html cms-block-email--merchant_restore_password--text,merchant_restore_password--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ``` -2. Add the following csv file: - Import cms blocks: ```bash console data:import:cms-block ``` -3. Enable cms blocks per needed store via importing the next data (or enable them via zed backoffice) +2. Enable cms blocks per needed store via importing the next data (or enable them via zed backoffice) **data/import/common/AT/cms_block_store.csv** @@ -95,13 +86,14 @@ cms-block-email--merchant_restore_password--text,US ``` Import cms blocks per needed store: + ```bash console data:import:cms-block-store ``` {% info_block warningBox "Verification" %} -Make sure that the following data has been added to the database +Make sure that the data from csv files above has been added to the following database tables: * `spy_cms_block` * `spy_cms_block_store` diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md index 08a552f80f9..2d74d59729a 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-the-marketplace-merchant-portal-core-feature.md @@ -234,24 +234,24 @@ Set up the following behaviors. #### Integrate the following plugins -| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | -|------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|---------------|----------------------------------------------------------------------------------| -| ZedMerchantUserSecurityPlugin | Sets security firewalls (rules, handlers) for Marketplace users. | | Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\Security | -| BooleanToStringTwigPlugin | Adds a Twig function for converting Boolean to String. | | Spryker\Zed\ZedUi\Communication\Plugin\Twig | -| ZedUiNavigationTwigPlugin | Adds a Twig function for rendering the navigation using web components. | | Spryker\Zed\ZedUi\Communication\Plugin | -| MerchantNavigationTypeTwigPlugin | Adds `mainMerchantNavigationType` and `secondaryMerchantNavigationType` Twig global variables. | | Spryker\Zed\MerchantPortalApplication\Communication\Plugin\Twig | -| GuiTableApplicationPlugin | Enables the GuiTable infrastructure for the Back Office. | | Spryker\Zed\GuiTable\Communication\Plugin\Application | -| GuiTableConfigurationTwigPlugin | Adds a Twig function for rendering `GuiTableConfiguration` for the `GuiTable` web component. | | Spryker\Zed\GuiTable\Communication\Plugin\Twig | -| MerchantUserSecurityTokenUpdateMerchantUserPostChangePlugin | Rewrites the Symfony security token for merchant users with `MerchantUser` and without `IS_IMPERSONATOR` roles granted. | | Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\UserMerchantPortalGui | +| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | +|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|---------------|----------------------------------------------------------------------------------| +| ZedMerchantUserSecurityPlugin | Sets security firewalls (rules, handlers) for Marketplace users. | | Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\Security | +| BooleanToStringTwigPlugin | Adds a Twig function for converting Boolean to String. | | Spryker\Zed\ZedUi\Communication\Plugin\Twig | +| ZedUiNavigationTwigPlugin | Adds a Twig function for rendering the navigation using web components. | | Spryker\Zed\ZedUi\Communication\Plugin | +| MerchantNavigationTypeTwigPlugin | Adds `mainMerchantNavigationType` and `secondaryMerchantNavigationType` Twig global variables. | | Spryker\Zed\MerchantPortalApplication\Communication\Plugin\Twig | +| GuiTableApplicationPlugin | Enables the GuiTable infrastructure for the Back Office. | | Spryker\Zed\GuiTable\Communication\Plugin\Application | +| GuiTableConfigurationTwigPlugin | Adds a Twig function for rendering `GuiTableConfiguration` for the `GuiTable` web component. | | Spryker\Zed\GuiTable\Communication\Plugin\Twig | +| MerchantUserSecurityTokenUpdateMerchantUserPostChangePlugin | Rewrites the Symfony security token for merchant users with `MerchantUser` and without `IS_IMPERSONATOR` roles granted. | | Spryker\Zed\SecurityMerchantPortalGui\Communication\Plugin\UserMerchantPortalGui | | MerchantPortalConfigurationAclEntityMetadataConfigExpanderPlugin | Expands the provided `AclEntityMetadataConfig` transfer object with event behavior composite data. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\AclEntity | -| MerchantAclEntitiesMerchantPostCreatePlugin | Creates an ACL group, ACL role, ACL rules, ACL entity rules, and ACL entity segment for a provided merchant. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\Merchant | -| MerchantUserAclEntitiesMerchantUserPostCreatePlugin | Creates an ACL group, ACL role, ACL rules, ACL entity rules, and ACL entity segment for a provided merchant user. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | -| AclMerchantPortalMerchantUserRoleFilterPreConditionPlugin | Checks if Symfony security authentication roles should be filtered out. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | -| MerchantUserUserRoleFilterPlugin | Filters `ROLE_BACK_OFFICE_USER` to prevent a merchant user from logging into the Back Office. | | Spryker\Zed\MerchantUser\Communication\Plugin\SecurityGui | -| ProductViewerForOfferCreationAclInstallerPlugin | Provides `ProductViewerForOfferCreation` roles with rules and groups to create on installation. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | -| AclGroupMerchantUserLoginRestrictionPlugin | Checks if the merchant user login is restricted. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\SecurityMerchantPortalGui | -| MailMerchantUserPasswordResetRequestStrategyPlugin | Checks if strategy is applicable for a password reset request. Returns true if merchant user exists, false otherwise. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\UserPasswordReset | -| MerchantUserPasswordResetMailTypePlugin | Builds the mail of merchant password restore type. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\Mail | +| MerchantAclEntitiesMerchantPostCreatePlugin | Creates an ACL group, ACL role, ACL rules, ACL entity rules, and ACL entity segment for a provided merchant. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\Merchant | +| MerchantUserAclEntitiesMerchantUserPostCreatePlugin | Creates an ACL group, ACL role, ACL rules, ACL entity rules, and ACL entity segment for a provided merchant user. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | +| AclMerchantPortalMerchantUserRoleFilterPreConditionPlugin | Checks if Symfony security authentication roles should be filtered out. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | +| MerchantUserUserRoleFilterPlugin | Filters `ROLE_BACK_OFFICE_USER` to prevent a merchant user from logging into the Back Office. | | Spryker\Zed\MerchantUser\Communication\Plugin\SecurityGui | +| ProductViewerForOfferCreationAclInstallerPlugin | Provides `ProductViewerForOfferCreation` roles with rules and groups to create on installation. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\MerchantUser | +| AclGroupMerchantUserLoginRestrictionPlugin | Checks if the merchant user login is restricted. | | Spryker\Zed\AclMerchantPortal\Communication\Plugin\SecurityMerchantPortalGui | +| MailMerchantUserPasswordResetRequestStrategyPlugin | Allows to enable reset password functionality for merchant users. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\UserPasswordReset | +| MerchantUserPasswordResetMailTypeBuilderPlugin | Builds the MailTransfer for merchant password restore email type. | | Spryker\Zed\MerchantUserPasswordResetMail\Communication\Plugin\Mail | **src/Pyz/Zed/Twig/TwigDependencyProvider.php** diff --git a/docs/pbc/all/content-management-system/202410.0/marketplace/install-features/install-cms-merchant-portal-core-feature.md b/docs/pbc/all/content-management-system/202410.0/marketplace/install-features/install-cms-merchant-portal-core-feature.md new file mode 100644 index 00000000000..f08779a7425 --- /dev/null +++ b/docs/pbc/all/content-management-system/202410.0/marketplace/install-features/install-cms-merchant-portal-core-feature.md @@ -0,0 +1,8 @@ +--- +title: Install the CMS + Marketplace Merchant Portal Core feature +last_updated: Jan 6, 2025 +description: This document describes how to integrate the Marketplace Merchant Portal Core + CMS feature into a Spryker project. +template: feature-integration-guide-template +--- + +{% include pbc/all/install-features/{{page.version}}/marketplace/install-merchant-portal-core-cms-feature.md %} From bf739bba811bcf451056c3905b157f04e3564201 Mon Sep 17 00:00:00 2001 From: Anton Smarovydlo Date: Mon, 6 Jan 2025 16:07:02 +0100 Subject: [PATCH 10/11] BO-2260 Adjustments after review. --- .../marketplace/install-merchant-portal-core-cms-feature.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md index 5589febf279..5f71448cf6b 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -86,7 +86,7 @@ console data:import:cms-block-store {% info_block warningBox "Verification" %} -Make sure that the following data has been added to the database: +Make sure that the imported data is added to the following database tables: * `spy_cms_block` * `spy_cms_block_store` From df3040d2cce0178803b2706748ba60edeef2bacf Mon Sep 17 00:00:00 2001 From: Anton Smarovydlo Date: Mon, 6 Jan 2025 16:09:51 +0100 Subject: [PATCH 11/11] BO-2260 Adjustments after review. --- .../marketplace/install-merchant-portal-core-cms-feature.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md index 5f71448cf6b..90d0f366ed3 100644 --- a/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md +++ b/_includes/pbc/all/install-features/202410.0/marketplace/install-merchant-portal-core-cms-feature.md @@ -8,7 +8,7 @@ Install the required features: | -------------------- | ---------- | ---------| | Spryker Core | {{page.version}} | [Spryker Core feature integration](/docs/pbc/all/miscellaneous/{{ page.version }}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | | CMS | {{page.version}} | [Spryker CMS feature integration](/docs/pbc/all/content-management-system/{{ page.version }}/base-shop/install-and-upgrade/install-features/install-the-cms-feature.html) -| Marketplace Merchant Portal Core | {{page.version}} | [Marketplace Merchant Portal Core](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) +| Marketplace Merchant Portal Core | {{page.version}} | [Marketplace Merchant Portal Core feature integration](/docs/marketplace/dev/feature-integration-guides/{{ page.version }}/merchant-portal-core-feature-integration.html) ### 1) Create merchant restore password email templates