Merge pull request #367 from magento-folks/2.1.3_bugs_pr

Fixed issues: - MAGETWO-56397: Unable to Upgrade with Split Databases - MAGETWO-57387: Unable to print Invoices and Credit memo from Sales>Orders - MAGETWO-58064: Unable to upgrade with split databases. Part 2 - MAGETWO-58036: Reloading page on checkout causes shipping method to go "undefined"
magento · Sep 12, 2016 · 3bc378c · 3bc378c
2 parents e5cf9f4 + 6a90c6a
commit 3bc378c
Show file tree

Hide file tree

Showing 28 changed files with 537 additions and 150 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -165,7 +165,7 @@ define(
                 }
 
                 if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
-                    availableRate = true;
+                    availableRate = window.checkoutConfig.selectedShippingMethod;
                     selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
                 }
 

diff --git a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
@@ -15,6 +15,16 @@
  */
 class InstallSchema implements InstallSchemaInterface
 {
+    /**
+     * @var string
+     */
+    private static $quoteConnectionName = 'checkout';
+
+    /**
+     * @var string
+     */
+    private static $salesConnectionName = 'sales';
+
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -105,32 +115,32 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ['unsigned' => true, 'nullable' => false, 'default' => '0'],
             'Simple Free Shipping'
         );
-        $installer->getConnection()->addColumn(
-            $installer->getTable('sales_order_item'),
+        $installer->getConnection(self::$salesConnectionName)->addColumn(
+            $installer->getTable('sales_order_item', self::$salesConnectionName),
             'free_shipping',
             \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
             null,
             ['unsigned' => true, 'nullable' => false, 'default' => '0'],
             'Free Shipping'
         );
-        $installer->getConnection()->addColumn(
-            $installer->getTable('quote_address'),
+        $installer->getConnection(self::$quoteConnectionName)->addColumn(
+            $installer->getTable('quote_address', self::$quoteConnectionName),
             'free_shipping',
             \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
             null,
             ['unsigned' => true, 'nullable' => false, 'default' => '0'],
             'Free Shipping'
         );
-        $installer->getConnection()->addColumn(
-            $installer->getTable('quote_item'),
+        $installer->getConnection(self::$quoteConnectionName)->addColumn(
+            $installer->getTable('quote_item', self::$quoteConnectionName),
             'free_shipping',
             \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
             null,
             ['unsigned' => true, 'nullable' => false, 'default' => '0'],
             'Free Shipping'
         );
-        $installer->getConnection()->addColumn(
-            $installer->getTable('quote_address_item'),
+        $installer->getConnection(self::$quoteConnectionName)->addColumn(
+            $installer->getTable('quote_address_item', self::$quoteConnectionName),
             'free_shipping',
             \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
             null,

diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
@@ -8,14 +8,14 @@
         "magento/module-backend": "100.1.*",
         "magento/module-shipping": "100.1.*",
         "magento/module-catalog": "101.0.*",
-        "magento/module-sales": "100.1.*",
         "magento/module-sales-rule": "100.1.*",
         "magento/module-directory": "100.1.*",
         "magento/module-quote": "100.1.*",
         "magento/framework": "100.1.*"
     },
     "suggest": {
         "magento/module-checkout": "100.1.*",
+        "magento/module-sales": "100.1.*",
         "magento/module-offline-shipping-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",

diff --git a/app/code/Magento/Persistent/Setup/InstallSchema.php b/app/code/Magento/Persistent/Setup/InstallSchema.php
@@ -15,6 +15,11 @@
  */
 class InstallSchema implements InstallSchemaInterface
 {
+    /**
+     * @var string
+     */
+    private static $connectionName = 'checkout';
+
     /**
      * {@inheritdoc}
      */
@@ -97,8 +102,8 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
          * Alter quote table with is_persistent flag
          *
          */
-        $installer->getConnection()->addColumn(
-            $installer->getTable('quote'),
+        $installer->getConnection(self::$connectionName)->addColumn(
+            $installer->getTable('quote', self::$connectionName),
             'is_persistent',
             [
                 'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,

diff --git a/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php b/app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Product\Plugin;
+
+class RemoveQuoteItems
+{
+    /**
+     * @var \Magento\Quote\Model\Product\QuoteItemsCleanerInterface
+     */
+    private $quoteItemsCleaner;
+
+    /**
+     * @param \Magento\Quote\Model\Product\QuoteItemsCleanerInterface $quoteItemsCleaner
+     */
+    public function __construct(\Magento\Quote\Model\Product\QuoteItemsCleanerInterface $quoteItemsCleaner)
+    {
+        $this->quoteItemsCleaner = $quoteItemsCleaner;
+    }
+
+    /**
+     * @param \Magento\Catalog\Model\ResourceModel\Product $subject
+     * @param \Closure $proceed
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundDelete(
+        \Magento\Catalog\Model\ResourceModel\Product $subject,
+        \Closure $proceed,
+        \Magento\Catalog\Api\Data\ProductInterface $product
+    ) {
+        $result = $proceed($product);
+        $this->quoteItemsCleaner->execute($product);
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php b/app/code/Magento/Quote/Model/Product/QuoteItemsCleaner.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Product;
+
+class QuoteItemsCleaner implements \Magento\Quote\Model\Product\QuoteItemsCleanerInterface
+{
+    /**
+     * @var \Magento\Quote\Model\ResourceModel\Quote\Item
+     */
+    private $itemResource;
+
+    /**
+     * @param \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource
+     */
+    public function __construct(\Magento\Quote\Model\ResourceModel\Quote\Item $itemResource)
+    {
+        $this->itemResource = $itemResource;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(\Magento\Catalog\Api\Data\ProductInterface $product)
+    {
+        $this->itemResource->getConnection()->delete(
+            $this->itemResource->getMainTable(),
+            'product_id = ' . $product->getId()
+        );
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php b/app/code/Magento/Quote/Model/Product/QuoteItemsCleanerInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+
+interface QuoteItemsCleanerInterface
+{
+    /**
+     * @param ProductInterface $product
+     * @return void
+     */
+    public function execute(ProductInterface $product);
+}
diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php
@@ -964,12 +964,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             $installer->getTable('quote_item'),
             'item_id',
             \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-        )->addForeignKey(
-            $installer->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id'),
-            'product_id',
-            $installer->getTable('catalog_product_entity'),
-            'entity_id',
-            \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
         )->addForeignKey(
             $installer->getFkName('quote_item', 'quote_id', 'quote', 'entity_id'),
             'quote_id',

diff --git a/app/code/Magento/Quote/Setup/QuoteSetup.php b/app/code/Magento/Quote/Setup/QuoteSetup.php
@@ -29,6 +29,11 @@ class QuoteSetup extends EavSetup
      */
     protected $_encryptor;
 
+    /**
+     * @var string
+     */
+    private static $connectionName = 'checkout';
+
     /**
      * @param ModuleDataSetupInterface $setup
      * @param Context $context
@@ -70,8 +75,11 @@ public function __construct(
      */
     protected function _flatTableExist($table)
     {
-        $tablesList = $this->getSetup()->getConnection()->listTables();
-        return in_array(strtoupper($this->getSetup()->getTable($table)), array_map('strtoupper', $tablesList));
+        $tablesList = $this->getSetup()->getConnection(self::$connectionName)->listTables();
+        return in_array(
+            strtoupper($this->getSetup()->getTable($table, self::$connectionName)),
+            array_map('strtoupper', $tablesList)
+        );
     }
 
     /**
@@ -107,13 +115,15 @@ public function addAttribute($entityTypeId, $code, array $attr)
      */
     protected function _addFlatAttribute($table, $attribute, $attr)
     {
-        $tableInfo = $this->getSetup()->getConnection()->describeTable($this->getSetup()->getTable($table));
+        $tableInfo = $this->getSetup()
+            ->getConnection(self::$connectionName)
+            ->describeTable($this->getSetup()->getTable($table, self::$connectionName));
         if (isset($tableInfo[$attribute])) {
             return $this;
         }
         $columnDefinition = $this->_getAttributeColumnDefinition($attribute, $attr);
-        $this->getSetup()->getConnection()->addColumn(
-            $this->getSetup()->getTable($table),
+        $this->getSetup()->getConnection(self::$connectionName)->addColumn(
+            $this->getSetup()->getTable($table, self::$connectionName),
             $attribute,
             $columnDefinition
         );

diff --git a/app/code/Magento/Quote/Setup/Recurring.php b/app/code/Magento/Quote/Setup/Recurring.php
diff --git a/app/code/Magento/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
@@ -14,6 +14,11 @@
  */
 class UpgradeSchema implements UpgradeSchemaInterface
 {
+    /**
+     * @var string
+     */
+    private static $connectionName = 'checkout';
+
     /**
      * {@inheritdoc}
      */
@@ -22,16 +27,16 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         $setup->startSetup();
 
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-            $setup->getConnection()->addIndex(
-                $setup->getTable('quote_id_mask'),
-                $setup->getIdxName('quote_id_mask', ['masked_id']),
+            $setup->getConnection(self::$connectionName)->addIndex(
+                $setup->getTable('quote_id_mask', self::$connectionName),
+                $setup->getIdxName('quote_id_mask', ['masked_id'], '', self::$connectionName),
                 ['masked_id']
             );
         }
 
         if (version_compare($context->getVersion(), '2.0.2', '<')) {
-            $setup->getConnection()->changeColumn(
-                $setup->getTable('quote_address'),
+            $setup->getConnection(self::$connectionName)->changeColumn(
+                $setup->getTable('quote_address', self::$connectionName),
                 'street',
                 'street',
                 [
@@ -41,7 +46,15 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ]
             );
         }
-
+        //drop foreign key for single DB case
+        if (version_compare($context->getVersion(), '2.0.3', '<')
+            && $setup->tableExists($setup->getTable('quote_item'))
+        ) {
+            $setup->getConnection()->dropForeignKey(
+                $setup->getTable('quote_item'),
+                $setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')
+            );
+        }
         $setup->endSetup();
     }
 }