Skip to content

Correct spelling of variables for customer address #32815

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Feb 17, 2025
Merged

Correct spelling of variables for customer address #32815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73afd3d
Correct spelling of variables for customer address
fredden Apr 22, 2021
941bd99
Use distinct variable names for clarity
fredden Apr 22, 2021
dd68584
Merge remote-tracking branch 'upstream/2.4-develop' into spelling/cus…
fredden Nov 26, 2021
167853e
Merge branch '2.4-develop' into spelling/customer-address-grid
fredden Oct 21, 2022
e6ae485
Merge branch '2.4-develop' into spelling/customer-address-grid
fredden Nov 4, 2022
1e9b889
Merge branch '2.4-develop' into spelling/customer-address-grid
engcom-Dash Sep 27, 2024
b092ee5
32815: Fix PHPCS error related to is deprecated
engcom-Dash Sep 27, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions app/code/Magento/Customer/view/frontend/templates/address/book.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,63 @@
*/

/** @var \Magento\Customer\Block\Address\Book $block */
/** @var \Magento\Framework\Escaper $escaper */
?>
<div class="block block-addresses-default">
<div class="block-title"><strong><?= $block->escapeHtml(__('Default Addresses')) ?></strong></div>
<div class="block-title"><strong><?= $escaper->escapeHtml(__('Default Addresses')) ?></strong></div>
<div class="block-content">
<?php if ($_pAddsses = $block->getDefaultBilling()) : ?>
<?php if ($defaultBillingAddress = $block->getDefaultBilling()): ?>
<div class="box box-address-billing">
<strong class="box-title">
<span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
<span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
</strong>
<div class="box-content">
<address>
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
<?= $block->getAddressHtml($block->getAddressById($defaultBillingAddress)) ?>
</address>
</div>
<div class="box-actions">
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
<span><?= $block->escapeHtml(__('Change Billing Address')) ?></span>
<a class="action edit"
href="<?= $escaper->escapeUrl($block->getAddressEditUrl($defaultBillingAddress)) ?>">
<span><?= $escaper->escapeHtml(__('Change Billing Address')) ?></span>
</a>
</div>
</div>
<?php else : ?>
<?php else: ?>
<div class="box box-billing-address">
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
<strong class="box-title">
<span><?= $escaper->escapeHtml(__('Default Billing Address')) ?></span>
</strong>
<div class="box-content">
<p><?= $block->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
<p><?= $escaper->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
</div>
</div>
<?php endif ?>

<?php if ($_pAddsses = $block->getDefaultShipping()) : ?>
<?php if ($defaultShippingAddress = $block->getDefaultShipping()): ?>
<div class="box box-address-shipping">
<strong class="box-title">
<span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
<span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
</strong>
<div class="box-content">
<address>
<?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
<?= $block->getAddressHtml($block->getAddressById($defaultShippingAddress)) ?>
</address>
</div>
<div class="box-actions">
<a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
<span><?= $block->escapeHtml(__('Change Shipping Address')) ?></span>
<a class="action edit"
href="<?= $escaper->escapeUrl($block->getAddressEditUrl($defaultShippingAddress)) ?>">
<span><?= $escaper->escapeHtml(__('Change Shipping Address')) ?></span>
</a>
</div>
</div>
<?php else : ?>
<?php else: ?>
<div class="box box-shipping-address">
<strong class="box-title"><span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
<strong class="box-title">
<span><?= $escaper->escapeHtml(__('Default Shipping Address')) ?></span>
</strong>
<div class="box-content">
<p><?= $block->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
<p><?= $escaper->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
</div>
</div>
<?php endif ?>
Expand Down
95 changes: 64 additions & 31 deletions app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,108 @@
*/

/** @var \Magento\Customer\Block\Address\Grid $block */
/** @var \Magento\Framework\Escaper $escaper */
$customerAddressView = $block->getData('customer_address');
?>

<div class="block block-addresses-list">
<div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
<div class="block-title"><strong><?= $escaper->escapeHtml(__('Additional Address Entries')) ?></strong></div>
<div class="block-content">
<?php if ($_pAddsses = $block->getAdditionalAddresses()) : ?>

