Skip to content

Commit aa49728

Browse files
sidolovsidolov
authored
Merge branch '2.2-develop' into 2.2-develop-PR-port-23250
2 parents a9406b5 + d104f69 commit aa49728

File tree

171 files changed

+2688
-2228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+2688
-2228
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
@@ -69,43 +69,43 @@
6969
<table class="qty-table">
7070
<tr>
7171
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
72-
<td><span><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></span></td>
72+
<td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
7373
</tr>
7474
<?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
7575
<tr>
7676
<th><?= $block->escapeHtml(__('Invoiced')) ?></th>
77-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
77+
<td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
7878
</tr>
7979
<?php endif; ?>
8080
<?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
8181
<tr>
8282
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
83-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
83+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
8484
</tr>
8585
<?php endif; ?>
8686
<?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
8787
<tr>
8888
<th><?= $block->escapeHtml(__('Refunded')) ?></th>
89-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
89+
<td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
9090
</tr>
9191
<?php endif; ?>
9292
<?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
9393
<tr>
9494
<th><?= $block->escapeHtml(__('Canceled')) ?></th>
95-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
95+
<td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
9696
</tr>
9797
<?php endif; ?>
9898
</table>
9999
<?php elseif ($block->isShipmentSeparately($_item)) : ?>
100100
<table class="qty-table">
101101
<tr>
102102
<th><?= $block->escapeHtml(__('Ordered')) ?></th>
103-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
103+
<td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
104104
</tr>
105105
<?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
106106
<tr>
107107
<th><?= $block->escapeHtml(__('Shipped')) ?></th>
108-
<td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
108+
<td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
109109
</tr>
110110
<?php endif; ?>
111111
</table>
@@ -119,9 +119,9 @@
119119
<input type="text"
120120
class="input-text admin__control-text qty-input"
121121
name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
122-
value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
122+
value="<?= (float)$_item->getQty() * 1 ?>" />
123123
<?php else : ?>
124-
<?= $block->escapeHtml($_item->getQty()*1) ?>
124+
<?= (float)$_item->getQty() * 1 ?>
125125
<?php endif; ?>
126126
<?php else : ?>
127127
&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
@@ -52,14 +52,14 @@
5252
<?php endif; ?>
5353
<td class="item-qty">
5454
<?php if ($block->canShowPriceInfo($_item)) : ?>
55-
<?= $block->escapeHtml($_item->getQty() * 1) ?>
55+
<?= (float)$_item->getQty() * 1 ?>
5656
<?php else : ?>
5757
&nbsp;
5858
<?php endif; ?>
5959
</td>
6060
<td class="item-price">
6161
<?php if ($block->canShowPriceInfo($_item)) : ?>
62-
<?= $block->escapeHtml($block->getItemPrice($_item)) ?>
62+
<?= /* @noEscape */ $block->getItemPrice($_item) ?>
6363
<?php else : ?>
6464
&nbsp;
6565
<?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
@@ -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/order/default.phtml‎

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

0 commit comments

Comments
 (0)