From 047228139f8fd8f10decf7f442e356913dd4f90b Mon Sep 17 00:00:00 2001 From: "vadim.malesh" Date: Tue, 8 Sep 2020 13:43:39 +0300 Subject: [PATCH] fix static --- .../creditmemo/items/renderer/default.phtml | 24 ++++++++++------- .../invoice/items/renderer/default.phtml | 16 ++++++----- .../order/items/renderer/default.phtml | 27 ++++++++++--------- .../shipment/items/renderer/default.phtml | 19 +++++++------ 4 files changed, 49 insertions(+), 37 deletions(-) diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml index c7a1b4b79b91a..029bcb8abcc25 100644 --- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml @@ -10,15 +10,15 @@ escapeHtml($_item->getName()) ?> - getItemOptions()) : ?> + getItemOptions()): ?>
- +
escapeHtml($_option['label']) ?>
- getPrintStatus()) : ?> + getPrintStatus()): ?> getFormatedOptionValue($_option) ?> > escapeHtml($_formatedOptionValue['value'], ['a']) ?> - +
escapeHtml($_option['label']) ?>
@@ -27,7 +27,7 @@
- +
escapeHtml($_option['print_value'] ?? $_option['value']) ?>
@@ -37,10 +37,10 @@ - getLinks()) : ?> + getLinks()): ?>
escapeHtml($block->getLinksTitle()) ?>
- getPurchasedItems() as $link) : ?> + getPurchasedItems() as $link): ?>
escapeHtml($link->getLinkTitle()) ?>
@@ -48,12 +48,14 @@ getProductAdditionalInformationBlock(); ?> - + setItem($_item->getOrderItem())->toHtml() ?> escapeHtml($_item->getDescription()) ?> - prepareSku($block->getSku()) ?> + + prepareSku($block->getSku()) ?> + getItemPriceHtml() ?> @@ -61,7 +63,9 @@ getItemRowTotalHtml() ?> - formatPrice(-$_item->getDiscountAmount()) ?> + + formatPrice(-$_item->getDiscountAmount()) ?> + getItemRowTotalAfterDiscountHtml() ?> diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml index d05d6d01a5340..d9542d13aba6d 100644 --- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml @@ -10,15 +10,15 @@ escapeHtml($_item->getName()) ?> - getItemOptions()) : ?> + getItemOptions()): ?>
- +
escapeHtml($_option['label']) ?>
- getPrintStatus()) : ?> + getPrintStatus()): ?> getFormatedOptionValue($_option) ?> > escapeHtml($_formatedOptionValue['value'], ['a']) ?> - +
escapeHtml($_option['label']) ?>
@@ -27,19 +27,21 @@
- +
escapeHtml($_option['print_value'] ?? $_option['value']) ?>
getProductAdditionalInformationBlock(); ?> - + setItem($_item->getOrderItem())->toHtml() ?> escapeHtml($_item->getDescription()) ?> - prepareSku($block->getSku()) ?> + + prepareSku($block->getSku()) ?> + getItemPriceHtml() ?> diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml index f0a0f46265a3e..9cae232ca6541 100644 --- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml @@ -10,15 +10,15 @@ $_item = $block->getItem(); escapeHtml($_item->getName()) ?> - getItemOptions()) : ?> + getItemOptions()): ?>
- +
escapeHtml($_option['label']) ?>
- getPrintStatus()) : ?> + getPrintStatus()): ?> getFormatedOptionValue($_option) ?> > escapeHtml($_formatedOptionValue['value'], ['a']) ?> - +
escapeHtml($_option['label']) ?>
@@ -27,43 +27,46 @@ $_item = $block->getItem();
- -
escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
+ + +
escapeHtml($optionValue) ?>
getProductAdditionalInformationBlock(); ?> - + setItem($_item)->toHtml() ?> escapeHtml($_item->getDescription()) ?> - prepareSku($block->getSku()) ?> + + prepareSku($block->getSku()) ?> + getItemPriceHtml() ?>
    - getItem()->getQtyOrdered() > 0) : ?> + getItem()->getQtyOrdered() > 0): ?>
  • escapeHtml(__('Ordered')) ?> getItem()->getQtyOrdered() ?>
  • - getItem()->getQtyShipped() > 0) : ?> + getItem()->getQtyShipped() > 0): ?>
  • escapeHtml(__('Shipped')) ?> getItem()->getQtyShipped() ?>
  • - getItem()->getQtyCanceled() > 0) : ?> + getItem()->getQtyCanceled() > 0): ?>
  • escapeHtml(__('Canceled')) ?> getItem()->getQtyCanceled() ?>
  • - getItem()->getQtyRefunded() > 0) : ?> + getItem()->getQtyRefunded() > 0): ?>
  • escapeHtml(__('Refunded')) ?> getItem()->getQtyRefunded() ?> diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml index 773100601d2b8..6c7567a8cd14b 100644 --- a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml +++ b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml @@ -9,15 +9,15 @@ escapeHtml($_item->getName()) ?> - getItemOptions()) : ?> + getItemOptions()): ?>
    - +
    escapeHtml($_option['label']) ?>
    - getPrintStatus()) : ?> + getPrintStatus()): ?> getFormatedOptionValue($_option) ?> > escapeHtml($_formatedOptionValue['value'], ['a']) ?> - +
    escapeHtml($_option['label']) ?>
    @@ -26,18 +26,21 @@
    - -
    escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?>
    + + +
    escapeHtml($optionValue) ?>
    getProductAdditionalInformationBlock(); ?> - + setItem($_item->getOrderItem())->toHtml() ?> escapeHtml($_item->getDescription()) ?> - prepareSku($block->getSku()) ?> + + prepareSku($block->getSku()) ?> + getQty() ?>