diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml index 7824cbd91186..6b2b4869c893 100644 --- a/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml +++ b/vendor/magento/module-customer-custom-attributes/view/frontend/layout/customer_account_edit.xml @@ -23,6 +23,7 @@ Magento\Customer\Model\Customer + Magento\Framework\View\Element\ButtonLockManager CustomerFileAttribute diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml index 7d2543c73854..59f2bfa4b5e8 100644 --- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml +++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/edit.phtml @@ -5,6 +5,13 @@ */ /** @var Magento\CustomerCustomAttributes\Block\Form $block */ +if (!$block->getButtonLockManager()) { + $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); + $block->setButtonLockManager( + $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class) + ); +} +/** @var $escaper \Magento\Framework\Escaper */ use Magento\Customer\Block\Widget\Dob; use Magento\Customer\Block\Widget\Gender; @@ -14,11 +21,11 @@ use Magento\Customer\Block\Widget\Taxvat; ?>
getBlockHtml('formkey') ?> - escapeHtml(__('Account Information')) ?>
+ escapeHtml(__('Account Information')) ?>
getLayout()->createBlock(Name::class)->setObject($block->getCustomer())->toHtml() ?> getLayout()->createBlock(Dob::class) ?> @@ -35,19 +42,19 @@ use Magento\Customer\Block\Widget\Taxvat;
getChangePassword()): ?> checked="checked" class="checkbox" />
getLayout()->getBlock('customer_form_user_attributes'); ?> @@ -64,21 +71,21 @@ use Magento\Customer\Block\Widget\Taxvat;
- escapeHtml(__('Change Email and Password')) ?> + escapeHtml(__('Change Email and Password')) ?>
getRequiredCharacterClassesNumber() ?>
- escapeHtml(__('Password Strength')) ?>: + escapeHtml(__('Password Strength')) ?>: - escapeHtml(__('No Password')) ?> + escapeHtml(__('No Password')) ?>
@@ -110,7 +117,7 @@ use Magento\Customer\Block\Widget\Taxvat;
-
@@ -174,9 +184,9 @@ use Magento\Customer\Block\Widget\Taxvat; { "[data-role=change-email], [data-role=change-password]": { "changeEmailPassword": { - "titleChangeEmail": "escapeJs(__('Change Email')) ?>", - "titleChangePassword": "escapeJs(__('Change Password')) ?>", - "titleChangeEmailAndPassword": "escapeJs(__('Change Email and Password')) ?>" + "titleChangeEmail": "escapeJs(__('Change Email')) ?>", + "titleChangePassword": "escapeJs(__('Change Password')) ?>", + "titleChangeEmailAndPassword": "escapeJs(__('Change Email and Password')) ?>" } }, "*": { diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml index 70d10a3f1d16..3af26582422f 100644 --- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml +++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/customer/form/register.phtml @@ -11,8 +11,13 @@ /** * Create account form template * - * @var $block \Magento\Customer\Block\Form\Register - */ + * @var $block \Magento\Customer\Block\Form\Register */ +if (!$block->getButtonLockManager()) { + $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); + $block->setButtonLockManager( + $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class) + ); +} ?> getChildHtml('form_fields_before') ?> @@ -25,11 +30,9 @@ $directoryHelper = $block->getData('directoryHelper'); $formData = $block->getFormData(); /** @var \Magento\CustomerCustomAttributes\ViewModel\Address\RegionProvider $regionProvider */ $regionProvider = $block->getRegionProvider(); -/** @var \Magento\Customer\ViewModel\CreateAccountButton $createAccountButtonViewModel */ -$createAccountButtonViewModel = $block->getData('create_account_button_view_model'); ?> getData('create_account_button_view_mode getChildHtml('form_fields_before_in_form') ?> getBlockHtml('formkey'); ?>
- escapeHtml(__('Personal Information')) ?>
- - + escapeHtml(__('Personal Information')) ?>
+ + getLayout()->createBlock(\Magento\Customer\Block\Widget\Name::class) ->setObject($formData) ->setForceUseCustomerAttributes(true) @@ -50,13 +53,13 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode @@ -92,7 +95,7 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode getShowAddressFields()): ?>
- escapeHtml(__('Address Information')) ?>
+ escapeHtml(__('Address Information')) ?>
@@ -117,7 +120,7 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
@@ -132,8 +135,8 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
@@ -141,13 +144,13 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode getStreetLines(); $_i <= $_n; $_i++): ?>
@@ -164,7 +167,7 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
@@ -181,13 +184,13 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode title="getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id">
@@ -211,7 +214,7 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode getAttributeValidationClass('postcode'); ?> getData('create_account_button_view_mode
-