Skip to content

Commit 444fb5c

Browse files
committed
magento/magento2#: Replace deprecated addError, addSuccess, addException methods in Magento_Customer
1 parent 3a04bb7 commit 444fb5c

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

app/code/Magento/Customer/Controller/Account/CreatePost.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,13 @@ public function execute()
364364
);
365365
$confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
366366
if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {
367-
$email = $this->customerUrl->getEmailConfirmationUrl($customer->getEmail());
368-
// @codingStandardsIgnoreStart
369-
$this->messageManager->addSuccessMessage(
370-
__(
371-
'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',
372-
$email
373-
)
367+
$this->messageManager->addComplexSuccessMessage(
368+
'confirmAccountSuccessMessage',
369+
[
370+
'url' => $this->customerUrl->getEmailConfirmationUrl($customer->getEmail()),
371+
]
374372
);
375-
// @codingStandardsIgnoreEnd
373+
376374
$url = $this->urlModel->getUrl('*/*/index', ['_secure' => true]);
377375
$resultRedirect->setUrl($this->_redirect->success($url));
378376
} else {

app/code/Magento/Customer/Controller/Address/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function execute()
2929
$this->_addressRepository->deleteById($addressId);
3030
$this->messageManager->addSuccessMessage(__('You deleted the address.'));
3131
} else {
32-
$this->messageManager->addErrorMessage(__('We can\'t delete the address right now.'));
32+
$this->messageManager->addComplexErrorMessage('unableDeleteAddressMessage');
3333
}
3434
} catch (\Exception $other) {
3535
$this->messageManager->addExceptionMessage($other, __('We can\'t delete the address right now.'));

app/code/Magento/Customer/etc/frontend/di.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@
8686
<item name="template" xsi:type="string">Magento_Customer::messages/customerAlreadyExistsErrorMessage.phtml</item>
8787
</item>
8888
</item>
89+
<item name="confirmAccountSuccessMessage" xsi:type="array">
90+
<item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
91+
<item name="data" xsi:type="array">
92+
<item name="template" xsi:type="string">Magento_Customer::messages/confirmAccountSuccessMessage.phtml</item>
93+
</item>
94+
</item>
95+
<item name="unableDeleteAddressMessage" xsi:type="array">
96+
<item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
97+
<item name="data" xsi:type="array">
98+
<item name="template" xsi:type="string">Magento_Customer::messages/unableDeleteAddressMessage.phtml</item>
99+
</item>
100+
</item>
89101
</argument>
90102
</arguments>
91103
</type>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/** @var \Magento\Framework\View\Element\Template $block */
8+
?>
9+
10+
<?= $block->escapeHtml(__('You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.', $block->getData('url')), ['a']);
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/** @var \Magento\Framework\View\Element\Template $block */
8+
?>
9+
10+
<?= $block->escapeHtml(__('We can\'t delete the address right now.'));

0 commit comments

Comments
 (0)