Skip to content

Commit 0d04ec6

Browse files
author
Oleksii Korshenko
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #13050: Updated cron documentation URL to 2.2 (by @robbie-thompson) - #12901: FIX: remove not used count() from templates (by @coderimus)
2 parents 628061f + 50b178a commit 0d04ec6

File tree

10 files changed

+7
-16
lines changed

10 files changed

+7
-16
lines changed

app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
<?php $items = $block->getChildren($parentItem) ?>
1414
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
1313

1414
<?php $items = $block->getChildren($parentItem) ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
?>
1111
<?php $parentItem = $block->getItem() ?>
1212
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
13-
<?php $_count = count($items) ?>
1413
<?php $_index = 0 ?>
1514

1615
<?php $_prevOptionId = '' ?>

app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<?php $parentItem = $block->getItem() ?>
1313
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
1414
<?php $shipItems = $block->getChildren($parentItem) ?>
15-
<?php $_count = count($items) ?>
1615
<?php $_index = 0 ?>
1716

1817
<?php $_prevOptionId = '' ?>

app/code/Magento/Indexer/Model/Message/Invalid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function getText()
7171
return __(
7272
'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
7373
$url,
74-
'http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html#config-cli-cron-bkg'
74+
'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
7575
);
7676
//@codingStandardsIgnoreEnd
7777
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
</tr>
4141
</thead>
4242
<?php $_items = $_creditmemo->getAllItems(); ?>
43-
<?php $_count = count($_items) ?>
4443
<?php foreach ($_items as $_item): ?>
4544
<?php if ($_item->getOrderItem()->getParentItem()) {
4645
continue;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
</tr>
3838
</thead>
3939
<?php $_items = $_invoice->getAllItems(); ?>
40-
<?php $_count = count($_items) ?>
4140
<?php foreach ($_items as $_item): ?>
4241
<?php if ($_item->getOrderItem()->getParentItem()) {
4342
continue;

app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
</tr>
3535
</thead>
3636
<?php $_items = $_creditmemo->getAllItems(); ?>
37-
<?php $_count = count($_items); ?>
3837
<?php foreach ($_items as $_item): ?>
39-
<?php if ($_item->getOrderItem()->getParentItem()) {
40-
continue;
41-
} ?>
38+
<?php if ($_item->getOrderItem()->getParentItem()): ?>
39+
continue;
40+
<?php endif; ?>
4241
<tbody>
4342
<?= $block->getItemHtml($_item) ?>
4443
</tbody>

app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@
3232
</tr>
3333
</thead>
3434
<?php $_items = $_invoice->getItemsCollection(); ?>
35-
<?php $_count = $_items->count(); ?>
3635
<?php foreach ($_items as $_item): ?>
37-
<?php if ($_item->getOrderItem()->getParentItem()) {
38-
continue;
39-
} ?>
36+
<?php if ($_item->getOrderItem()->getParentItem()): ?>
37+
continue;
38+
<?php endif; ?>
4039
<tbody>
4140
<?= $block->getItemHtml($_item) ?>
4241
</tbody>

app/code/Magento/Shipping/view/frontend/templates/items.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
</tr>
6767
</thead>
6868
<?php $_items = $_shipment->getAllItems(); ?>
69-
<?php $_count = count($_items) ?>
7069
<?php foreach ($_items as $_item): ?>
7170
<?php if ($_item->getOrderItem()->getParentItem()) {
7271
continue;

0 commit comments

Comments
 (0)