From 2b47c8f878d0d6391cce49724e6b14990cff58ee Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 9 Jan 2018 14:50:30 +0200
Subject: [PATCH] Fix issues caused by using continue in loops
- Fix echoing "continue;" instead of executing it
- Replace continue to opposite condition in if blocks
---
.../frontend/templates/email/creditmemo/items.phtml | 13 +++++--------
.../frontend/templates/email/invoice/items.phtml | 13 +++++--------
.../Sales/view/frontend/templates/email/items.phtml | 13 +++++--------
.../frontend/templates/email/shipment/items.phtml | 13 +++++--------
.../frontend/templates/order/creditmemo/items.phtml | 11 +++++------
.../frontend/templates/order/invoice/items.phtml | 11 +++++------
.../frontend/templates/order/print/creditmemo.phtml | 11 +++++------
.../frontend/templates/order/print/invoice.phtml | 9 ++++-----
.../Shipping/view/frontend/templates/items.phtml | 11 +++++------
9 files changed, 44 insertions(+), 61 deletions(-)
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
index 297e31d6d2c..8cef5d57664 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
@@ -25,14 +25,11 @@
</tr>
</thead>
<?php foreach ($_creditmemo->getAllItems() as $_item): ?>
- <?php
- if ($_item->getOrderItem()->getParentItem()) {
- continue;
- }
- ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot class="order-totals">
<?= $block->getChildHtml('creditmemo_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
index 10e07d13654..4c377dea47d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
@@ -25,14 +25,11 @@
</tr>
</thead>
<?php foreach ($_invoice->getAllItems() as $_item): ?>
- <?php
- if ($_item->getOrderItem()->getParentItem()) {
- continue;
- }
- ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot class="order-totals">
<?= $block->getChildHtml('invoice_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 358264463d4..37469582865 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -25,14 +25,11 @@
</tr>
</thead>
<?php foreach ($_items as $_item): ?>
- <?php
- if ($_item->getParentItem()) {
- continue;
- }
- ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot class="order-totals">
<?= $block->getChildHtml('order_totals') ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index 2d2b7b2c2b2..022511ae3cf 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
@@ -22,14 +22,11 @@
</tr>
</thead>
<?php foreach ($_shipment->getAllItems() as $_item): ?>
- <?php
- if ($_item->getOrderItem()->getParentItem()) {
- continue;
- }
- ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
</table>
<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
index ddd623a7b97..dc2cf2433ac 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
@@ -41,12 +41,11 @@
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) {
- continue;
-} ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot>
<?= $block->getTotalsHtml($_creditmemo) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
index 58ce8bff0b9..0f3236ec25b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
@@ -38,12 +38,11 @@
</thead>
<?php $_items = $_invoice->getAllItems(); ?>
<?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) {
- continue;
-} ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot>
<?= $block->getInvoiceTotalsHtml($_invoice) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index 75f210d46bb..567dfc20f2d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -35,12 +35,11 @@
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()): ?>
- continue;
- <?php endif; ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
<tfoot>
<?= $block->getTotalsHtml($_creditmemo) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index db6b7ba5ba7..6fe6da9e752 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -33,12 +33,11 @@
</thead>
<?php $_items = $_invoice->getItemsCollection(); ?>
<?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()): ?>
- continue;
+ <?php if (!$_item->getOrderItem()->getParentItem()): ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
<?php endif; ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
<?php endforeach; ?>
<tfoot>
<?= $block->getInvoiceTotalsHtml($_invoice) ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index 197823b1e07..ebc6163a7bd 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -67,12 +67,11 @@
</thead>
<?php $_items = $_shipment->getAllItems(); ?>
<?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) {
- continue;
-} ?>
- <tbody>
- <?= $block->getItemHtml($_item) ?>
- </tbody>
+ <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+ <tbody>
+ <?= $block->getItemHtml($_item) ?>
+ </tbody>
+ <?php endif; ?>
<?php endforeach; ?>
</table>
</div>
--
GitLab