diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js index 472e964e70f2215035c0ce2576cb7a737df161cc..6903a17bcdccac663ad46d93f083b219abbcd373 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js @@ -7,6 +7,7 @@ * @api */ define([ + 'jquery', 'Magento_Ui/js/lib/view/utils/async', 'jquery/ui', 'mage/translate', @@ -838,4 +839,6 @@ define([ }; productConfigure = new ProductConfigure(); + jQuery(document).trigger('productConfigure:inited'); + jQuery(document).data('productConfigureInited', true); }); diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html index a922b8eac0c53e0a18ade6b20ad74a3014aea126..db2ff7df0e0b1fe36c1c5e02f9f02fb7f3ee5b2d 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html @@ -11,7 +11,7 @@ <fieldset class="fieldset rate" data-bind="visible: (shippingRates().length > 0)"> <dl class="items methods" data-bind="foreach: shippingRateGroups"> <dt class="item-title"><span data-bind="text: $data"></span></dt> - <dd class="item-options" data-bind="foreach: $parent.getRatesForGroup($data)"> + <dd class="item-options" data-bind="foreach: { data:$parent.getRatesForGroup($data), as: 'method' }"> <div data-bind="css: {'field choice item': available, 'message error': !available} "> <!-- ko ifnot: (available) --> <div data-bind="text: error_message"></div> @@ -29,7 +29,7 @@ "/> <label class="label" data-bind="attr: {for: 's_method_' + method_code}"> <!-- ko text: $data.method_title --><!-- /ko --> - <!-- ko text: $parents[1].getFormattedPrice(amount) --><!-- /ko --> + <each args="element.getRegion('price')" render="" /> </label> <!-- /ko --> </div> diff --git a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml index 6ec52e0afa9e5c841c314e03380aa3fb32a0e092..7041ab3793a079830deb5f760241871e5a214410 100644 --- a/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml @@ -7,6 +7,26 @@ --> <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> <body> + <referenceBlock name="checkout.cart.shipping"> + <arguments> + <argument name="jsLayout" xsi:type="array"> + <item name="components" xsi:type="array"> + <item name="block-summary" xsi:type="array"> + <item name="children" xsi:type="array"> + <item name="block-rates" xsi:type="array"> + <item name="children" xsi:type="array"> + <item name="price" xsi:type="array"> + <item name="component" xsi:type="string">Magento_Tax/js/view/checkout/shipping_method/price</item> + <item name="displayArea" xsi:type="string">price</item> + </item> + </item> + </item> + </item> + </item> + </item> + </argument> + </arguments> + </referenceBlock> <referenceBlock name="checkout.cart.totals"> <arguments> <argument name="jsLayout" xsi:type="array"> diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php index f371d66a1bb56286969f69df5167ea4257669159..9f0c6cb6f3a278ba8e1f7179ddff4c77fea9f020 100644 --- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php +++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php @@ -70,7 +70,7 @@ class Shipping extends Form * * @var string */ - protected $commonShippingPriceSelector = '.shipping .price'; + protected $commonShippingPriceSelector = '.totals.shipping .price'; /** * Open estimate shipping and tax form.