Skip to content

Commit 0421665

Browse files
nathanjosiahnathanjosiah
authored
Merge pull request #4406 from magento-borg/borg-mainline-2.3
[borg] Bug fixes
2 parents 9fc254f + b63ef9a commit 0421665

File tree

23 files changed

+103
-103
lines changed

23 files changed

+103
-103
lines changed

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,43 @@
6868
<table class="qty-table">
6969
<tr>
7070
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
71-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
71+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
7272
</tr>
7373
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
7474
<tr>
7575
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
76-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
76+
<td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
7777
</tr>
7878
<?php endif; ?>
7979
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
8080
<tr>
8181
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
82-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
82+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
8383
</tr>
8484
<?php endif; ?>
8585
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
8686
<tr>
8787
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
88-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
88+
<td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
8989
</tr>
9090
<?php endif; ?>
9191
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
9292
<tr>
9393
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
94-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
94+
<td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
9595
</tr>
9696
<?php endif; ?>
9797
</table>
9898
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
9999
<table class="qty-table">
100100
<tr>
101101
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
102-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
102+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
103103
</tr>
104104
<?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
105105
<tr>
106106
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
107-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
107+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
108108
</tr>
109109
<?php endif; ?>
110110
</table>
@@ -133,9 +133,9 @@
133133
<input type="text"
134134
class="input-text admin__control-text qty-input"
135135
name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
136-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
136+
value="<?= (float)$_item->getQty() * 1 ?>" />
137137
<?php else : ?>
138-
<?= $block->escapeHtml($_item->getQty()*1) ?>
138+
<?= (float)$_item->getQty() * 1 ?>
139139
<?php endif; ?>
140140
<?php else : ?>
141141
&nbsp;

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</td>
6464
<td class="col-qty">
6565
<?php if ($block->canShowPriceInfo($_item)) : ?>
66-
<?= $block->escapeHtml($_item->getQty()*1) ?>
66+
<?= (float)$_item->getQty() * 1 ?>
6767
<?php else : ?>
6868
&nbsp;
6969
<?php endif; ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,43 +78,43 @@
7878
<table class="qty-table">
7979
<tr>
8080
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
81-
<td><span><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></span></td>
81+
<td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
8282
</tr>
8383
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
8484
<tr>
8585
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
86-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
86+
<td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
8787
</tr>
8888
<?php endif; ?>
8989
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
9090
<tr>
9191
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
92-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
92+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
9393
</tr>
9494
<?php endif; ?>
9595
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
9696
<tr>
9797
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
98-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
98+
<td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
9999
</tr>
100100
<?php endif; ?>
101101
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
102102
<tr>
103103
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
104-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
104+
<td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
105105
</tr>
106106
<?php endif; ?>
107107
</table>
108108
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
109109
<table class="qty-table">
110110
<tr>
111111
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
112-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
112+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
113113
</tr>
114114
<?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
115115
<tr>
116116
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
117-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
117+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
118118
</tr>
119119
<?php endif; ?>
120120
</table>
@@ -128,9 +128,9 @@
128128
<input type="text"
129129
class="input-text admin__control-text qty-input"
130130
name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
131-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
131+
value="<?= (float)$_item->getQty() * 1 ?>" />
132132
<?php else : ?>
133-
<?= $block->escapeHtml($_item->getQty()*1) ?>
133+
<?= (float)$_item->getQty() * 1 ?>
134134
<?php endif; ?>
135135
<?php else : ?>
136136
&nbsp;

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</td>
6565
<td class="col-qty">
6666
<?php if ($block->canShowPriceInfo($_item)) : ?>
67-
<?= $block->escapeHtml($_item->getQty()*1) ?>
67+
<?= (float)$_item->getQty() * 1 ?>
6868
<?php else : ?>
6969
&nbsp;
7070
<?php endif; ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,43 +87,43 @@
8787
<table class="qty-table">
8888
<tr>
8989
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
90-
<td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
90+
<td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
9191
</tr>
9292
<?php if ((float) $_item->getQtyInvoiced()) : ?>
9393
<tr>
9494
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
95-
<td><?= $block->escapeHtml($_item->getQtyInvoiced()*1) ?></td>
95+
<td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
9696
</tr>
9797
<?php endif; ?>
9898
<?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
9999
<tr>
100100
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
101-
<td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
101+
<td><?= (float)$_item->getQtyShipped() * 1 ?></td>
102102
</tr>
103103
<?php endif; ?>
104104
<?php if ((float) $_item->getQtyRefunded()) : ?>
105105
<tr>
106106
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
107-
<td><?= $block->escapeHtml($_item->getQtyRefunded()*1) ?></td>
107+
<td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
108108
</tr>
109109
<?php endif; ?>
110110
<?php if ((float) $_item->getQtyCanceled()) : ?>
111111
<tr>
112112
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
113-
<td><?= $block->escapeHtml($_item->getQtyCanceled()*1) ?></td>
113+
<td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
114114
</tr>
115115
<?php endif; ?>
116116
</table>
117117
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
118118
<table class="qty-table">
119119
<tr>
120120
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
121-
<td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
121+
<td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
122122
</tr>
123123
<?php if ((float) $_item->getQtyShipped()) : ?>
124124
<tr>
125125
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
126-
<td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
126+
<td><?= (float)$_item->getQtyShipped() * 1 ?></td>
127127
</tr>
128128
<?php endif; ?>
129129
</table>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<input type="text"
5959
class="input-text admin__control-text"
6060
name="shipment[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
61-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
61+
value="<?= (float)$_item->getQty() * 1 ?>" />
6262
<?php else : ?>
6363
&nbsp;
6464
<?php endif; ?>

