202410.0 Release.

config/install/docker.ci.functional.yml

@@ -57,13 +57,13 @@ sections:
         propel-migration-cleanup:
             command: 'vendor/bin/console propel:migration:delete'
 
-        init-database:
-            command: 'vendor/bin/console setup:init-db'
-
     demodata:
         queue-setup:
             command: 'vendor/bin/console queue:setup'
 
+        init-database:
+            command: 'vendor/bin/console setup:init-db'
+
         import-eu-region-demodata:
             command: 'vendor/bin/console data:import --config=data/import/local/full_EU.yml'
 
@@ -75,7 +75,7 @@ sections:
 
         publish-and-sync:
             command: 'vendor/bin/console queue:worker:start --stop-when-empty'
-            timeout: 2000
+            timeout: 4000
 
         controller-cache-warmup:
             command: 'vendor/bin/glue glue-api:controller:cache:warm-up'

data/import/common/common/glossary.csv

@@ -583,8 +583,6 @@ customer.error.confirm_email_link.invalid_or_used,This email verification link i
 customer.error.confirm_email_link.invalid_or_used,Dieser E-Mail-Verifizierungslink ist ungültig oder wurde bereits verwendet.,de_DE
 customer.authorization.validate_email_address,"Almost there! We send you an email to validate your email address. Please confirm it to be able to log in.",en_US
 customer.authorization.validate_email_address,"Fast dort! Wir senden Ihnen eine E-Mail, um Ihre E-Mail-Adresse zu bestätigen. Bitte bestätigen Sie dies, um sich anmelden zu können.",de_DE
-customer.authorization.invalid_account,"If this E-mail address is already in use, you will receive a password reset link. Otherwise, you must first validate your E-mail address to finish registration. Please check your E-mail.",en_US
-customer.authorization.invalid_account,"Wenn die E-Mail bereits genutzt wird, werden Sie einen Passwortresetlink erhalten. Wenn nicht dann müssen Sie erst Ihre Emailadresse verifizieren. Bitte prüfen Sie ihre Email.",de_DE
 customer.profile.change.success,Profile was successfully saved,en_US
 customer.profile.change.success,Profil wurde erfolgreich gespeichert,de_DE
 customer.password.invalid_password,Current password is wrong,en_US
@@ -777,8 +775,8 @@ newsletter.subscription.already_subscribed,You are already subscribed to the new
 newsletter.subscription.already_subscribed,Sie sind bereits für den Newsletter angemeldet,de_DE
 newsletter.subscription.email_format_invalid,Invalid Email address format,en_US
 newsletter.subscription.email_format_invalid,Ungültiges E-Mail-Adressformat,de_DE
-customer.authentication.failed,Authentication failed,en_US
-customer.authentication.failed,Authentifizierung fehlgeschlagen,de_DE
+customer.authentication.failed,Please check that your E-mail address and password are correct and that you have confirmed your E-mail address by clicking the link in the registration message,en_US
+customer.authentication.failed,"Bitte stelle sicher, dass deine E-Mail-Adresse und Passwort richtig sind und dass du deine E-Mail-Adresse durch Klicken auf den Link in der Bestätigungsnachricht bestätigt" hast,de_DE
 customer.email.invalid,Email address is invalid,en_US
 customer.email.invalid,E-Mail Adresse ist ungültig,de_DE
 customer.email.format.invalid,Invalid Email address format,en_US

deploy.scos2-b2bmp.yml

@@ -7,16 +7,15 @@ environment: docker.production
 image:
     tag: spryker/php:8.3
     environment:
-        SPRYKER_DEFAULT_STORE: "DE"
-        SPRYKER_ACTIVE_STORES: "DE,AT"
-        SPRYKER_HOOK_BEFORE_DEPLOY: "vendor/bin/install -r EU/pre-deploy.dynamic-store-off -vvv"
-        SPRYKER_HOOK_AFTER_DEPLOY: "true"
-        SPRYKER_HOOK_INSTALL: "vendor/bin/install -r EU/production.dynamic-store-off --no-ansi -vvv"
-        SPRYKER_HOOK_DESTRUCTIVE_INSTALL: "vendor/bin/install -r EU/destructive.dynamic-store-off --no-ansi -vvv"
         SPRYKER_PRODUCT_CONFIGURATOR_HOST: dtc.spryker-b2bmp.cloud.spryker.toys
         SPRYKER_PRODUCT_CONFIGURATOR_PORT: 443