<?php if ($additionalAddresses = $block->getAdditionalAddresses()): ?>
<div class="table-wrapper additional-addresses">
<table class="data table table-additional-addresses-items history" id="additional-addresses-table">
<caption class="table-caption"><?= $block->escapeHtml(__('Additional addresses')) ?></caption>
<caption class="table-caption"><?= $escaper->escapeHtml(__('Additional addresses')) ?></caption>
<thead>
<tr>
<th scope="col" class="col firstname"><?= $block->escapeHtml(__('First Name')) ?></th>
<th scope="col" class="col lastname"><?= $block->escapeHtml(__('Last Name')) ?></th>
<th scope="col" class="col streetaddress"><?= $block->escapeHtml(__('Street Address')) ?></th>
<th scope="col" class="col city"><?= $block->escapeHtml(__('City')) ?></th>
<th scope="col" class="col country"><?= $block->escapeHtml(__('Country')) ?></th>
<th scope="col" class="col state"><?= $block->escapeHtml(__('State')) ?></th>
<th scope="col" class="col zip"><?= $block->escapeHtml(__('Zip/Postal Code')) ?></th>
<th scope="col" class="col phone"><?= $block->escapeHtml(__('Phone')) ?></th>
<th scope="col" class="col firstname"><?= $escaper->escapeHtml(__('First Name')) ?></th>
<th scope="col" class="col lastname"><?= $escaper->escapeHtml(__('Last Name')) ?></th>
<th scope="col" class="col streetaddress"><?= $escaper->escapeHtml(__('Street Address')) ?></th>
<th scope="col" class="col city"><?= $escaper->escapeHtml(__('City')) ?></th>
<th scope="col" class="col country"><?= $escaper->escapeHtml(__('Country')) ?></th>
<th scope="col" class="col state"><?= $escaper->escapeHtml(__('State')) ?></th>
<th scope="col" class="col zip"><?= $escaper->escapeHtml(__('Zip/Postal Code')) ?></th>
<th scope="col" class="col phone"><?= $escaper->escapeHtml(__('Phone')) ?></th>
<th scope="col" class="col actions"> </th>
</tr>
</thead>
<tbody>
<?php foreach ($_pAddsses as $address) : ?>
<?php foreach ($additionalAddresses as $address): ?>
<tr>
<td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= $block->escapeHtml($address->getFirstname()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= $block->escapeHtml($address->getLastname()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->escapeHtml($block->getStreetAddress($address)) ?></td>
<td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= $block->escapeHtml($address->getCity()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= $block->escapeHtml($block->getCountryByCode($address->getCountryId())) ?></td>
<td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= $block->escapeHtml($address->getRegion()->getRegion()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= $block->escapeHtml($address->getPostcode()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= $block->escapeHtml($address->getTelephone()) ?></td>
<td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
<a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
<a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete')) ?></span></a>
<td data-th="<?= $escaper->escapeHtml(__('First Name')) ?>" class="col firstname">
<?= $escaper->escapeHtml($address->getFirstname()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Last Name')) ?>" class="col lastname">
<?= $escaper->escapeHtml($address->getLastname()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Street Address')) ?>" class="col streetaddress">
<?= $escaper->escapeHtml($block->getStreetAddress($address)) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('City')) ?>" class="col city">
<?= $escaper->escapeHtml($address->getCity()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Country')) ?>" class="col country">
<?= $escaper->escapeHtml($block->getCountryByCode($address->getCountryId())) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('State')) ?>" class="col state">
<?= $escaper->escapeHtml($address->getRegion()->getRegion()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip">
<?= $escaper->escapeHtml($address->getPostcode()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Phone')) ?>" class="col phone">
<?= $escaper->escapeHtml($address->getTelephone()) ?>
</td>
<td data-th="<?= $escaper->escapeHtml(__('Actions')) ?>" class="col actions">
<a class="action edit" href="
<?= $escaper->escapeUrl(
$block->getUrl('customer/address/edit', ['id' => $address->getId()])
) ?>">
<span><?= $escaper->escapeHtml(__('Edit')) ?></span>
</a>
<a class="action delete"
href="#" role="delete-address"
data-address="<?= $escaper->escapeHtmlAttr($address->getId()) ?>">
<span><?= $escaper->escapeHtml(__('Delete')) ?></span>
</a>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
<?php if ($block->getChildHtml('pager')) : ?>
<?php if ($block->getChildHtml('pager')): ?>
<div class="customer-addresses-toolbar toolbar bottom"><?= $block->getChildHtml('pager') ?></div>
<?php endif ?>
<?php else : ?>
<p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
<?php else: ?>
<p class="empty">
<?= $escaper->escapeHtml(__('You have no other address entries in your address book.')) ?>
</p>
<?php endif ?>
</div>
</div>

<div class="actions-toolbar">
<div class="primary">
<button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
<button type="button" role="add-address" title="<?= $escaper->escapeHtmlAttr(__('Add New Address')) ?>"
class="action primary add">
<span><?= $escaper->escapeHtml(__('Add New Address')) ?></span>
</button>
</div>
<div class="secondary">
<a class="action back" href="<?= $block->escapeUrl($block->getUrl('customer/account')) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
<a class="action back"
href="<?= $escaper->escapeUrl($block->getUrl('customer/account')) ?>">
<span><?= $escaper->escapeHtml(__('Back')) ?></span>
</a>
</div>
</div>
<script type="text/x-magento-init">
{
".page-main": {
"address": {
"deleteAddress": "td a[role='delete-address']",
"deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
"deleteUrlPrefix": "<?= $escaper->escapeJs($escaper->escapeUrl($block->getDeleteUrl())) ?>id/",
"addAddress": "button[role='add-address']",
"addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
"addAddressLocation": "<?= $escaper->escapeJs($escaper->escapeUrl($block->getAddAddressUrl())) ?>"
}
}
}
Expand Down