Skip to content
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

Jump to bottom

Fixed critical error: The following tag(s) are not allowed: img #29863

Merged
merged 2 commits into from
Sep 10, 2020
Merged

Fixed critical error: The following tag(s) are not allowed: img #29863

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
798e61f
Fixed issue with critical error: The following tag(s) are not allowed…
Sep 2, 2020
0472281
fix static
engcom-Charlie Sep 8, 2020
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
26 changes: 15 additions & 11 deletions app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
<td class="col name" data-th="<?= $block->escapeHtmlAttr(__('Product Name')) ?>">
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
<?php if ($_options = $block->getItemOptions()) : ?>
<?php if ($_options = $block->getItemOptions()): ?>
<dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<?php foreach ($_options as $_option): ?>
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?php if (!$block->getPrintStatus()) : ?>
<?php if (!$block->getPrintStatus()): ?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="tooltip content">
<dl class="item options">
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
Expand All @@ -27,7 +27,7 @@
</div>
<?php endif; ?>
</dd>
<?php else : ?>
<?php else: ?>
<dd>
<?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?>
</dd>
Expand All @@ -37,31 +37,35 @@
<?php endif; ?>

<?php /* downloadable */ ?>
<?php if ($links = $block->getLinks()) : ?>
<?php if ($links = $block->getLinks()): ?>
<dl class="item options">
<dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
<?php foreach ($links->getPurchasedItems() as $link) : ?>
<?php foreach ($links->getPurchasedItems() as $link): ?>
<dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
<?php endforeach; ?>
</dl>
<?php endif; ?>
<?php /* EOF downloadable */ ?>

<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
<?php if ($addInfoBlock) : ?>
<?php if ($addInfoBlock): ?>
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
<?php endif; ?>
<?= $block->escapeHtml($_item->getDescription()) ?>
</td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
</td>
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
<?= $block->getItemPriceHtml() ?>
</td>
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= (float) $_item->getQty() ?></td>
<td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
<?= $block->getItemRowTotalHtml() ?>
</td>
<td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
<td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
<?= /* @noEscape */ $_order->formatPrice(-$_item->getDiscountAmount()) ?>
</td>
<td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
<?= $block->getItemRowTotalAfterDiscountHtml() ?>
</td>
Expand Down
18 changes: 10 additions & 8 deletions app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
<?php if ($_options = $block->getItemOptions()) : ?>
<?php if ($_options = $block->getItemOptions()): ?>
<dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<?php foreach ($_options as $_option): ?>
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?php if (!$block->getPrintStatus()) : ?>
<?php if (!$block->getPrintStatus()): ?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="tooltip content">
<dl class="item options">
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
Expand All @@ -27,19 +27,21 @@
</div>
<?php endif; ?>
</dd>
<?php else : ?>
<?php else: ?>
<dd><?= $block->escapeHtml($_option['print_value'] ?? $_option['value']) ?></dd>
<?php endif; ?>
<?php endforeach; ?>
</dl>
<?php endif; ?>
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
<?php if ($addInfoBlock) :?>
<?php if ($addInfoBlock): ?>
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
<?php endif; ?>
<?= $block->escapeHtml($_item->getDescription()) ?>
</td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
</td>
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
<?= $block->getItemPriceHtml() ?>
</td>
Expand Down
29 changes: 16 additions & 13 deletions app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ $_item = $block->getItem();
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
<?php if ($_options = $block->getItemOptions()) : ?>
<?php if ($_options = $block->getItemOptions()): ?>
<dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<?php foreach ($_options as $_option): ?>
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?php if (!$block->getPrintStatus()) : ?>
<?php if (!$block->getPrintStatus()): ?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="tooltip content">
<dl class="item options">
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
Expand All @@ -27,43 +27,46 @@ $_item = $block->getItem();
</div>
<?php endif; ?>
</dd>
<?php else : ?>
<dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<?php else: ?>
<?php $optionValue = isset($_option['print_value']) ? $_option['print_value'] : $_option['value'] ?>
<dd><?= $block->escapeHtml($optionValue) ?></dd>
<?php endif; ?>
<?php endforeach; ?>
</dl>
<?php endif; ?>
<?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
<?php if ($addtInfoBlock) : ?>
<?php if ($addtInfoBlock): ?>
<?= $addtInfoBlock->setItem($_item)->toHtml() ?>
<?php endif; ?>
<?= $block->escapeHtml($_item->getDescription()) ?>
</td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
</td>
<td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
<?= $block->getItemPriceHtml() ?>
</td>
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
<ul class="items-qty">
<?php if ($block->getItem()->getQtyOrdered() > 0) : ?>
<?php if ($block->getItem()->getQtyOrdered() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyOrdered() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyShipped() > 0) : ?>
<?php if ($block->getItem()->getQtyShipped() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyShipped() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
<?php if ($block->getItem()->getQtyCanceled() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyCanceled() ?></span>
</li>
<?php endif; ?>
<?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
<?php if ($block->getItem()->getQtyRefunded() > 0): ?>
<li class="item">
<span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
<span class="content"><?= (float) $block->getItem()->getQtyRefunded() ?></span>
Expand Down
21 changes: 12 additions & 9 deletions app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<tr id="order-item-row-<?= (int) $_item->getId() ?>">
<td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
<strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
<?php if ($_options = $block->getItemOptions()) : ?>
<?php if ($_options = $block->getItemOptions()): ?>
<dl class="item options">
<?php foreach ($_options as $_option) : ?>
<?php foreach ($_options as $_option): ?>
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
<?php if (!$block->getPrintStatus()) : ?>
<?php if (!$block->getPrintStatus()): ?>
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="tooltip content">
<dl class="item options">
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
Expand All @@ -26,18 +26,21 @@
</div>
<?php endif; ?>
</dd>
<?php else : ?>
<dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
<?php else: ?>
<?php $optionValue = isset($_option['print_value']) ? $_option['print_value'] : $_option['value'] ?>
<dd><?= $block->escapeHtml($optionValue) ?></dd>
<?php endif; ?>
<?php endforeach; ?>
</dl>
<?php endif; ?>
<?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
<?php if ($addInfoBlock) : ?>
<?php if ($addInfoBlock): ?>
<?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
<?php endif; ?>
<?= $block->escapeHtml($_item->getDescription()) ?>
</td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @noEscape */ $block->prepareSku($block->getSku()) ?></td>
<td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>">
<?= /* @noEscape */ $block->prepareSku($block->getSku()) ?>
</td>
<td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= (int) $_item->getQty() ?></td>
</tr>