MAGETWO-84321: Instant Purchase button displays only for one store view

Author: omiroshnichenko

app/code/Magento/InstantPurchase/Model/PlaceOrder.php

@@ -13,7 +13,9 @@
 use Magento\InstantPurchase\Model\QuoteManagement\QuoteCreation;
 use Magento\InstantPurchase\Model\QuoteManagement\QuoteFilling;
 use Magento\InstantPurchase\Model\QuoteManagement\ShippingConfiguration;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Store\Model\Store;
+use \Throwable;
 
 /**
  * Place an order using instant purchase option.
@@ -22,6 +24,11 @@
  */
 class PlaceOrder
 {
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @var QuoteCreation
      */
@@ -49,19 +56,22 @@ class PlaceOrder
 
     /**
      * PlaceOrder constructor.
+     * @param CartRepositoryInterface $quoteRepository
      * @param QuoteCreation $quoteCreation
      * @param QuoteFilling $quoteFilling
      * @param ShippingConfiguration $shippingConfiguration
      * @param PaymentConfiguration $paymentConfiguration
      * @param Purchase $purchase
      */
     public function __construct(
+        CartRepositoryInterface $quoteRepository,
         QuoteCreation $quoteCreation,
         QuoteFilling $quoteFilling,
         ShippingConfiguration $shippingConfiguration,
         PaymentConfiguration $paymentConfiguration,
         Purchase $purchase
     ) {
+        $this->quoteRepository = $quoteRepository;
         $this->quoteCreation = $quoteCreation;
         $this->quoteFilling = $quoteFilling;
         $this->shippingConfiguration = $shippingConfiguration;
@@ -79,6 +89,7 @@ public function __construct(
      * @param array $productRequest
      * @return int order identifier
      * @throws LocalizedException if order can not be placed.
+     * @throws Throwable if unpredictable error occurred.
      */
     public function placeOrder(
         Store $store,
@@ -98,17 +109,28 @@ public function placeOrder(
             $product,
             $productRequest
         );
-        $quote = $this->shippingConfiguration->configureShippingMethod(
-            $quote,
-            $instantPurchaseOption->getShippingMethod()
-        );
-        $quote = $this->paymentConfiguration->configurePayment(
-            $quote,
-            $instantPurchaseOption->getPaymentToken()
-        );
-        $orderId = $this->purchase->purchase(
-            $quote
-        );
-        return $orderId;
+
+        $quote->collectTotals();
+        $this->quoteRepository->save($quote);
+        $quote = $this->quoteRepository->get($quote->getId());
+
+        try {
+            $quote = $this->shippingConfiguration->configureShippingMethod(
+                $quote,
+                $instantPurchaseOption->getShippingMethod()
+            );
+            $quote = $this->paymentConfiguration->configurePayment(
+                $quote,
+                $instantPurchaseOption->getPaymentToken()
+            );
+            $orderId = $this->purchase->purchase(
+                $quote
+            );
+            return $orderId;
+        } catch (Throwable $e) {
+            $quote->setIsActive(false);
+            $this->quoteRepository->save($quote);
+            throw $e;
+        }
     }
 }