Restore cart when order is placed (#75)

Author: ahoshaiyan

Moyasar/Mysr/Controller/Order/Update.php

@@ -6,20 +6,36 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\QuoteRepository;
 use Magento\Sales\Model\Order;
 use Moyasar\Mysr\Helper\MoyasarHelper;
+use Psr\Log\LoggerInterface;
 
 class Update implements HttpPostActionInterface
 {
     protected $context;
     protected $checkoutSession;
     protected $helper;
+    protected $quoteRepository;
+    protected $eventManager;
+    protected $logger;
 
-    public function __construct(Context $context, Session $checkoutSession, MoyasarHelper $helper)
-    {
+    public function __construct(
+        Context $context,
+        Session $checkoutSession,
+        MoyasarHelper $helper,
+        QuoteRepository $quoteRepository,
+        ManagerInterface $eventManager,
+        LoggerInterface $logger
+    ) {
         $this->context = $context;
         $this->checkoutSession = $checkoutSession;
         $this->helper = $helper;
+        $this->quoteRepository = $quoteRepository;
+        $this->eventManager = $eventManager;
+        $this->logger = $logger;
     }
 
     public function execute()
@@ -33,6 +49,9 @@ public function execute()
         $order->setState(Order::STATE_PENDING_PAYMENT);
         $order->save();
 
+        // Restore quote to keep cart when the user returns after a failed 3DS attempt
+        $this->restoreQuote($order);
+
         return $this->context
             ->getResultFactory()
             ->create(ResultFactory::TYPE_JSON)
@@ -55,4 +74,25 @@ private function lastOrder()
 
         return $order;
     }
+
+    /**
+     * @param Order $order
+     * @return bool
+     */
+    public function restoreQuote($order)
+    {
+        try {
+            $quote = $this->quoteRepository->get($order->getQuoteId());
+            $quote->setIsActive(1)->setReservedOrderId(null);
+            $this->quoteRepository->save($quote);
+            $this->checkoutSession->replaceQuote($quote)->unsLastRealOrderId();
+            $this->eventManager->dispatch('restore_quote', ['order' => $order, 'quote' => $quote]);
+            return true;
+        } catch (NoSuchEntityException $e) {
+            $this->logger->critical($e);
+        }
+
+        return false;
+    }
 }
+

Moyasar/Mysr/Controller/Redirect/Response.php

@@ -126,7 +126,6 @@ private function processPaymentFail($payment, $order)
             $message .= ': ' . $sourceMessage;
         }
 
-        $this->checkoutSession->restoreQuote();
         $this->messageManager->addErrorMessage($message);
 
         $order->registerCancellation($message);
@@ -144,7 +143,6 @@ private function processUnMatchingInfoFail($payment, $order, $errors)
         $payment_id = $payment['id'];
         array_unshift($errors, __('Un-matching payment details %payment_id.', ['payment_id' => $payment['id']]));
 
-        $this->checkoutSession->restoreQuote();
         $order->registerCancellation(implode("\n", $errors));
         $order->getPayment()->setCcStatus('failed');
         $order->save();

Moyasar/Mysr/view/frontend/web/js/view/payment/method-renderer/moyasar_payments.js

@@ -15,10 +15,7 @@ define(
         'Magento_Checkout/js/model/quote',
         'Moyasar_Mysr/js/model/cancel-order',
         'Moyasar_Mysr/js/model/extract-api-errors',
-        'Moyasar_Mysr/js/model/currency-helper',
-        'Magento_Checkout/js/model/cart/totals-processor/default',
-        'Magento_Checkout/js/model/cart/cache',
-        'ko',
+        'Moyasar_Mysr/js/model/currency-helper'
     ],
     function (
         Component,
@@ -36,11 +33,7 @@ define(
         quoteModel,
         sendCancelOrder,
         extractApiErrors,
-        currencyHelper,
-        defaultTotal,
-        cartCache,
-        ko
-
+        currencyHelper
     ) {
         'use strict';
         return Component.extend({
@@ -82,7 +75,7 @@ define(
                 var config = window.checkoutConfig.moyasar_payments;
 
                 MoyasarForm.init({
-                    element: '.mysr-form',
+                    element: this.buildShadowRoot($('.mysr-form')[0]),
                     amount: currencyHelper.to_minor(this.getAmount(), this.getCurrency()),
                     currency: this.getCurrency(),
                     description: 'Order for: ' + this.getCustomerEmail(),
@@ -111,10 +104,9 @@ define(
                 return quoteModel.guestEmail ? quoteModel.guestEmail : window.checkoutConfig.customerData.email;
             },
             getAmount: function () {
-                var basetotal = (quote.totals()['base_grand_total']) * 100;
-                var total = (Math.round(basetotal).toFixed(2)) / 100 ;
-                return total;
-                // return Math.round(quote.totals()['base_grand_total']).toFixed(2);
+                var totals = quote.totals();
+                var baseTotal = currencyHelper.to_minor(totals['base_grand_total'], totals['base_currency_code']);
+                return (Math.round(baseTotal).toFixed(0)) / 100;
             },
             getCurrency: function () {
                 var totals = quote.getTotals()();