‎app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<td class="col-qty last">
4949
<?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
5050
<?php if (isset($shipItems[$_item->getId()])) : ?>
51-
<?= $block->escapeHtml($shipItems[$_item->getId()]->getQty()*1) ?>
51+
<?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
5252
<?php elseif ($_item->getIsVirtual()) : ?>
5353
<?= $block->escapeHtml(__('N/A')) ?>
5454
<?php else : ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
<?php endif; ?>
5454
<td class="item-qty">
5555
<?php if ($block->canShowPriceInfo($_item)) : ?>
56-
<?= $block->escapeHtml($_item->getQty() * 1) ?>
56+
<?= (float)$_item->getQty() * 1 ?>
5757
<?php else : ?>
5858
&nbsp;
5959
<?php endif; ?>
6060
</td>
6161
<td class="item-price">
6262
<?php if ($block->canShowPriceInfo($_item)) : ?>
63-
<?= $block->escapeHtml($block->getItemPrice($_item)) ?>
63+
<?= /* @noEscape */ $block->getItemPrice($_item) ?>
6464
<?php else : ?>
6565
&nbsp;
6666
<?php endif; ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<?php endif; ?>
5555
<td class="item-qty">
5656
<?php if ($block->canShowPriceInfo($_item)) : ?>
57-
<?= $block->escapeHtml($_item->getQty() * 1) ?>
57+
<?= (float)$_item->getQty() * 1 ?>
5858
<?php else : ?>
5959
&nbsp;
6060
<?php endif; ?>
6161
</td>
6262
<td class="item-price">
6363
<?php if ($block->canShowPriceInfo($_item)) : ?>
64-
<?= $block->escapeHtml($block->getItemPrice($_item)) ?>
64+
<?= /* @noEscape */ $block->getItemPrice($_item) ?>
6565
<?php else : ?>
6666
&nbsp;
6767
<?php endif; ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
4141
</td>
4242
<td class="item-qty">
43-
<?= $block->escapeHtml($_item->getQtyOrdered() * 1) ?>
43+
<?= (float)$_item->getQtyOrdered() * 1 ?>
4444
</td>
4545
<td class="item-price">
46-
<?= $block->escapeHtml($block->getItemPrice($_item)) ?>
46+
<?= /* @noEscape */ $block->getItemPrice($_item) ?>
4747
</td>
4848
</tr>
4949
<?php else : ?>

0 commit comments

Comments
 (0)