MC-19542: Error While placing order from Paypal through Braintree

Author: viktym

app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php

@@ -19,6 +19,7 @@
 /**
  * Class OrderPlace
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class OrderPlace extends AbstractHelper
 {
@@ -79,9 +80,10 @@ public function __construct(
     public function execute(Quote $quote, array $agreement)
     {
         if (!$this->agreementsValidator->isValid($agreement)) {
-            throw new LocalizedException(__(
+            $errorMsg = __(
                 "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
-            ));
+            );
+            throw new LocalizedException($errorMsg);
         }
 
         if ($this->getCheckoutMethod($quote) === Onepage::METHOD_GUEST) {
@@ -91,12 +93,7 @@ public function execute(Quote $quote, array $agreement)
         $this->disabledQuoteAddressValidation($quote);
 
         $quote->collectTotals();
-        try {
-            $this->cartManagement->placeOrder($quote->getId());
-        } catch (\Exception $e) {
-            $this->orderCancellationService->execute($quote->getReservedOrderId());
-            throw $e;
-        }
+        $this->cartManagement->placeOrder($quote->getId());
     }
 
     /**

app/code/Magento/Braintree/Plugin/OrderCancellation.php

@@ -72,7 +72,9 @@ public function aroundPlaceOrder(
             ];
             if (in_array($payment->getMethod(), $paymentCodes)) {
                 $incrementId = $quote->getReservedOrderId();
-                $this->orderCancellationService->execute($incrementId);
+                if ($incrementId) {
+                    $this->orderCancellationService->execute($incrementId);
+                }
             }
 
             throw $e;

dev/tests/integration/testsuite/Magento/Braintree/Controller/Paypal/PlaceOrderTest.php

@@ -76,7 +76,6 @@ protected function tearDown()
     /**
      * Tests a negative scenario for a place order flow when exception throws after placing an order.
      *
-     *
      * @magentoAppArea frontend
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
@@ -113,6 +112,43 @@ public function testExecuteWithFailedOrder()
         self::assertEquals('canceled', $order->getState());
     }
 
+    /**
+     * Tests a negative scenario for a place order flow when exception throws before order creation.
+     *
+     * @magentoAppArea frontend
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+     */
+    public function testExecuteWithFailedQuoteValidation()
+    {
+        $reservedOrderId = null;
+        $quote = $this->getQuote('test01');
+        $quote->setReservedOrderId($reservedOrderId);
+
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getQuoteId')
+            ->willReturn($quote->getId());
+
+        $this->adapter->method('sale')
+            ->willReturn($this->getTransactionStub('authorized'));
+        $this->adapter->method('void')
+            ->willReturn($this->getTransactionStub('voided'));
+
+        // emulates an error after placing the order
+        $this->session->method('setLastOrderStatus')
+            ->willThrowException(new \Exception('Test Exception'));
+
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('braintree/paypal/placeOrder');
+
+        self::assertRedirect(self::stringContains('checkout/cart'));
+        self::assertSessionMessages(
+            self::equalTo(['The order #' . $reservedOrderId . ' cannot be processed.']),
+            MessageInterface::TYPE_ERROR
+        );
+    }
+
     /**
      * Gets quote by reserved order ID.
      *