[shopsys] send mail about adding new customer user to customer (#3291)

shopsys · Aug 9, 2024 · b1b1a16 · b1b1a16
2 parents 594fff9 + 518e27a
commit b1b1a16
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/app/config/packages/security.yaml b/app/config/packages/security.yaml
@@ -229,6 +229,7 @@ security:
         - { path: ^/%admin_url%/billing-address/edit, roles: ROLE_CUSTOMER_FULL }
         - { path: ^/%admin_url%/customer/edit-personal-data/, roles: ROLE_CUSTOMER_FULL }
         - { path: ^/%admin_url%/customer/new-customer-user/, roles: ROLE_CUSTOMER_FULL }
+        - { path: ^/%admin_url%/customer/admin_customer_send_reset_password/, roles: ROLE_CUSTOMER_VIEW }
         - { path: ^/%admin_url%/delivery-address/edit, roles: ROLE_CUSTOMER_FULL }
         - { path: ^/%admin_url%/delivery-address/new, roles: ROLE_CUSTOMER_FULL }
         - { path: ^/%admin_url%/customer/, roles: ROLE_CUSTOMER_VIEW }

diff --git a/app/src/Controller/Admin/CustomerController.php b/app/src/Controller/Admin/CustomerController.php
@@ -13,8 +13,9 @@
  * @property \App\Model\Customer\User\CustomerUserUpdateDataFactory $customerUserUpdateDataFactory
  * @property \App\Model\Customer\User\CustomerUserFacade $customerUserFacade
  * @method \App\Model\Administrator\Administrator getCurrentAdministrator()
- * @method __construct(\App\Model\Customer\User\CustomerUserDataFactory $customerUserDataFactory, \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserListAdminFacade $customerUserListAdminFacade, \App\Model\Customer\User\CustomerUserFacade $customerUserFacade, \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider, \Shopsys\FrameworkBundle\Model\Administrator\AdministratorGridFacade $administratorGridFacade, \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory, \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade, \App\Model\Order\OrderFacade $orderFacade, \App\Model\Customer\User\CustomerUserUpdateDataFactory $customerUserUpdateDataFactory, \Shopsys\FrameworkBundle\Component\Domain\Domain $domain, \Shopsys\FrontendApiBundle\Model\Security\LoginAdministratorAsUserUrlProvider $loginAdministratorAsUserUrlProvider, \Shopsys\FrameworkBundle\Model\Customer\CustomerFacade $customerFacade)
+ * @method __construct(\App\Model\Customer\User\CustomerUserDataFactory $customerUserDataFactory, \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserListAdminFacade $customerUserListAdminFacade, \App\Model\Customer\User\CustomerUserFacade $customerUserFacade, \Shopsys\FrameworkBundle\Model\AdminNavigation\BreadcrumbOverrider $breadcrumbOverrider, \Shopsys\FrameworkBundle\Model\Administrator\AdministratorGridFacade $administratorGridFacade, \Shopsys\FrameworkBundle\Component\Grid\GridFactory $gridFactory, \Shopsys\FrameworkBundle\Component\Domain\AdminDomainTabsFacade $adminDomainTabsFacade, \App\Model\Order\OrderFacade $orderFacade, \App\Model\Customer\User\CustomerUserUpdateDataFactory $customerUserUpdateDataFactory, \Shopsys\FrameworkBundle\Component\Domain\Domain $domain, \Shopsys\FrontendApiBundle\Model\Security\LoginAdministratorAsUserUrlProvider $loginAdministratorAsUserUrlProvider, \Shopsys\FrameworkBundle\Model\Customer\CustomerFacade $customerFacade, \App\Model\Customer\User\CustomerUserPasswordFacade $customerUserPasswordFacade)
  * @property \Shopsys\FrontendApiBundle\Model\Security\LoginAdministratorAsUserUrlProvider $loginAdministratorAsUserUrlProvider
+ * @property \App\Model\Customer\User\CustomerUserPasswordFacade $customerUserPasswordFacade
  */
 class CustomerController extends BaseCustomerController
 {

diff --git a/app/src/DataFixtures/Demo/CompanyDataFixture.php b/app/src/DataFixtures/Demo/CompanyDataFixture.php
@@ -106,7 +106,7 @@ private function createCustomerUsers(Customer $customer): void
         foreach ($customersDataProvider as $customerDataProvider) {
             $deliveryAddress = $this->createDeliveryAddress($customer, $customerDataProvider[self::KEY_DELIVERY_ADDRESS]);
             $customerUserdata = $this->createCustomerUserData($customerDataProvider[self::KEY_CUSTOMER_USER_DATA], $customer->getDomainId(), $deliveryAddress);
-            $customerUser = $this->customerUserFacade->createCustomerUser($customer, $customerUserdata);
+            $customerUser = $this->customerUserFacade->createCustomerUserWithActivationMail($customer, $customerUserdata);
 
             $customerUserReference = $customerDataProvider[self::KEY_CUSTOMER_USER_DATA][self::KEY_CUSTOMER_USER_REFERENCE];
             $this->addReferenceForDomain($customerUserReference, $customerUser, $customer->getDomainId());

diff --git a/app/src/Model/Customer/User/CustomerUserFacade.php b/app/src/Model/Customer/User/CustomerUserFacade.php
@@ -34,6 +34,10 @@
  * @method sendActivationMail(\App\Model\Customer\User\CustomerUser $customerUser)
  * @method setDefaultDeliveryAddress(\App\Model\Customer\User\CustomerUser $customerUser, \App\Model\Customer\DeliveryAddress $deliveryAddress)
  * @method \App\Model\Customer\User\CustomerUser editCustomerUser(int $id, \App\Model\Customer\User\CustomerUserData $customerUserData)
+ * @method \Shopsys\FrameworkBundle\Model\Customer\Customer createCustomerWithAddresses(\App\Model\Customer\User\CustomerUserUpdateData $customerUserUpdateData)
+ * @method \App\Model\Customer\User\CustomerUser createCustomerUserWithRegistrationMail(\Shopsys\FrameworkBundle\Model\Customer\Customer $customer, \App\Model\Customer\User\CustomerUserData $customerUserData)
+ * @method \App\Model\Customer\User\CustomerUser createWithActivationMail(\App\Model\Customer\User\CustomerUserUpdateData $customerUserUpdateData)
+ * @method \App\Model\Customer\User\CustomerUser createCustomerUserWithActivationMail(\Shopsys\FrameworkBundle\Model\Customer\Customer $customer, \App\Model\Customer\User\CustomerUserData $customerUserData)
  */
 class CustomerUserFacade extends BaseCustomerUserFacade
 {

diff --git a/app/tests/App/Smoke/Http/RouteConfigCustomization.php b/app/tests/App/Smoke/Http/RouteConfigCustomization.php
@@ -130,7 +130,7 @@ private function configureGeneralRules(RouteConfigCustomizer $routeConfigCustomi
                 }
             })
             ->customize(function (RouteConfig $config, RouteInfo $info) {
-                if (preg_match('~(_delete$)|(_delete_all$)|(^admin_mail_deletetemplate$)|(^admin_(stock|store)_setdefault$)~', $info->getRouteName())) {
+                if (preg_match('~(_delete$)|(_delete_all$)|(^admin_mail_deletetemplate$)|(^admin_(stock|store)_setdefault$)|(^admin_customer_send_reset_password$)~', $info->getRouteName())) {
                     $debugNote = 'Add CSRF token for any delete action during test execution. '
                         . '(Routes are protected by RouteCsrfProtector.)';
                     $config->changeDefaultRequestDataSet($debugNote)

diff --git a/storefront/components/Pages/NewPassword/NewPasswordContent.tsx b/storefront/components/Pages/NewPassword/NewPasswordContent.tsx
@@ -103,7 +103,7 @@ export const NewPasswordContent: FC<NewPasswordContentProps> = ({ email, hash })
 
     return (
         <Webline className="flex flex-col items-center">
-            <h1 className="max-w-3xl w-full">{t('Login')}</h1>
+            <h1 className="max-w-3xl w-full">{t('Set new password')}</h1>
             <FormProvider {...formProviderMethods}>
                 <Form
                     className="w-full flex justify-center"