-        SPRYKER_YVES_HOST_DE: www.de.spryker-b2bmp.cloud.spryker.toys
-        SPRYKER_YVES_HOST_AT: www.at.spryker-b2bmp.cloud.spryker.toys
+        SPRYKER_YVES_HOST_EU: yves.eu.spryker-b2bmp.cloud.spryker.toys
+        SPRYKER_YVES_HOST_US: yves.us.spryker-b2bmp.cloud.spryker.toys
+        SPRYKER_HOOK_BEFORE_DEPLOY: "vendor/bin/install -r pre-deploy -vvv"
+        SPRYKER_HOOK_AFTER_DEPLOY: "true"
+        SPRYKER_HOOK_INSTALL: "vendor/bin/install -r dynamic-store --no-ansi -vvv"
+        SPRYKER_HOOK_DESTRUCTIVE_INSTALL: "vendor/bin/install -r destructive --no-ansi -vvv"
+        SPRYKER_DYNAMIC_STORE_MODE: true
         SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PUBLIC_KEY: 'BGqNWbv0hWM5CQ1-KwAfSQBMC6TMVFyrnh3vQp37oGCNvQ6eG_HyMjxBFJRWeCPTbzDoxcjhxLJS8Ck8r1G2oFw'
         SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_PRIVATE_KEY: 'UK6DywwjKITPpRHBSY9TLPIXm6BPrHX40sseIoXT9c8'
         SPRYKER_PUSH_NOTIFICATION_WEB_PUSH_PHP_VAPID_SUBJECT: 'https://spryker.com'
@@ -35,7 +34,6 @@ assets:
         brotli:
             static: on
             level: 5
-
 regions:
     EU:
         services:
@@ -47,28 +45,12 @@ regions:
                 database: scos2_b2bmp
                 username: spryker
                 password: secret
-
-        stores:
-            DE:
-                services:
-                    broker:
-                        namespace: de_queue
-                    key_value_store:
-                        namespace: 1
-                    search:
-                        namespace: de_search
-                    session:
-                        namespace: 2
-            AT:
-                services:
-                    broker:
-                        namespace: at_queue
-                    key_value_store:
-                        namespace: 1
-                    search:
-                        namespace: at_search
-                    session:
-                        namespace: 2
+            broker:
+                namespace: eu-docker
+            key_value_store:
+                namespace: 1
+            search:
+                namespace: eu_search
 
 groups:
     EU:
@@ -79,83 +61,71 @@ groups:
                 endpoints:
                     dtc.spryker-b2bmp.cloud.spryker.toys:
                         entry-point: Configurator
-                    www.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                    www.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    yves.eu.spryker-b2bmp.cloud.spryker.toys:
+                        region: EU
+                        services:
+                            session:
+                                namespace: 1
             boffice:
                 application: backoffice
                 endpoints:
-                    backoffice.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                    backoffice.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    backoffice.eu.spryker-b2bmp.cloud.spryker.toys:
+                        region: EU
+                        primal: true
+                        services:
+                            session:
+                                namespace: 3
             backgw:
                 application: backend-gateway
                 endpoints:
-                    backend-gateway.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                    backend-gateway.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    backend-gateway.eu.spryker-b2bmp.cloud.spryker.toys:
+                        region: EU
+                        primal: true
+
             glue:
                 application: glue
                 endpoints:
-                    glue.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                        cors-allow-origin: '*'
-                    glue.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    glue.eu.spryker-b2bmp.cloud.spryker.toys:
                         cors-allow-origin: '*'
+                        region: EU
             gluestorefront:
                 application: glue-storefront
                 endpoints:
-                    glue-storefront.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                        cors-allow-origin: '*'
-                    glue-storefront.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    glue-storefront.eu.spryker-b2bmp.cloud.spryker.toys:
+                        region: EU
                         cors-allow-origin: '*'
             gluebackend:
                 application: glue-backend
                 endpoints:
