Merge branch 'MAGETWO-95186' of github.com:magento-epam/magento2ce into EPAM-PR-38

vital-pantsialeyeu · vital-pantsialeyeu · commit ed22463058c3 · 2019-02-10T03:10:10.000+03:00
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -118,7 +118,9 @@ public function savePaymentInformation(
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress && $shippingAddress->getShippingMethod()) {
                 $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-                $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+                $shippingAddress->setLimitCarrier(
+                    $shippingRate ? $shippingRate->getCarrier() : $shippingAddress->getShippingMethod()
+                );
             }
         }
         $this->paymentMethodManagement->set($cartId, $paymentMethod);

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ public function savePaymentInformation(`
`118`	`118`	`$shippingAddress = $quote->getShippingAddress();`
`119`	`119`	`if ($shippingAddress && $shippingAddress->getShippingMethod()) {`
`120`	`120`	`$shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());`
`121`		`- $shippingAddress->setLimitCarrier($shippingRate->getCarrier());`
	`121`	`+ $shippingAddress->setLimitCarrier(`
	`122`	`+ $shippingRate ? $shippingRate->getCarrier() : $shippingAddress->getShippingMethod()`
	`123`	`+ );`
`122`	`124`	`}`
`123`	`125`	`}`
`124`	`126`	`$this->paymentMethodManagement->set($cartId, $paymentMethod);`