Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

FRW-9083 Integration #645

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"spryker/content-banners-rest-api": "^2.2.0",
"spryker/content-product-abstract-lists-rest-api": "^1.2.0",
"spryker/customer-access-rest-api": "^1.1.2",
"spryker/customer-data-change-request": "^1.0.0",
"spryker/customer-group-discount-connector": "^2.2.1",
"spryker/customer-user-connector": "^1.0.4",
"spryker/customer-user-connector-gui": "^1.5.0",
Expand Down
224 changes: 141 additions & 83 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions data/import/common/AT/cms_block_store.csv
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ cms-block-email--order-confirmation--html,AT
cms-block-email--order-confirmation--text,AT
cms-block-email--order-shipped--html,AT
cms-block-email--order-shipped--text,AT
cms-block-email--customer_email_change_verification--html,AT
cms-block-email--customer_email_change_verification--text,AT
cms-block-email--customer_email_change_notification--html,AT
cms-block-email--customer_email_change_notification--text,AT
4 changes: 4 additions & 0 deletions data/import/common/DE/cms_block_store.csv
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ cms-block-email--order-confirmation--html,DE
cms-block-email--order-confirmation--text,DE
cms-block-email--order-shipped--html,DE
cms-block-email--order-shipped--text,DE
cms-block-email--customer_email_change_verification--html,DE
cms-block-email--customer_email_change_verification--text,DE
cms-block-email--customer_email_change_notification--html,DE
cms-block-email--customer_email_change_notification--text,DE
4 changes: 4 additions & 0 deletions data/import/common/US/cms_block_store.csv
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ cms-block-email--order-confirmation--html,US
cms-block-email--order-confirmation--text,US
cms-block-email--order-shipped--html,US
cms-block-email--order-shipped--text,US
cms-block-email--customer_email_change_verification--html,US
cms-block-email--customer_email_change_verification--text,US
cms-block-email--customer_email_change_notification--html,US
cms-block-email--customer_email_change_notification--text,US
4 changes: 4 additions & 0 deletions data/import/common/common/cms_block.csv

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions data/import/common/common/glossary.csv
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,14 @@ customer.login.failed,Login failed,en_US
customer.login.failed,Login fehlgeschlagen,de_DE
customer.email.already.used,"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.email.already.used,"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.data_change_request.email_change.success,"Your email address was successfully changed.",en_US
customer.data_change_request.email_change.success,"Ihre E-Mail-Adresse wurde erfolgreich geändert.",de_DE
customer.data_change_request.email_change.requested,"You requested to change your e-mail to `%newEmail%` confirm it by clicking the verification link in the e-mail sent to it.",en_US
customer.data_change_request.email_change.requested,"Sie haben eine Änderung Ihrer E-Mail-Adresse zu `%newEmail%` angefordert. Bestätigen Sie dies, indem Sie auf den Verifizierungslink in der E-Mail klicken, die an diese Adresse gesendet wurde.",de_DE
customer.data_change_request.email_change.error,"Something went wrong. Please try again.",en_US
customer.data_change_request.email_change.error,"Etwas ist schief gelaufen. Bitte versuchen Sie es erneut.",de_DE
customer.data_change_request.invalid,"No valid data change request found.",en_US
customer.data_change_request.invalid,"Keine gültige Datenänderungsanforderung gefunden.",de_DE
general.back.button,Back,en_US
general.back.button,Zurück,de_DE
general.cancel.button,Cancel,en_US
Expand Down Expand Up @@ -2938,6 +2946,14 @@ mail.trans.company_status.title,The status of your company has been changed to,e
mail.trans.company_status.title,Der Status deines Unternehmens wurde geändert auf,de_DE
mail.trans.customer_registration.confirmation_link,Validate your email address,en_US
mail.trans.customer_registration.confirmation_link,Bestätigen Sie Ihre E-Mail-Adresse,de_DE
mail.customer.customer_email_change_verification.text,"Please validate your email address by clicking the",en_US
mail.customer.customer_email_change_verification.text,"Bitte bestätigen Sie Ihre E-Mail-Adresse, indem Sie auf den",de_DE
mail.customer.customer_email_change_notification.text,"We would like to inform you that the email address associated with your account has been successfully changed. If you made this change, no further action is required. However, if you did not request this change, please contact the store owner immediately to secure your account.",en_US
mail.customer.customer_email_change_notification.text,"Wir möchten Sie darüber informieren, dass die mit Ihrem Konto verknüpfte E-Mail-Adresse erfolgreich geändert wurde. Wenn Sie diese Änderung vorgenommen haben, ist keine weitere Aktion erforderlich. Wenn Sie diese Änderung jedoch nicht angefordert haben, wenden Sie sich bitte umgehend an den Shop-Besitzer, um Ihr Konto zu sichern.",de_DE
mail.customer.customer_email_change_notification.subject,Your Email Address Has Been Changed,en_US
mail.customer.customer_email_change_notification.subject,Ihre E-Mail-Adresse wurde geändert,de_DE
mail.customer.customer_email_change_verification.subject,Validate your email address,en_US
mail.customer.customer_email_change_verification.subject,Valideer uw e-mailadre,de_DE
customer.error.confirm_email_link.invalid_or_used,This email verification link is invalid or has been already used.,en_US
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
Expand Down Expand Up @@ -3084,3 +3100,5 @@ payment_app_widget.error.payment_failed,Payment failed,en_US
payment_app_widget.error.payment_failed,Zahlung fehlgeschlagen,de_DE
payment_app_widget.error.incorrect_quote,"Quote not found, session may have expired",en_US
payment_app_widget.error.incorrect_quote,"Angebot nicht gefunden, Sitzung ist möglicherweise abgelaufen",de_DE
customer.change_customer_email_mail_sent,"Almost there! We send you an email to validate your email address. Please confirm it to be able to log in.",en_US
customer.change_customer_email_mail_sent,"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
16 changes: 8 additions & 8 deletions package-lock.json

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