-                    glue-backend.de.spryker-b2bmp.cloud.spryker.toys:
-                        store: DE
-                        cors-allow-origin: '*'
-                    glue-backend.at.spryker-b2bmp.cloud.spryker.toys:
-                        store: AT
+                    glue-backend.eu.spryker-b2bmp.cloud.spryker.toys:
+                        region: EU
                         cors-allow-origin: '*'
             mportal:
                 application: merchant-portal
                 endpoints:
-                    mp.de.spryker-b2bmp.cloud.spryker.toys:
+                    mp.eu.spryker-b2bmp.cloud.spryker.toys:
                         entry-point: MerchantPortal
-                        store: DE
+                        region: EU
                         primal: true
                         services:
                             session:
                                 namespace: 7
-                    mp.at.spryker-b2bmp.cloud.spryker.toys:
-                        entry-point: MerchantPortal
-                        store: AT
-                        services:
-                            session:
-                                namespace: 8
 services:
     database:
         engine: mysql
         version: mariadb-10.4
         root:
-            username: "root"
-            password: "secret"
+            username: 'root'
+            password: 'secret'
         endpoints:
             localhost:3306:
                 protocol: tcp
     broker:
         engine: rabbitmq
         version: '3.9'
         api:
-            username: "spryker"
-            password: "secret"
+            username: 'spryker'
+            password: 'secret'
         endpoints:
             queue.spryker-b2bmp.cloud.spryker.toys:
             localhost:5672:
@@ -176,7 +146,6 @@ services:
     scheduler:
         engine: jenkins
         version: '2.442'
-        csrf-protection-enabled: false
         endpoints:
             scheduler.spryker-b2bmp.cloud.spryker.toys:
     mail_catcher:
@@ -197,9 +166,7 @@ docker:
         enabled: false
         xdebug:
             enabled: false
-
     testing:
-        store: DE
-
+        region: EU
     mount:
         baked:

src/Pyz/Client/Permission/PermissionDependencyProvider.php

@@ -9,9 +9,15 @@
 
 use Pyz\Zed\CompanyUser\Communication\Plugin\Permission\SeeCompanyMenuPermissionPlugin;
 use Spryker\Client\CompanyBusinessUnitSalesConnector\Plugin\Permission\SeeBusinessUnitOrdersPermissionPlugin;
+use Spryker\Client\CompanyRole\Plugin\Permission\CreateCompanyRolesPermissionPlugin;
+use Spryker\Client\CompanyRole\Plugin\Permission\DeleteCompanyRolesPermissionPlugin;
+use Spryker\Client\CompanyRole\Plugin\Permission\EditCompanyRolesPermissionPlugin;
+use Spryker\Client\CompanyRole\Plugin\Permission\SeeCompanyRolesPermissionPlugin;
 use Spryker\Client\CompanyRole\Plugin\PermissionStoragePlugin;
 use Spryker\Client\CompanySalesConnector\Plugin\Permission\SeeCompanyOrdersPermissionPlugin;
 use Spryker\Client\CompanyUser\Plugin\CompanyUserStatusChangePermissionPlugin;
+use Spryker\Client\CompanyUser\Plugin\Permission\DeleteCompanyUsersPermissionPlugin;
+use Spryker\Client\CompanyUser\Plugin\Permission\EditCompanyUsersPermissionPlugin;
 use Spryker\Client\CompanyUser\Plugin\Permission\SeeCompanyUsersPermissionPlugin;
 use Spryker\Client\CustomerAccessPermission\Plugin\CustomerAccessPermissionStoragePlugin;
 use Spryker\Client\CustomerAccessPermission\Plugin\SeeAddToCartPermissionPlugin;
@@ -80,6 +86,15 @@ protected function getPermissionPlugins(): array
             new SeeBusinessUnitOrdersPermissionPlugin(),
             new SeeCompanyUsersPermissionPlugin(),
             new CreateMerchantRelationRequestPermissionPlugin(),
+            new CreateCompanyRolesPermissionPlugin(),
+            new DeleteCompanyRolesPermissionPlugin(),
+            new EditCompanyRolesPermissionPlugin(),
+            new SeeCompanyRolesPermissionPlugin(),
+            new CompanyUserStatusChangePermissionPlugin(),
+            new DeleteCompanyUsersPermissionPlugin(),
+            new EditCompanyUsersPermissionPlugin(),
+            new AddCompanyUserPermissionPlugin(),
+            new ManageCompanyUserInvitationPermissionPlugin(),
         ];
     }
 }

