Skip to content

Commit 0472281

Browse files
engcom-Charlieengcom-Charlie
committed
fix static
1 parent 798e61f commit 0472281

File tree

4 files changed

+49
-37
lines changed

4 files changed

+49
-37
lines changed

‎app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
1111
<td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
1212
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
13-
<?php if ($_options = $block->getItemOptions()) : ?>
13+
<?php if ($_options = $block->getItemOptions()): ?>
1414
<dl class="item-options">
15-
<?php foreach ($_options as $_option) : ?>
15+
<?php foreach ($_options as $_option): ?>
1616
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
17-
<?php if (!$block->getPrintStatus()) : ?>
17+
<?php if (!$block->getPrintStatus()): ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1919
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
2020
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
21-
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
21+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
2222
<div class="tooltip content">
2323
<dl class="item options">
2424
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
@@ -27,7 +27,7 @@
2727
</div>
2828
<?php endif; ?>
2929
</dd>
30-
<?php else : ?>
30+
<?php else: ?>
3131
<dd>
3232
<?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?>
3333
</dd>
@@ -37,31 +37,35 @@
3737
<?php endif; ?>
3838

3939
<?php /* downloadable */ ?>
40-
<?php if ($links = $block->getLinks()) : ?>
40+
<?php if ($links = $block->getLinks()): ?>
4141
<dl class="item options">
4242
<dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
43-
<?php foreach ($links->getPurchasedItems() as $link) : ?>
43+
<?php foreach ($links->getPurchasedItems() as $link): ?>
4444
<dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
4545
<?php endforeach; ?>
4646
</dl>
4747
<?php endif; ?>
4848
<?php /* EOF downloadable */ ?>
4949

5050
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
51-
<?php if ($addInfoBlock) : ?>
51+
<?php if ($addInfoBlock): ?>
5252
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
5353
<?php endif; ?>
5454
<?= $block->escapeHtml($_item->getDescription()) ?>
5555
</td>
56-
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
56+
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
57+
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
58+
</td>
5759
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
5860
<?= $block->getItemPriceHtml() ?>
5961
</td>
6062
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (float) $_item->getQty() ?></td>
6163
<td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
6264
<?= $block->getItemRowTotalHtml() ?>
6365
</td>
64-
<td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
66+
<td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
67+
<?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?>
68+
</td>
6569
<td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
6670
<?= $block->getItemRowTotalAfterDiscountHtml() ?>
6771
</td>

‎app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
1111
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
1212
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
13-
<?php if ($_options = $block->getItemOptions()) : ?>
13+
<?php if ($_options = $block->getItemOptions()): ?>
1414
<dl class="item-options">
15-
<?php foreach ($_options as $_option) : ?>
15+
<?php foreach ($_options as $_option): ?>
1616
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
17-
<?php if (!$block->getPrintStatus()) : ?>
17+
<?php if (!$block->getPrintStatus()): ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1919
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
2020
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
21-
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
21+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
2222
<div class="tooltip content">
2323
<dl class="item options">
2424
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
@@ -27,19 +27,21 @@
2727
</div>
2828
<?php endif; ?>
2929
</dd>
30-
<?php else : ?>
30+
<?php else: ?>
3131
<dd><?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?></dd>
3232
<?php endif; ?>
3333
<?php endforeach; ?>
3434
</dl>
3535
<?php endif; ?>
3636
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
37-
<?php if ($addInfoBlock) :?>
37+
<?php if ($addInfoBlock): ?>
3838
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
3939
<?php endif; ?>
4040
<?= $block->escapeHtml($_item->getDescription()) ?>
4141
</td>
42-
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
42+
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
43+
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
44+
</td>
4345
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
4446
<?= $block->getItemPriceHtml() ?>
4547
</td>

