Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-69411

shiftedreality · shiftedreality · commit ae45f9bc59c8 · 2017-05-26T16:35:49.000+03:00
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
@@ -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
@@ -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/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
@@ -55,6 +55,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')
             );
         }
+        if (version_compare($context->getVersion(), '2.0.5', '<')) {
+            $connection = $setup->getConnection();
+            $connection->modifyColumn(
+                $setup->getTable('quote_address'),
+                'shipping_method',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => 120
+                ]
+            );
+        }
         $setup->endSetup();
     }
 }
diff --git a/app/code/Magento/Quote/etc/module.xml b/app/code/Magento/Quote/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.4">
+    <module name="Magento_Quote" setup_version="2.0.5">
     </module>
 </config>
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -95,6 +95,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ]
             );
         }
+        if (version_compare($context->getVersion(), '2.0.7', '<')) {
+            $connection = $installer->getConnection(self::$connectionName);
+            $connection->modifyColumn(
+                $installer->getTable('sales_order', self::$connectionName),
+                'shipping_method',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => 120
+                ]
+            );
+        }
     }
 
     /**
diff --git a/app/code/Magento/Sales/etc/module.xml b/app/code/Magento/Sales/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales" setup_version="2.0.6">
+    <module name="Magento_Sales" setup_version="2.0.7">
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>
diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php
@@ -50,8 +50,9 @@ public function format(DataObject $storeInfo, $type = 'html')
     {
         $this->eventManager->dispatch('store_address_format', ['type' => $type, 'store_info' => $storeInfo]);
         $address = $this->filterManager->template(
-            "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}"
-            . "{{var city}}, {{var region}} {{var postcode}},\n{{var country}}",
+            "{{var name}}\n{{var street_line1}}\n{{depend street_line2}}{{var street_line2}}\n{{/depend}}" .
+            "{{depend city}}{{var city}},{{/depend}} {{var region}} {{depend postcode}}{{var postcode}},{{/depend}}\n" .
+            "{{var country}}",
             ['variables' => $storeInfo->getData()]
         );
 
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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con`
`55`	`55`	`$setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')`
`56`	`56`	`);`
`57`	`57`	`}`
	`58`	`+ if (version_compare($context->getVersion(), '2.0.5', '<')) {`
	`59`	`+ $connection = $setup->getConnection();`
	`60`	`+ $connection->modifyColumn(`
	`61`	`+ $setup->getTable('quote_address'),`
	`62`	`+ 'shipping_method',`
	`63`	`+ [`
	`64`	`+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,`
	`65`	`+ 'length' => 120`
	`66`	`+ ]`
	`67`	`+ );`
	`68`	`+ }`
`58`	`69`	`$setup->endSetup();`
`59`	`70`	`}`
`60`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con`
`95`	`95`	`]`
`96`	`96`	`);`
`97`	`97`	`}`
	`98`	`+ if (version_compare($context->getVersion(), '2.0.7', '<')) {`
	`99`	`+ $connection = $installer->getConnection(self::$connectionName);`
	`100`	`+ $connection->modifyColumn(`
	`101`	`+ $installer->getTable('sales_order', self::$connectionName),`
	`102`	`+ 'shipping_method',`
	`103`	`+ [`
	`104`	`+ 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,`
	`105`	`+ 'length' => 120`
	`106`	`+ ]`
	`107`	`+ );`
	`108`	`+ }`
`98`	`109`	`}`
`99`	`110`
`100`	`111`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class Shipping extends Form`
`70`	`70`	`*`
`71`	`71`	`* @var string`
`72`	`72`	`*/`
`73`		`- protected $commonShippingPriceSelector = '.shipping .price';`
	`73`	`+ protected $commonShippingPriceSelector = '.totals.shipping .price';`
`74`	`74`
`75`	`75`	`/**`
`76`	`76`	`* Open estimate shipping and tax form.`