src/Pyz/Zed/Publisher/PublisherDependencyProvider.php

@@ -99,6 +99,7 @@
 use Spryker\Zed\ProductConfigurationStorage\Communication\Plugin\Publisher\ProductConfiguration\ProductConfigurationWritePublisherPlugin;
 use Spryker\Zed\ProductConfigurationStorage\Communication\Plugin\Publisher\ProductConfigurationPublisherTriggerPlugin;
 use Spryker\Zed\ProductDiscontinuedStorage\Communication\Plugin\Publisher\ProductDiscontinuedPublisherTriggerPlugin;
+use Spryker\Zed\ProductLabel\Communication\Plugin\Publisher\ProductLabelLocalizedAttributesWritePublisherPlugin;
 use Spryker\Zed\ProductLabel\Communication\Plugin\Publisher\ProductLabelProductUpdatedEventTriggerPlugin;
 use Spryker\Zed\ProductLabelSearch\Communication\Plugin\Publisher\ProductLabel\ProductLabelWritePublisherPlugin as ProductLabelSearchWritePublisherPlugin;
 use Spryker\Zed\ProductLabelSearch\Communication\Plugin\Publisher\ProductLabelProductAbstract\ProductLabelProductAbstractWritePublisherPlugin as ProductLabelProductAbstractSearchWritePublisherPlugin;
@@ -283,6 +284,7 @@ protected function getProductLabelStoragePlugins(): array
             new ProductLabelProductAbstractStorageWritePublisherPlugin(),
             new ProductLabelDictionaryStorageWritePublisherPlugin(),
             new ProductLabelDictionaryStorageDeletePublisherPlugin(),
+            new ProductLabelLocalizedAttributesWritePublisherPlugin(),
         ];
     }
 

tests/PyzTest/Yves/Checkout/Process/Steps/SuccessStepTest.php

@@ -34,18 +34,23 @@ class SuccessStepTest extends Unit
      */
     public function testExecuteShouldEmptyQuoteTransfer(): void
     {
+        // Arrange
         $customerClientMock = $this->createCustomerClientMock();
         $customerClientMock->expects($this->once())->method('markCustomerAsDirty');
 
-        $successStep = $this->createSuccessStep($customerClientMock);
+        $cartClientMock = $this->createCartClientMock();
+
+        // Assert
+        $cartClientMock->expects($this->once())->method('clearQuote');
+
+        // Arrange
+        $successStep = $this->createSuccessStep($customerClientMock, $cartClientMock);
 
         $quoteTransfer = new QuoteTransfer();
         $quoteTransfer->addItem(new ItemTransfer());
 
-        $this->assertTrue($successStep->preCondition($quoteTransfer));
-        $quoteTransfer = $successStep->execute($this->createRequest(), $quoteTransfer);
-
-        $this->assertFalse($successStep->preCondition($quoteTransfer));
+        // Act
+        $successStep->execute($this->createRequest(), $quoteTransfer);
     }
 
     /**
@@ -74,16 +79,20 @@ public function testPostConditionsWhenOrderReferenceIsMissingShouldReturnFalse()
 
     /**
      * @param \SprykerShop\Yves\CheckoutPage\Dependency\Client\CheckoutPageToCustomerClientInterface|null $customerClientMock
+     * @param \SprykerShop\Yves\CheckoutPage\Dependency\Client\CheckoutPageToCartClientInterface|null $cartClientMock
      *
      * @return \SprykerShop\Yves\CheckoutPage\Process\Steps\SuccessStep
      */
-    protected function createSuccessStep($customerClientMock = null): SuccessStep
+    protected function createSuccessStep($customerClientMock = null, ?CheckoutPageToCartClientInterface $cartClientMock = null): SuccessStep
     {
         if ($customerClientMock === null) {
             $customerClientMock = $this->createCustomerClientMock();
         }
 
-        $cartClientMock = $this->createCartClientMock();
+        if ($cartClientMock === null) {
+            $cartClientMock = $this->createCartClientMock();
+        }
+
         $checkoutPageConfigMock = $this->createCheckoutPageConfigMock();
 
         return new SuccessStep(