/**
* This file is part of the Spryker Commerce OS.
* For full license information, please view the LICENSE file that was distributed with this source code.
*/

declare(strict_types = 1);

namespace Orm\Zed\CustomerDataChangeRequest\Persistence;

use Spryker\Zed\CustomerDataChangeRequest\Persistence\Propel\AbstractSpyCustomerDataChangeRequest as BaseSpyCustomerDataChangeRequest;

/**
* Skeleton subclass for representing a row from the 'spy_customer_data_change_request' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*/
class SpyCustomerDataChangeRequest extends BaseSpyCustomerDataChangeRequest
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

/**
* This file is part of the Spryker Commerce OS.
* For full license information, please view the LICENSE file that was distributed with this source code.
*/

declare(strict_types = 1);

namespace Orm\Zed\CustomerDataChangeRequest\Persistence;

use Spryker\Zed\CustomerDataChangeRequest\Persistence\Propel\AbstractSpyCustomerDataChangeRequestQuery as BaseSpyCustomerDataChangeRequestQuery;

/**
* Skeleton subclass for performing query and update operations on the 'spy_customer_data_change_request' table.
*
*
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
* long as it does not already exist in the output directory.
*/
class SpyCustomerDataChangeRequestQuery extends BaseSpyCustomerDataChangeRequestQuery
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
attributes: {
'config-theme': 'secondary',
'additional-class-name': data.additionalClassName,
'data-qa': 'language-selector'
},
embed: {
jsName: config.jsName ~ '__select',
Expand Down
2 changes: 2 additions & 0 deletions src/Pyz/Yves/Router/RouterDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
namespace Pyz\Yves\Router;

use Pyz\Yves\ExampleProductSalePage\Plugin\Router\ExampleProductSaleRouteProviderPlugin;
use Spryker\Yves\CustomerDataChangeRequest\Plugin\Router\CustomerDataChangeRequestRouteProviderPlugin;
use Spryker\Yves\HealthCheck\Plugin\Router\HealthCheckRouteProviderPlugin;
use Spryker\Yves\Router\Plugin\RouteManipulator\LanguageDefaultPostAddRouteManipulatorPlugin;
use Spryker\Yves\Router\Plugin\RouteManipulator\SslPostAddRouteManipulatorPlugin;
Expand Down Expand Up @@ -130,6 +131,7 @@ protected function getRouteProvider(): array
new OrderCustomReferenceWidgetAsyncRouteProviderPlugin(),
new ProductComparisonPageRouteProviderPlugin(),
new PaymentAppWidgetRouteProviderPlugin(),
new CustomerDataChangeRequestRouteProviderPlugin(),
];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Pyz\Yves\ProductRelationWidget\Widget\UpSellingProductsWidget;
use Pyz\Yves\ProductReviewWidget\Widget\ProductDetailPageReviewWidget;
use Pyz\Yves\ProductSetWidget\Widget\ProductSetIdsWidget;
use Spryker\Yves\CustomerDataChangeRequest\Widget\CustomerEmailChangeRequestWidget;
use Spryker\Yves\ErrorHandler\Plugin\Application\ErrorHandlerApplicationPlugin;
use Spryker\Yves\EventDispatcher\Plugin\Application\EventDispatcherApplicationPlugin;
use Spryker\Yves\Form\Plugin\Application\FormApplicationPlugin;
Expand Down Expand Up @@ -219,6 +220,7 @@ protected function getGlobalWidgets(): array
LinkToProductComparisonListWidget::class,
ExpressCheckoutPaymentWidget::class,
TraceableEventWidget::class,
CustomerEmailChangeRequestWidget::class,
];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<form action="{{ data.searchUrl }}">
<div class="grid">
<div class="col col--sm-10">
<input
<input
name="q"
class="suggest-search__input suggest-search__input--expand {{ config.jsName }}__input--{{ attributes['data-search-id'] }}"
placeholder="{{ 'global.search' | trans }}"
Expand All @@ -34,6 +34,7 @@

