Skip to content

[FIX] small refactoring and removing not using variable from templates #14028

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 1 commit into from
Mar 11, 2018
Merged

[FIX] small refactoring and removing not using variable from templates #14028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<?php
/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */

$productId = $block->getSaleableItem()->getId();

/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
$priceModel = $block->getPriceType('regular_price');
Expand Down
2 changes: 0 additions & 2 deletions app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<?php
/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */

$productId = $block->getSaleableItem()->getId();

/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
$priceModel = $block->getPriceType('regular_price');
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ $orderStoreDate = $block->formatDate(
true,
$block->getTimezoneForStore($order->getStore())
);

$customerUrl = $block->getCustomerViewUrl();
?>

<section class="admin__page-section order-view-account-information">
Expand Down Expand Up @@ -114,8 +116,8 @@ $orderStoreDate = $block->formatDate(
<div class="admin__page-section-item-title">
<span class="title"><?= $block->escapeHtml(__('Account Information')) ?></span>
<div class="actions">
<?php if ($customerUrl = $block->getCustomerViewUrl()) : ?>
<a href="<?= /* @noEscape */ $block->getCustomerViewUrl() ?>" target="_blank">
<?php if ($customerUrl) : ?>
<a href="<?= /* @noEscape */ $customerUrl ?>" target="_blank">
<?= $block->escapeHtml(__('Edit Customer')) ?>
</a>
<?php endif; ?>
Expand All @@ -126,7 +128,7 @@ $orderStoreDate = $block->formatDate(
<tr>
<th><?= $block->escapeHtml(__('Customer Name')) ?></th>
<td>
<?php if ($customerUrl = $block->getCustomerViewUrl()): ?>
<?php if ($customerUrl): ?>
<a href="<?= $block->escapeUrl($customerUrl) ?>" target="_blank">
<span><?= $block->escapeHtml($order->getCustomerName()) ?></span>
</a>
Expand Down