Merge branch '2.2-develop' into MAGETWO-84507

Author: Yevhen Miroshnychenko

app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js

@@ -72,20 +72,20 @@ define([
                 output = {},
                 streetObject;
 
+            $.each(addrs, function (key) {
+                if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) {
+                    output[self.toUnderscore(key)] = addrs[key];
+                }
+            });
+
             if ($.isArray(addrs.street)) {
                 streetObject = {};
                 addrs.street.forEach(function (value, index) {
                     streetObject[index] = value;
                 });
-                addrs.street = streetObject;
+                output.street = streetObject;
             }
 
-            $.each(addrs, function (key) {
-                if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) {
-                    output[self.toUnderscore(key)] = addrs[key];
-                }
-            });
-
             return output;
         },
 

app/code/Magento/Quote/Model/Quote/Address.php

@@ -1008,6 +1008,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
+        $request->setQuoteStoreId($this->getQuote()->getStoreId());
         $request->setStoreId($this->storeManager->getStore()->getId());
         $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         $request->setFreeShipping($this->getFreeShipping());

app/code/Magento/Sales/Block/Order/Totals.php

@@ -293,6 +293,12 @@ public function removeTotal($code)
      */
     public function applySortOrder($order)
     {
+        \uksort(
+            $this->_totals,
+            function ($code1, $code2) use ($order) {
+                return ($order[$code1] ?? 0) <=> ($order[$code2] ?? 0);
+            }
+        );
         return $this;
     }
 

app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Block\Order;
+
+use Magento\Framework\Registry;
+use Magento\Sales\Block\Order\Totals;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Total;
+
+class TotalsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Block\Order\Totals
+     */
+    protected $block;
+
+    /**
+     * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    protected function setUp()
+    {
+        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->block = new Totals($this->context, new Registry);
+        $this->block->setOrder($this->createMock(Order::class));
+    }
+
+    public function testApplySortOrder()
+    {
+        $this->block->addTotal(new Total(['code' => 'one']), 'last');
+        $this->block->addTotal(new Total(['code' => 'two']), 'last');
+        $this->block->addTotal(new Total(['code' => 'three']), 'last');
+        $this->block->applySortOrder(
+            [
+                'one' => 10,
+                'two' => 30,
+                'three' => 20,
+            ]
+        );
+        $this->assertEqualsSorted(
+            [
+                'one' => new Total(['code' => 'one']),
+                'three' => new Total(['code' => 'three']),
+                'two' => new Total(['code' => 'two']),
+            ],
+            $this->block->getTotals()
+        );
+    }
+
+    private function assertEqualsSorted(array $expected, array $actual)
+    {
+        $this->assertEquals($expected, $actual, 'Array contents should be equal.');
+        $this->assertEquals(array_keys($expected), array_keys($actual), 'Array sort order should be equal.');
+    }
+}

app/code/Magento/Shipping/Model/Shipping.php

@@ -252,7 +252,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
     public function collectCarrierRates($carrierCode, $request)
     {
         /* @var $carrier \Magento\Shipping\Model\Carrier\AbstractCarrier */
-        $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getStoreId());
+        $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getQuoteStoreId());
         if (!$carrier) {
             return $this;
         }

app/code/Magento/Swatches/Helper/Media.php

@@ -207,7 +207,7 @@ protected function setupImageProperties(\Magento\Framework\Image $image, $isSwat
         if ($isSwatch) {
             $image->keepFrame(true);
             $image->keepTransparency(true);
-            $image->backgroundColor('#FFF');
+            $image->backgroundColor([255, 255, 255]);
         }
         return $this;
     }

app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php

@@ -166,6 +166,7 @@ public function testGenerateSwatchVariations()
         $this->imageFactoryMock->expects($this->any())->method('create')->willReturn($image);
         $this->generateImageConfig();
         $image->expects($this->any())->method('resize')->will($this->returnSelf());
+        $image->expects($this->atLeastOnce())->method('backgroundColor')->with([255, 255, 255])->willReturnSelf();
         $this->mediaHelperObject->generateSwatchVariations('/e/a/earth.png');
     }
 

dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Quote\Model\Quote;
 
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -25,6 +26,9 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     /**@var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
     protected $customerRepository;
 
+    /** @var  StoreRepositoryInterface */
+    private $storeRepository;
+
     /**
      * Initialize quote and customer fixtures
      */
@@ -48,6 +52,8 @@ public function setUp()
         $this->_address->setId(1);
         $this->_address->load($this->_address->getId());
         $this->_address->setQuote($this->_quote);
+        $this->storeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(StoreRepositoryInterface::class);
     }
 
     protected function tearDown()
@@ -309,4 +315,50 @@ public function dataProvider()
             [[123, true], [123, true]]
         ];
     }
+
+    /**
+     * Tests different shipping rates for different stores.
+     *
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoConfigFixture default_store carriers/flatrate/price 5
+     * @magentoConfigFixture fixture_second_store_store carriers/flatrate/price 10
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @dataProvider requestShippingRatesDataProvider
+     */
+    public function testRequestShippingRates($storeCode, $expectedRate)
+    {
+        $store = $this->storeRepository->get($storeCode);
+        $this->_quote->setStoreId($store->getId());
+        $this->_address->setItemQty(1);
+        $this->_address->requestShippingRates();
+        /**
+         * @var \Magento\Quote\Model\ResourceModel\Quote\Address\Rate\Collection $shippingRatesCollection
+         */
+        $shippingRatesCollection = $this->_address->getShippingRatesCollection();
+        /**
+         * @var \Magento\Quote\Model\Quote\Address\Rate[] $shippingRates
+         */
+        $shippingRates = $shippingRatesCollection->getItems();
+        self::assertEquals(
+            $expectedRate,
+            $shippingRates[0]->getPrice()
+        );
+    }
+
+    /**
+     * Data provider for testRequestShippingRates.
+     *
+     * @return array
+     */
+    public function requestShippingRatesDataProvider()
+    {
+        return [
+            ['default', 5],
+            ['fixture_second_store', 10],
+        ];
+    }
 }

pub/errors/processor.php

@@ -215,7 +215,7 @@ public function process503()
     public function processReport()
     {
         $this->pageTitle = 'There has been an error processing your request';
-        $this->_response->setHttpResponseCode(503);
+        $this->_response->setHttpResponseCode(500);
 
         $this->showErrorMsg = false;
         $this->showSentMsg  = false;