Merge pull request #132 from xendit/TPI-7724/magento-checkout-failure-error

andykim · web-flow · commit 8d9232d36e0c · 2022-07-18T17:29:31.000+07:00
Fix Xendit checkout failed error for multishipping
diff --git a/Xendit/M2Invoice/Controller/Checkout/AbstractAction.php b/Xendit/M2Invoice/Controller/Checkout/AbstractAction.php
@@ -532,4 +532,14 @@ protected function getPreferredMethod()
         }
         return $preferredMethod;
     }
+
+    /**
+     * @param string $orderByIncrementId
+     * @return Order
+     */
+    public function getOrderByIncrementId(string $orderByIncrementId): Order
+    {
+        $order = $this->orderFactory->create();
+        return $order->loadByIncrementId($orderByIncrementId);
+    }
 }
diff --git a/Xendit/M2Invoice/Controller/Checkout/Failure.php b/Xendit/M2Invoice/Controller/Checkout/Failure.php
@@ -2,53 +2,47 @@
 
 namespace Xendit\M2Invoice\Controller\Checkout;
 
+use Magento\Sales\Model\Order;
+
 /**
  * Class Failure
  * @package Xendit\M2Invoice\Controller\Checkout
  */
 class Failure extends AbstractAction
 {
-
     /**
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute()
     {
-        $orderIds = explode('-', $this->getRequest()->get('order_id'));
-        $type = $this->getRequest()->get('type');
+        $orderCanceled = false;
+        $orderIds = $this->getRequest()->get('order_ids') ?? [];
+        if (!is_array($orderIds)) {
+            $this->getMessageManager()->addErrorMessage(__('Invalid parameters'));
+            return $this->_redirect('checkout/cart');
+        }
 
-        if ($type == 'multishipping') {
+        $restoreQuote = null;
+        try {
             foreach ($orderIds as $orderId) {
-                $order = $this->getOrderFactory()->create();
-                $order ->load($orderId);
-    
-                if ($order) {
-                    $this->getLogger()->debug('Requested order cancelled by customer. OrderId: ' . $order->getIncrementId());
-                    $this->cancelOrder($order, "customer cancelled the payment.");
-    
-                    $quoteId    = $order->getQuoteId();
-                    $quote      = $this->getQuoteRepository()->get($quoteId);
-    
-                    $this->getCheckoutHelper()->restoreQuote($quote); //restore cart
+                $order = $this->getOrderByIncrementId($orderId);
+                if ($order->getState() == Order::STATE_CANCELED) {
+                    $orderCanceled = true;
+                    $restoreQuote = $this->getQuoteRepository()->get($order->getQuoteId());
                 }
             }
-        } else { //onepage
-            $order = $this->getOrderById($this->getRequest()->get('order_id'));
-    
-            if ($order) {
-                $this->getLogger()->debug('Requested order cancelled by customer. OrderId: ' . $order->getIncrementId());
-                $this->cancelOrder($order, "customer cancelled the payment.");
-
-                $quoteId    = $order->getQuoteId();
-                $quote      = $this->getQuoteRepository()->get($quoteId);
-
-                $this->getCheckoutHelper()->restoreQuote($quote); //restore cart
-            }
+        } catch (\Exception $e) {
+            $this->getMessageManager()->addErrorMessage($e->getMessage());
+            return $this->_redirect('checkout/cart');
         }
 
-        $this->getMessageManager()->addWarningMessage(__("Xendit payment failed. Please click on 'Update Shopping Cart'."));
-        $this->_redirect('checkout/cart');
+        // Add error message if order canceled
+        if ($orderCanceled && !empty($restoreQuote)) {
+            $this->getCheckoutHelper()->restoreQuote($restoreQuote);
+            $this->getMessageManager()->addWarningMessage(__("Xendit payment failed. Please click on 'Update Shopping Cart'."));
+        }
+        return $this->_redirect('checkout/cart');
     }
 }
diff --git a/Xendit/M2Invoice/Controller/Checkout/Invoice.php b/Xendit/M2Invoice/Controller/Checkout/Invoice.php
@@ -111,7 +111,7 @@ private function getApiRequestData($order)
             'payment_methods' => json_encode([strtoupper($preferredMethod)]),
             'platform_callback_url' => $this->getXenditCallbackUrl(),
             'success_redirect_url' => $this->getDataHelper()->getSuccessUrl(),
-            'failure_redirect_url' => $this->getDataHelper()->getFailureUrl($orderId),
+            'failure_redirect_url' => $this->getDataHelper()->getFailureUrl([$orderId]),
             'customer' => (object)[
                 'given_names' => $order->getCustomerFirstname() ?: 'n/a',
                 'surname' => $order->getCustomerLastname() ?: 'n/a',
diff --git a/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php b/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php
@@ -109,7 +109,7 @@ public function execute()
                 'payment_methods' => json_encode([strtoupper($preferredMethod)]),
                 'platform_callback_url' => $this->getXenditCallbackUrl(),
                 'success_redirect_url' => $this->getDataHelper()->getSuccessUrl(true),
-                'failure_redirect_url' => $this->getDataHelper()->getFailureUrl(implode('-', $orderIncrementIds), true),
+                'failure_redirect_url' => $this->getDataHelper()->getFailureUrl($orderIncrementIds),
                 'customer' => (object)[
                     'given_names' => $order->getCustomerFirstname() ?: 'n/a',
                     'surname' => $order->getCustomerLastname() ?: 'n/a',
diff --git a/Xendit/M2Invoice/Controller/Checkout/Notification.php b/Xendit/M2Invoice/Controller/Checkout/Notification.php
@@ -311,15 +311,15 @@ private function checkOrder($order, $callbackPayload, $invoice, $callbackDescrip
         } else { //FAILED or EXPIRED
             $orderState = Order::STATE_CANCELED;
             if ($order->getStatus() != $orderState) {
-                $this->getCheckoutHelper()->cancelCurrentOrder(
-                    "Order #" . ($order->getId()) . " was rejected by Xendit. Transaction #$transactionId."
-                );
+                $this->getCheckoutHelper()
+                    ->cancelOrder($order, __("Order #%1 was rejected by Xendit. Transaction #%2.", $order->getId(), $transactionId));
                 $this->getCheckoutHelper()->restoreQuote(); //restore cart
             }
+
             $order->addStatusHistoryComment(
                 "Xendit payment " . strtolower($paymentStatus) . ". Transaction ID: $transactionId"
-            )->save();
-
+            );
+            $this->orderRepository->save($order);
             return $this->responseError(__('Transaction not paid'), __('FAILED'));
         }
     }
@@ -391,20 +391,4 @@ protected function getCheckoutHelper()
     {
         return $this->checkoutHelper;
     }
-
-    /**
-     * @param $orderId
-     * @return Order|null
-     */
-    protected function getOrderById($orderId)
-    {
-        $order = $this->orderFactory->create()->load($orderId);
-        if (!$order->getId() || $orderId !== $order->getId()) {
-            $order = $this->orderFactory->create()->loadByIncrementId($orderId);
-            if (!$order->getId()) {
-                return null;
-            }
-        }
-        return $order;
-    }
 }
