Skip to content
Snippets Groups Projects
Unverified Commit 0d04ec67 authored by Oleksii Korshenko's avatar Oleksii Korshenko Committed by GitHub
Browse files

:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento/magento2#13050: Updated cron documentation URL to 2.2 (by @robbie-thompson)
 - magento/magento2#12901: FIX: remove not used count() from templates (by @Coderimus)
parents 628061f2 50b178a0
No related merge requests found
Showing
with 7 additions and 16 deletions
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<?php $items = $block->getChildren($parentItem) ?> <?php $items = $block->getChildren($parentItem) ?>
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?> <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?> <?php $_index = 0 ?>
<?php $_prevOptionId = '' ?> <?php $_prevOptionId = '' ?>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?> <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
<?php $items = $block->getChildren($parentItem) ?> <?php $items = $block->getChildren($parentItem) ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?> <?php $_index = 0 ?>
<?php $_prevOptionId = '' ?> <?php $_prevOptionId = '' ?>
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
?> ?>
<?php $parentItem = $block->getItem() ?> <?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?> <?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?> <?php $_index = 0 ?>
<?php $_prevOptionId = '' ?> <?php $_prevOptionId = '' ?>
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<?php $parentItem = $block->getItem() ?> <?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?> <?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
<?php $shipItems = $block->getChildren($parentItem) ?> <?php $shipItems = $block->getChildren($parentItem) ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?> <?php $_index = 0 ?>
<?php $_prevOptionId = '' ?> <?php $_prevOptionId = '' ?>
......
...@@ -71,7 +71,7 @@ class Invalid implements \Magento\Framework\Notification\MessageInterface ...@@ -71,7 +71,7 @@ class Invalid implements \Magento\Framework\Notification\MessageInterface
return __( return __(
'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.', 'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
$url, $url,
'http://devdocs.magento.com/guides/v2.0/config-guide/cli/config-cli-subcommands-cron.html#config-cli-cron-bkg' 'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
); );
//@codingStandardsIgnoreEnd //@codingStandardsIgnoreEnd
} }
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
</tr> </tr>
</thead> </thead>
<?php $_items = $_creditmemo->getAllItems(); ?> <?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?> <?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) { <?php if ($_item->getOrderItem()->getParentItem()) {
continue; continue;
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
</tr> </tr>
</thead> </thead>
<?php $_items = $_invoice->getAllItems(); ?> <?php $_items = $_invoice->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?> <?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) { <?php if ($_item->getOrderItem()->getParentItem()) {
continue; continue;
......
...@@ -34,11 +34,10 @@ ...@@ -34,11 +34,10 @@
</tr> </tr>
</thead> </thead>
<?php $_items = $_creditmemo->getAllItems(); ?> <?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items); ?>
<?php foreach ($_items as $_item): ?> <?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) { <?php if ($_item->getOrderItem()->getParentItem()): ?>
continue; continue;
} ?> <?php endif; ?>
<tbody> <tbody>
<?= $block->getItemHtml($_item) ?> <?= $block->getItemHtml($_item) ?>
</tbody> </tbody>
......
...@@ -32,11 +32,10 @@ ...@@ -32,11 +32,10 @@
</tr> </tr>
</thead> </thead>
<?php $_items = $_invoice->getItemsCollection(); ?> <?php $_items = $_invoice->getItemsCollection(); ?>
<?php $_count = $_items->count(); ?>
<?php foreach ($_items as $_item): ?> <?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) { <?php if ($_item->getOrderItem()->getParentItem()): ?>
continue; continue;
} ?> <?php endif; ?>
<tbody> <tbody>
<?= $block->getItemHtml($_item) ?> <?= $block->getItemHtml($_item) ?>
</tbody> </tbody>
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
</tr> </tr>
</thead> </thead>
<?php $_items = $_shipment->getAllItems(); ?> <?php $_items = $_shipment->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?php foreach ($_items as $_item): ?> <?php foreach ($_items as $_item): ?>
<?php if ($_item->getOrderItem()->getParentItem()) { <?php if ($_item->getOrderItem()->getParentItem()) {
continue; continue;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment