Skip to content

Commit 4b467a9

Browse files
committed
Merge remote-tracking branch 'origin/2.4-develop' into MC-23383
2 parents 8eaf487 + 8c1a36a commit 4b467a9

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
</action>
1515
</referenceBlock>
1616
<referenceContainer name="content">
17-
<block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false"/>
17+
<block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="Magento_Customer::account/dashboard/info.phtml" cacheable="false">
18+
<container name="customer.account.dashboard.info.blocks" as="additional_blocks"/>
19+
</block>
1820
<block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="Magento_Customer::account/dashboard/address.phtml" cacheable="false"/>
1921
</referenceContainer>
2022
</body>

app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,26 @@
2929
</a>
3030
</div>
3131
</div>
32-
<?php if ($block->isNewsletterEnabled()) : ?>
32+
<?php if ($block->isNewsletterEnabled()): ?>
3333
<div class="box box-newsletter">
3434
<strong class="box-title">
3535
<span><?= $block->escapeHtml(__('Newsletters')) ?></span>
3636
</strong>
3737
<div class="box-content">
3838
<p>
39-
<?php if ($block->getIsSubscribed()) : ?>
39+
<?php if ($block->getIsSubscribed()): ?>
4040
<?= $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
41-
<?php else : ?>
41+
<?php else: ?>
4242
<?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
4343
<?php endif; ?>
4444
</p>
4545
</div>
4646
<div class="box-actions">
47-
<a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
47+
<a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>">
48+
<span><?= $block->escapeHtml(__('Edit')) ?></span></a>
4849
</div>
4950
</div>
5051
<?php endif; ?>
52+
<?= $block->getChildHtml('additional_blocks'); ?>
5153
</div>
5254
</div>

0 commit comments

Comments
 (0)