diff --git a/Xendit/M2Invoice/Helper/Checkout.php b/Xendit/M2Invoice/Helper/Checkout.php
@@ -4,6 +4,7 @@
 
 use Magento\Checkout\Model\Session;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\OrderFactory;
 
@@ -28,20 +29,28 @@ class Checkout
      */
     private $quoteRepository;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
     /**
      * Checkout constructor.
      * @param Session $session
      * @param OrderFactory $order
      * @param CartRepositoryInterface $quoteRepository
+     * @param OrderRepositoryInterface $orderRepository
      */
     public function __construct(
         Session $session,
         OrderFactory $order,
-        CartRepositoryInterface $quoteRepository
+        CartRepositoryInterface $quoteRepository,
+        OrderRepositoryInterface $orderRepository
     ) {
         $this->session = $session;
         $this->orderFactory = $order;
         $this->quoteRepository = $quoteRepository;
+        $this->orderRepository = $orderRepository;
     }
 
     /**
@@ -56,8 +65,8 @@ public function cancelCurrentOrder($comment)
         $order = $this->session->getLastRealOrder();
 
         if ($order->getId() && $order->getState() != Order::STATE_CANCELED) {
-            $order->registerCancellation($comment)->save();
-            return true;
+            $order->registerCancellation($comment);
+            return $this->orderRepository->save($order);
         }
         return false;
     }
@@ -88,8 +97,23 @@ public function cancelOrderById($orderId, $comment)
         $order = $this->orderFactory->create()->loadByIncrementId($orderId);
 
         if ($order->getId() && $order->getState() != Order::STATE_CANCELED) {
-            $order->registerCancellation($comment)->save();
-            return true;
+            $order->registerCancellation($comment);
+            return $this->orderRepository->save($order);
+        }
+        return false;
+    }
+
+    /**
+     * @param Order $order
+     * @param string $comment
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function cancelOrder(Order $order, string $comment = "")
+    {
+        if ($order->getState() != Order::STATE_CANCELED) {
+            $order->registerCancellation($comment);
+            return $this->orderRepository->save($order);
         }
         return false;
     }
@@ -104,15 +128,13 @@ public function cancelOrderById($orderId, $comment)
     public function processOrdersFailedPayment($orderIds, $failureReason = 'Unexpected Error with empty charge')
     {
         foreach ($orderIds as $key => $value) {
-            $order = $this->orderFactory->create();
-            $order  ->load($value);
-
+            $order = $this->orderRepository->get($value);
             $orderState = Order::STATE_CANCELED;
-            $order  ->setState($orderState)
+            $order->setState($orderState)
                     ->setStatus($orderState)
                     ->addStatusHistoryComment("Order #" . $value . " was rejected by Xendit because " . $failureReason);
-            $order  ->save();
 
+            $order = $this->orderRepository->save($order);
             $quoteId = $order->getQuoteId();
             $quote = $this->quoteRepository->get($quoteId);
             $this->restoreQuote($quote);
diff --git a/Xendit/M2Invoice/Helper/Data.php b/Xendit/M2Invoice/Helper/Data.php
@@ -11,7 +11,6 @@
 use Magento\Framework\DB\Transaction as DbTransaction;
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Stdlib\DateTime\DateTimeFactory;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteManagement;
@@ -189,33 +188,15 @@ public function getSuccessUrl($isMultishipping = false)
     }
 
     /**
-     * @param $orderId
-     * @param bool $isMultishipping
-     * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function getFailureUrl($orderId, $isMultishipping = false)
-    {
-        $baseUrl = $this->getStoreManager()->getStore()->getBaseUrl() . "xendit/checkout/failure?order_id=$orderId";
-        if ($isMultishipping) {
-            $baseUrl .= '&type=multishipping';
-        }
-        return $baseUrl;
-    }
-
-    /**
-     * @param $orderId
-     * @param bool $isMultishipping
+     * @param array $orderIds
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getThreeDSResultUrl($orderId, $isMultishipping = false)
+    public function getFailureUrl(array $orderIds)
     {
-        $baseUrl = $this->getStoreManager()->getStore()->getBaseUrl() . "xendit/checkout/threedsresult?order_id=$orderId";
-        if ($isMultishipping) {
-            $baseUrl .= "&type=multishipping";
-        }
-        return $baseUrl;
+        $parameters = http_build_query([
+            'order_ids' => $orderIds
+        ]);
+        return $this->_getUrl('xendit/checkout/failure', ['_query' => $parameters]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -532,4 +532,14 @@ protected function getPreferredMethod()`
`532`	`532`	`}`
`533`	`533`	`return $preferredMethod;`
`534`	`534`	`}`
	`535`	`+`
	`536`	`+ /**`
	`537`	`+ * @param string $orderByIncrementId`
	`538`	`+ * @return Order`
	`539`	`+ */`
	`540`	`+ public function getOrderByIncrementId(string $orderByIncrementId): Order`
	`541`	`+ {`
	`542`	`+ $order = $this->orderFactory->create();`
	`543`	`+ return $order->loadByIncrementId($orderByIncrementId);`
	`544`	`+ }`
`535`	`545`	`}`