{% include molecule('suggest-search') with {
attributes: {
'parent-class-name': config.name,
'suggestion-url': path('search/suggestion'),
'base-suggest-url': path('search/suggestion'),
'input-class-name': config.jsName ~ '__input--' ~ attributes['data-search-id'],
Expand Down
11 changes: 11 additions & 0 deletions src/Pyz/Zed/Customer/CustomerDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Spryker\Zed\AvailabilityNotification\Communication\Plugin\Customer\AvailabilityNotificationSubscriptionCustomerTransferExpanderPlugin;
use Spryker\Zed\AvailabilityNotification\Communication\Plugin\CustomerAnonymizer\AvailabilityNotificationAnonymizerPlugin;
use Spryker\Zed\Customer\CustomerDependencyProvider as SprykerCustomerDependencyProvider;
use Spryker\Zed\CustomerDataChangeRequest\Communication\Plugin\Customer\EmailChangeRequestSendVerificationCustomerPreUpdatePlugin;
use Spryker\Zed\CustomerGroup\Communication\Plugin\CustomerAnonymizer\RemoveCustomerFromGroupPlugin;
use Spryker\Zed\CustomerUserConnector\Communication\Plugin\CustomerTransferUsernameExpanderPlugin;
use Spryker\Zed\Kernel\Container;
Expand Down Expand Up @@ -74,4 +75,14 @@ protected function getCustomerTransferExpanderPlugins(): array
new AvailabilityNotificationSubscriptionCustomerTransferExpanderPlugin(),
];
}

/**
* @return array<\Spryker\Zed\CustomerExtension\Dependency\Plugin\CustomerPreUpdatePluginInterface>
*/
protected function getCustomerPreUpdatePlugins(): array
{
return [
new EmailChangeRequestSendVerificationCustomerPreUpdatePlugin(),
];
}
}
13 changes: 13 additions & 0 deletions src/Pyz/Zed/DynamicEntity/data/installer/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,19 @@
}
]
},
{
"name": "productAbstractUrls",
"isEditable": false,
"childDynamicEntityConfiguration": {
"tableAlias": "urls"
},
"relationFieldMappings": [
{
"childFieldName": "fk_resource_product_abstract",
"parentFieldName": "fk_product_abstract"
}
]
},
{
"name": "productStocks",
"isEditable": true,
Expand Down
4 changes: 4 additions & 0 deletions src/Pyz/Zed/Mail/MailDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
use Spryker\Zed\Customer\Communication\Plugin\Mail\CustomerRegistrationMailTypeBuilderPlugin;
use Spryker\Zed\Customer\Communication\Plugin\Mail\CustomerRestoredPasswordConfirmationMailTypeBuilderPlugin;
use Spryker\Zed\Customer\Communication\Plugin\Mail\CustomerRestorePasswordMailTypeBuilderPlugin;
use Spryker\Zed\CustomerDataChangeRequest\Communication\Plugin\Mail\CustomerEmailChangeNotificationMailTypePlugin;
use Spryker\Zed\CustomerDataChangeRequest\Communication\Plugin\Mail\CustomerEmailChangeVerificationMailTypePlugin;
use Spryker\Zed\GiftCardMailConnector\Communication\Plugin\Mail\GiftCardDeliveryMailTypeBuilderPlugin;
use Spryker\Zed\GiftCardMailConnector\Communication\Plugin\Mail\GiftCardUsageMailTypeBuilderPlugin;
use Spryker\Zed\Kernel\Container;
Expand Down Expand Up @@ -86,6 +88,8 @@ protected function getMailTypeBuilderPlugins(): array
new GiftCardDeliveryMailTypeBuilderPlugin(),
new GiftCardUsageMailTypeBuilderPlugin(),
new OrderInvoiceMailTypeBuilderPlugin(),
new CustomerEmailChangeVerificationMailTypePlugin(),
new CustomerEmailChangeNotificationMailTypePlugin(),
];
}
}
Loading