Skip to content

Commit 09385c8

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #17422: [Backport] Resolved special character issue for sidebar (by @mage2pratik) - #17413: [Backport] [Fix #16655] Block totalbar not used in invoice create and credit memo create screens (by @dverkade) Fixed GitHub Issues: - #16653: Not possible to create an invoice in Magento 2.3 (reported by @dverkade) has been fixed in #17413 by @dverkade in 2.1-develop branch Related commits: 1. db166c7 - #16655: Block totalbar not used in invoice create and credit memo create screens (reported by @dverkade) has been fixed in #17413 by @dverkade in 2.1-develop branch Related commits: 1. db166c7
2 parents 8d2b671 + ea8a641 commit 09385c8

File tree

8 files changed

+4
-6
lines changed

8 files changed

+4
-6
lines changed

app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<div class="product-item-inner">
1414
<div class="product-item-name-block">
15-
<strong class="product-item-name" data-bind="text: $parent.name"></strong>
15+
<strong class="product-item-name" data-bind="html: $parent.name"></strong>
1616
<div class="details-qty">
1717
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
1818
<span class="value" data-bind="text: $parent.qty"></span>

app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Adminhtml creditmemo bar
1010
*
11+
* @deprecated
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder

app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
2121
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
2222
<block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
23-
<block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
2423
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
2524
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
2625
<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>

app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
1414
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
1515
<block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
16-
<block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
1716
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
1817
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
1918
<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>

app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
2424
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
2525
<block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
26-
<block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
2726
<block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
2827
<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
2928
</block>

app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
1414
<block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
1515
<block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
16-
<block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
1716
<block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
1817
<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
1918
</block>

app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
// @deprecated
78
// @codingStandardsIgnoreFile
89

910
?>

app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
3131
<div class="product-item-details">
3232
<strong class="product-item-name">
3333
<a data-bind="attr: { href: product_url }" class="product-item-link">
34-
<span data-bind="text: product_name"></span>
34+
<span data-bind="html: product_name"></span>
3535
</a>
3636
</strong>
3737
<div data-bind="html: product_price"></div>

0 commit comments

Comments
 (0)