Merge pull request #641 from magento-south/BUGS-2.0

slavvka · web-flow · commit 6b486f724cf6 · 2016-12-01T14:50:00.000+02:00
[South] Bugs 2.0:
- MAGETWO-61178 Inconsistent sales_order_item information after upgrade
- MAGETWO-61232 Shipping rates can not be loaded
- MAGETWO-61249 [Backport] Loader doesn't disappear after click on 'Place Order' button - for 2.0
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php
@@ -127,7 +127,7 @@ protected function placeCheckoutOrder()
             );
         } catch (\Exception $exception) {
             $result->setData('error', true);
-            $result->setData('error_messages', __('Cannot place order.'));
+            $result->setData('error_messages', __('Unable to place order. Please try again later.'));
         }
         if ($response instanceof Http) {
             $response->representJson($this->jsonHelper->jsonEncode($result));
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php
@@ -279,7 +279,7 @@ public function textExecuteFailedPlaceOrderDataProvider()
     {
         $objectFailed = new \Magento\Framework\DataObject();
         $objectFailed->setData('error', true);
-        $objectFailed->setData('error_messages', __('Cannot place order.'));
+        $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));
 
         return [
             [
diff --git a/app/code/Magento/Authorizenet/i18n/en_US.csv b/app/code/Magento/Authorizenet/i18n/en_US.csv
@@ -13,6 +13,7 @@ Cancel,Cancel
 "Something went wrong canceling the transactions.","Something went wrong canceling the transactions."
 "There was an error canceling transactions. Please contact us or try again later.","There was an error canceling transactions. Please contact us or try again later."
 "We couldn't process your order right now. Please try again later.","We couldn't process your order right now. Please try again later."
+"Unable to place order. Please try again later.","Unable to place order. Please try again later."
 "amount %1","amount %1"
 failed,failed
 successful,successful
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -263,7 +263,7 @@ public function setData($key, $value = null)
     {
         if (is_array($key)) {
             $key = $this->_implodeArrayField($key);
-        } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
+        } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
             $value = $this->_implodeArrayValues($value);
         }
         return parent::setData($key, $value);
@@ -291,7 +291,7 @@ protected function isAddressMultilineAttribute($code)
     protected function _implodeArrayField(array $data)
     {
         foreach ($data as $key => $value) {
-            if (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
+            if (is_array($value) && $this->isAddressMultilineAttribute($key)) {
                 $data[$key] = $this->_implodeArrayValues($data[$key]);
             }
         }
@@ -301,22 +301,24 @@ protected function _implodeArrayField(array $data)
     /**
      * Combine values of field lines into a single string
      *
-     * @param string[]|string $value
+     * @param array $value
      * @return string
      */
     protected function _implodeArrayValues($value)
     {
-        if (is_array($value) && count($value)) {
-            $isScalar = false;
+        if (is_array($value)) {
+            $isScalar = true;
             foreach ($value as $val) {
-                if (is_scalar($val)) {
-                    $isScalar = true;
+                if (!is_scalar($val)) {
+                    $isScalar = false;
                 }
             }
+
             if ($isScalar) {
                 $value = trim(implode("\n", $value));
             }
         }
+
         return $value;
     }
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro-method.js
@@ -52,18 +52,24 @@ define(
                 var self = this;
 
                 if (this.validateHandler() && additionalValidators.validate()) {
-                    fullScreenLoader.startLoader();
                     this.isPlaceOrderActionAllowed(false);
-                    $.when(setPaymentInformationAction(this.messageContainer, {
-                        'method': self.getCode()
-                    })).done(function () {
-                        self.placeOrderHandler().fail(function () {
+                    fullScreenLoader.startLoader();
+                    $.when(
+                        setPaymentInformationAction(this.messageContainer, {'method': self.getCode()})
+                    ).done(
+                        function () {
+                            self.placeOrderHandler().fail(
+                                function () {
+                                    fullScreenLoader.stopLoader();
+                                }
+                            );
+                        }
+                    ).always(
+                        function () {
+                            self.isPlaceOrderActionAllowed(true);
                             fullScreenLoader.stopLoader();
-                        });
-                    }).fail(function () {
-                        fullScreenLoader.stopLoader();
-                        self.isPlaceOrderActionAllowed(true);
-                    });
+                        }
+                    );
                 }
             }
         });
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -354,7 +354,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
         $order = $this->submit($quote);
 
         if (null == $order) {
-            throw new LocalizedException(__('Cannot place order.'));
+            throw new LocalizedException(__('Unable to place order. Please try again later.'));
         }
 
         $this->checkoutSession->setLastQuoteId($quote->getId());
diff --git a/app/code/Magento/Quote/i18n/en_US.csv b/app/code/Magento/Quote/i18n/en_US.csv
@@ -29,3 +29,4 @@ Shipping,Shipping
 "Please specify a shipping method.","Please specify a shipping method."
 "Please check the billing address information. %1","Please check the billing address information. %1"
 "Please select a valid payment method.","Please select a valid payment method."
+"Unable to place order. Please try again later.","Unable to place order. Please try again later."
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
@@ -55,7 +55,6 @@ protected function _afterLoad()
          * Assign parent items
          */
         foreach ($this as $item) {
-            $this->_resource->unserializeFields($item);
             if ($item->getParentItemId()) {
                 $item->setParentItem($this->getItemById($item->getParentItemId()));
             }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -571,8 +571,13 @@ protected function _afterLoad()
         parent::_afterLoad();
         foreach ($this->_items as $item) {
             $item->setOrigData();
-            if ($this->_resetItemsDataChanged && ($item instanceof \Magento\Framework\Model\AbstractModel)) {
-                $item->setDataChanges(false);
+
+            if ($item instanceof \Magento\Framework\Model\AbstractModel) {
+                $this->getResource()->unserializeFields($item);
+
+                if ($this->_resetItemsDataChanged) {
+                    $item->setDataChanges(false);
+                }
             }
         }
         $this->_eventManager->dispatch('core_collection_abstract_load_after', ['collection' => $this]);
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
@@ -9,6 +9,7 @@
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
 
 use Magento\Framework\DB\Select;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\DataObject as MagentoObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -257,6 +258,30 @@ public function addFieldToSelectDataProvider()
         ];
     }
 
+    public function testLoadWithItemFieldsUnserialization()
+    {
+        $itemMock = $this->getMockBuilder(AbstractModel::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->uut->addItem($itemMock);
+
+        $itemMock->expects($this->once())
+            ->method('setOrigData');
+        $this->resourceMock->expects($this->once())
+            ->method('unserializeFields')
+            ->with($itemMock);
+
+        $this->managerMock->expects($this->exactly(2))
+            ->method('dispatch')
+            ->withConsecutive(
+                ['core_collection_abstract_load_before', ['collection' => $this->uut]],
+                ['core_collection_abstract_load_after', ['collection' => $this->uut]]
+
+            );
+
+        $this->uut->load();
+    }
+
     /**
      * @dataProvider addExpressionFieldToSelectDataProvider
      */

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected function placeCheckoutOrder()`
`127`	`127`	`);`
`128`	`128`	`} catch (\Exception $exception) {`
`129`	`129`	`$result->setData('error', true);`
`130`		`- $result->setData('error_messages', __('Cannot place order.'));`
	`130`	`+ $result->setData('error_messages', __('Unable to place order. Please try again later.'));`
`131`	`131`	`}`
`132`	`132`	`if ($response instanceof Http) {`
`133`	`133`	`$response->representJson($this->jsonHelper->jsonEncode($result));`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public function textExecuteFailedPlaceOrderDataProvider()`
`279`	`279`	`{`
`280`	`280`	`$objectFailed = new \Magento\Framework\DataObject();`
`281`	`281`	`$objectFailed->setData('error', true);`
`282`		`- $objectFailed->setData('error_messages', __('Cannot place order.'));`
	`282`	`+ $objectFailed->setData('error_messages', __('Unable to place order. Please try again later.'));`
`283`	`283`
`284`	`284`	`return [`
`285`	`285`	`[`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ public function setData($key, $value = null)`
`263`	`263`	`{`
`264`	`264`	`if (is_array($key)) {`
`265`	`265`	`$key = $this->_implodeArrayField($key);`
`266`		`- } elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {`
	`266`	`+ } elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {`
`267`	`267`	`$value = $this->_implodeArrayValues($value);`
`268`	`268`	`}`
`269`	`269`	`return parent::setData($key, $value);`
`@@ -291,7 +291,7 @@ protected function isAddressMultilineAttribute($code)`
`291`	`291`	`protected function _implodeArrayField(array $data)`
`292`	`292`	`{`
`293`	`293`	`foreach ($data as $key => $value) {`
`294`		`- if (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {`
	`294`	`+ if (is_array($value) && $this->isAddressMultilineAttribute($key)) {`
`295`	`295`	`$data[$key] = $this->_implodeArrayValues($data[$key]);`
`296`	`296`	`}`
`297`	`297`	`}`
`@@ -301,22 +301,24 @@ protected function _implodeArrayField(array $data)`
`301`	`301`	`/**`
`302`	`302`	`* Combine values of field lines into a single string`
`303`	`303`	`*`
`304`		`- * @param string[]\|string $value`
	`304`	`+ * @param array $value`
`305`	`305`	`* @return string`
`306`	`306`	`*/`
`307`	`307`	`protected function _implodeArrayValues($value)`
`308`	`308`	`{`
`309`		`- if (is_array($value) && count($value)) {`
`310`		`- $isScalar = false;`
	`309`	`+ if (is_array($value)) {`
	`310`	`+ $isScalar = true;`
`311`	`311`	`foreach ($value as $val) {`
`312`		`- if (is_scalar($val)) {`
`313`		`- $isScalar = true;`
	`312`	`+ if (!is_scalar($val)) {`
	`313`	`+ $isScalar = false;`
`314`	`314`	`}`
`315`	`315`	`}`
	`316`	`+`
`316`	`317`	`if ($isScalar) {`
`317`	`318`	`$value = trim(implode("\n", $value));`
`318`	`319`	`}`
`319`	`320`	`}`
	`321`	`+`
`320`	`322`	`return $value;`
`321`	`323`	`}`
`322`	`324`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)`
`354`	`354`	`$order = $this->submit($quote);`
`355`	`355`
`356`	`356`	`if (null == $order) {`
`357`		`- throw new LocalizedException(__('Cannot place order.'));`
	`357`	`+ throw new LocalizedException(__('Unable to place order. Please try again later.'));`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`$this->checkoutSession->setLastQuoteId($quote->getId());`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ protected function _afterLoad()`
`55`	`55`	`* Assign parent items`
`56`	`56`	`*/`
`57`	`57`	`foreach ($this as $item) {`
`58`		`- $this->_resource->unserializeFields($item);`
`59`	`58`	`if ($item->getParentItemId()) {`
`60`	`59`	`$item->setParentItem($this->getItemById($item->getParentItemId()));`
`61`	`60`	`}`