Skip to content

Commit c8fec3e

Browse files
ENGCOM-979: [Forwardport] [FIX] small refactoring and removing not using variable from templates #14194
- Merge Pull Request #14194 from mastiuhin-olexandr/magento2:2.3-develop-PR-port-14028 - Merged commits: 1. ca0385e
2 parents 447a24d + ca0385e commit c8fec3e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

app/code/Magento/Catalog/view/base/templates/product/price/default.phtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<?php
1212
/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
1313

14-
$productId = $block->getSaleableItem()->getId();
15-
1614
/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
1715
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
1816
$priceModel = $block->getPriceType('regular_price');

app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<?php
1212
/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
1313

14-
$productId = $block->getSaleableItem()->getId();
15-
1614
/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
1715
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
1816
$priceModel = $block->getPriceType('regular_price');

app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ $orderStoreDate = $block->formatDate(
2424
true,
2525
$block->getTimezoneForStore($order->getStore())
2626
);
27+
28+
$customerUrl = $block->getCustomerViewUrl();
2729
?>
2830

2931
<section class="admin__page-section order-view-account-information">
@@ -114,8 +116,8 @@ $orderStoreDate = $block->formatDate(
114116
<div class="admin__page-section-item-title">
115117
<span class="title"><?= $block->escapeHtml(__('Account Information')) ?></span>
116118
<div class="actions">
117-
<?php if ($customerUrl = $block->getCustomerViewUrl()) : ?>
118-
<a href="<?= /* @noEscape */ $block->getCustomerViewUrl() ?>" target="_blank">
119+
<?php if ($customerUrl) : ?>
120+
<a href="<?= /* @noEscape */ $customerUrl ?>" target="_blank">
119121
<?= $block->escapeHtml(__('Edit Customer')) ?>
120122
</a>
121123
<?php endif; ?>
@@ -126,7 +128,7 @@ $orderStoreDate = $block->formatDate(
126128
<tr>
127129
<th><?= $block->escapeHtml(__('Customer Name')) ?></th>
128130
<td>
129-
<?php if ($customerUrl = $block->getCustomerViewUrl()): ?>
131+
<?php if ($customerUrl): ?>
130132
<a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
131133
<span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
132134
</a>

0 commit comments

Comments
 (0)