Merge pull request #1132 from magento-folks/bugfix

[Folks] Bugfix

Merge pull request #1132 from magento-folks/bugfix
[Folks] Bugfix
ae53ec19 · Alexander Akimov · GitHub · 1a9a75f2 · 267e3360 · ae53ec19
Commit ae53ec19 authored 8 years ago by Alexander Akimov Committed by GitHub 8 years ago
--- 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);
 });
--- 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>

--- 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">

--- 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.