Merge pull request #2732 from magento-tsg/2.3-develop-pr24

[TSG] Upporting for 2.3 (pr24) (2.3.0)

Author: Alexander Akimov

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php

@@ -221,7 +221,7 @@ private function getSelectForSearchableProducts(
         $lastProductId,
         $batch
     ) {
-        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+        $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
         $lastProductId = (int) $lastProductId;
 
         $select = $this->connection->select()

app/code/Magento/Checkout/view/frontend/web/js/model/totals.js

@@ -14,20 +14,17 @@ define([
     'use strict';
 
     var quoteItems = ko.observable(quote.totals().items),
-        cartData = customerData.get('cart');
+        cartData = customerData.get('cart'),
+        quoteSubtotal = parseFloat(quote.totals().subtotal),
+        subtotalAmount = parseFloat(cartData().subtotalAmount);
 
     quote.totals.subscribe(function (newValue) {
         quoteItems(newValue.items);
     });
 
-    cartData.subscribe(function () {
-        var quoteSubtotal = parseFloat(quote.totals().subtotal),
-            subtotalAmount = parseFloat(cartData().subtotalAmount);
-
-        if (quoteSubtotal !== subtotalAmount) {
-            customerData.reload(['cart'], false);
-        }
-    }, this);
+    if (quoteSubtotal !== subtotalAmount) {
+        customerData.reload(['cart'], false);
+    }
 
     return {
         totals: quote.totals,

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -94,17 +94,17 @@ define([
                 this.isLoading(addToCartCalls > 0);
                 sidebarInitialized = false;
                 this.update(updatedCart);
-
-                if (cartData()['website_id'] !== window.checkout.websiteId) {
-                    customerData.reload(['cart'], false);
-                }
                 initSidebar();
             }, this);
             $('[data-block="minicart"]').on('contentLoading', function () {
                 addToCartCalls++;
                 self.isLoading(true);
             });
 
+            if (cartData()['website_id'] !== window.checkout.websiteId) {
+                customerData.reload(['cart'], false);
+            }
+
             return this._super();
         },
         isLoading: ko.observable(false),

app/code/Magento/ConfigurableProduct/view/frontend/web/js/options-updater.js

@@ -26,7 +26,7 @@ define([
         if (!(data && data.items && data.items.length && productId)) {
             return false;
         }
-        changedProductOptions = data.items.find(function (item) {
+        changedProductOptions = _.find(data.items, function (item) {
             if (item['item_id'] === itemId) {
                 return item['product_id'] === productId;
             }

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -232,11 +232,9 @@ define([
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 
-                countryData.subscribe(function () {
-                    if (_.isEmpty(countryData())) {
-                        customerData.reload(['directory-data'], false);
-                    }
-                }, this);
+                if (_.isEmpty(countryData())) {
+                    customerData.reload(['directory-data'], false);
+                }
             }
         },
 

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -170,6 +170,11 @@ class Multishipping extends \Magento\Framework\DataObject
      */
     private $logger;
 
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
     /**
      * Constructor
      *
@@ -227,7 +232,8 @@ public function __construct(
         \Magento\Quote\Api\Data\CartExtensionFactory $cartExtensionFactory = null,
         AllowedCountries $allowedCountryReader = null,
         Multishipping\PlaceOrderFactory $placeOrderFactory = null,
-        LoggerInterface $logger = null
+        LoggerInterface $logger = null,
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper = null
     ) {
         $this->_eventManager = $eventManager;
         $this->_scopeConfig = $scopeConfig;
@@ -258,6 +264,8 @@ public function __construct(
             ->get(Multishipping\PlaceOrderFactory::class);
         $this->logger = $logger ?: ObjectManager::getInstance()
             ->get(LoggerInterface::class);
+        $this->dataObjectHelper = $dataObjectHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\Api\DataObjectHelper::class);
         parent::__construct($data);
         $this->_init();
     }
@@ -670,7 +678,14 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
         $quote->reserveOrderId();
         $quote->collectTotals();
 
-        $order = $this->quoteAddressToOrder->convert($address);
+        $order = $this->_orderFactory->create();
+
+        $this->dataObjectHelper->mergeDataObjects(
+            \Magento\Sales\Api\Data\OrderInterface::class,
+            $order,
+            $this->quoteAddressToOrder->convert($address)
+        );
+
         $order->setQuote($quote);
         $order->setBillingAddress($this->quoteAddressToOrderAddress->convert($quote->getBillingAddress()));