Merge remote-tracking branch 'origin/MAGETWO-61249' into BUGS-2.0

Author: slavvka

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));

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 [
             [

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

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);
-                    });
+                        }
+                    );
                 }
             }
         });

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());

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."