Skip to content

[2.3-develop] Remove not used count() from templates + Fix issue with continue in templates 2.3 #13138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2018
Merged

[2.3-develop] Remove not used count() from templates + Fix issue with continue in templates 2.3 #13138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adbf774
FIX: remove not used count from templates
coderimus Dec 28, 2017
70a3f89
Fix issues caused by using continue in loops
ihor-sviziev Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

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

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>

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

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
?>
<?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<?php $parentItem = $block->getItem() ?>
<?php $items = array_merge([$parentItem->getOrderItem()], $parentItem->getOrderItem()->getChildrenItems()) ?>
<?php $shipItems = $block->getChildren($parentItem) ?>
<?php $_count = count($items) ?>
<?php $_index = 0 ?>

<?php $_prevOptionId = '' ?>
Expand Down
13 changes: 5 additions & 8 deletions app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ?>
Expand Down
13 changes: 5 additions & 8 deletions app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ?>
Expand Down
13 changes: 5 additions & 8 deletions app/code/Magento/Sales/view/frontend/templates/email/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ?>
Expand Down
13 changes: 5 additions & 8 deletions app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; ?>
12 changes: 5 additions & 7 deletions app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@
</tr>
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?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) ?>
Expand Down
12 changes: 5 additions & 7 deletions app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@
</tr>
</thead>
<?php $_items = $_invoice->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?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) ?>
Expand Down
12 changes: 5 additions & 7 deletions app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@
</tr>
</thead>
<?php $_items = $_creditmemo->getAllItems(); ?>
<?php $_count = count($_items); ?>
<?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) ?>
Expand Down
12 changes: 5 additions & 7 deletions app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@
</tr>
</thead>
<?php $_items = $_invoice->getItemsCollection(); ?>
<?php $_count = $_items->count(); ?>
<?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) ?>
Expand Down
12 changes: 5 additions & 7 deletions app/code/Magento/Shipping/view/frontend/templates/items.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,12 @@
</tr>
</thead>
<?php $_items = $_shipment->getAllItems(); ?>
<?php $_count = count($_items) ?>
<?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>
Expand Down