‎app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ $_item = $block->getItem();
1010
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
1111
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
1212
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
13-
<?php if ($_options = $block->getItemOptions()) : ?>
13+
<?php if ($_options = $block->getItemOptions()): ?>
1414
<dl class="item-options">
15-
<?php foreach ($_options as $_option) : ?>
15+
<?php foreach ($_options as $_option): ?>
1616
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
17-
<?php if (!$block->getPrintStatus()) : ?>
17+
<?php if (!$block->getPrintStatus()): ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1919
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
2020
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
21-
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
21+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
2222
<div class="tooltip content">
2323
<dl class="item options">
2424
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
@@ -27,43 +27,46 @@ $_item = $block->getItem();
2727
</div>
2828
<?php endif; ?>
2929
</dd>
30-
<?php else : ?>
31-
<dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
30+
<?php else: ?>
31+
<?php $optionValue = isset($_option['print_value']) ? $_option['print_value'] : $_option['value'] ?>
32+
<dd><?= $block->escapeHtml($optionValue) ?></dd>
3233
<?php endif; ?>
3334
<?php endforeach; ?>
3435
</dl>
3536
<?php endif; ?>
3637
<?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
37-
<?php if ($addtInfoBlock) : ?>
38+
<?php if ($addtInfoBlock): ?>
3839
<?= $addtInfoBlock->setItem($_item)->toHtml() ?>
3940
<?php endif; ?>
4041
<?= $block->escapeHtml($_item->getDescription()) ?>
4142
</td>
42-
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
43+
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
44+
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
45+
</td>
4346
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
4447
<?= $block->getItemPriceHtml() ?>
4548
</td>
4649
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
4750
<ul class="items-qty">
48-
<?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
51+
<?php if ($block->getItem()->getQtyOrdered() > 0): ?>
4952
<li class="item">
5053
<span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
5154
<span class="content"><?= (float) $block->getItem()->getQtyOrdered() ?></span>
5255
</li>
5356
<?php endif; ?>
54-
<?php if ($block->getItem()->getQtyShipped() > 0) : ?>
57+
<?php if ($block->getItem()->getQtyShipped() > 0): ?>
5558
<li class="item">
5659
<span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
5760
<span class="content"><?= (float) $block->getItem()->getQtyShipped() ?></span>
5861
</li>
5962
<?php endif; ?>
60-
<?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
63+
<?php if ($block->getItem()->getQtyCanceled() > 0): ?>
6164
<li class="item">
6265
<span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
6366
<span class="content"><?= (float) $block->getItem()->getQtyCanceled() ?></span>
6467
</li>
6568
<?php endif; ?>
66-
<?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
69+
<?php if ($block->getItem()->getQtyRefunded() > 0): ?>
6770
<li class="item">
6871
<span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
6972
<span class="content"><?= (float) $block->getItem()->getQtyRefunded() ?></span>

‎app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
1010
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
1111
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
12-
<?php if ($_options = $block->getItemOptions()) : ?>
12+
<?php if ($_options = $block->getItemOptions()): ?>
1313
<dl class="item options">
14-
<?php foreach ($_options as $_option) : ?>
14+
<?php foreach ($_options as $_option): ?>
1515
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
16-
<?php if (!$block->getPrintStatus()) : ?>
16+
<?php if (!$block->getPrintStatus()): ?>
1717
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1818
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
1919
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
20-
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
20+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
2121
<div class="tooltip content">
2222
<dl class="item options">
2323
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
@@ -26,18 +26,21 @@
2626
</div>
2727
<?php endif; ?>
2828
</dd>
29-
<?php else : ?>
30-
<dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
29+
<?php else: ?>
30+
<?php $optionValue = isset($_option['print_value']) ? $_option['print_value'] : $_option['value'] ?>
31+
<dd><?= $block->escapeHtml($optionValue) ?></dd>
3132
<?php endif; ?>
3233
<?php endforeach; ?>
3334
</dl>
3435
<?php endif; ?>
3536
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
36-
<?php if ($addInfoBlock) : ?>
37+
<?php if ($addInfoBlock): ?>
3738
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
3839
<?php endif; ?>
3940
<?= $block->escapeHtml($_item->getDescription()) ?>
4041
</td>
41-
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
42+
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
43+
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
44+
</td>
4245
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= (int) $_item->getQty() ?></td>
4346
</tr>

0 commit comments

Comments
 (0)