Merge pull request #66 from xendit/TPI-2941/fix-failure-endpoint

fix failure endpoint

Author: hakiemaul

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.4.2 (2020-11-23)
+
+Improvements:
+
+- Check order status before cancelling through failure endpoint
+
 ## 2.4.1 (2020-11-06)
 
 Improvements:

Xendit/M2Invoice/Controller/Checkout/Failure.php

@@ -13,31 +13,29 @@ public function execute()
                 $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
-                }
+                $this->shouldCancelOrder($order);
             }
         } else { //onepage
             $order = $this->getOrderById($this->getRequest()->get('order_id'));
-    
-            if ($order) {
+
+            $this->shouldCancelOrder($order);
+        }
+
+        $this->getMessageManager()->addWarningMessage(__("Xendit payment failed. Please click on 'Update Shopping Cart'."));
+        $this->_redirect('checkout/cart');
+    }
+
+    private function shouldCancelOrder($order) {
+        if ($order) {
+            if ($order->canInvoice()) {
                 $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
             }
         }
-
-        $this->getMessageManager()->addWarningMessage(__("Xendit payment failed. Please click on 'Update Shopping Cart'."));
-        $this->_redirect('checkout/cart');
     }
 }

Xendit/M2Invoice/Helper/ApiRequest.php

@@ -85,7 +85,7 @@ private function getHeaders($isPublicRequest, $preferredMethod = null, $customHe
             'Content-Type' => 'application/json',
             'x-plugin-name' => 'MAGENTO2',
             'user-agent' => 'Magento 2 Module',
-            'x-plugin-version' => '2.4.1'
+            'x-plugin-version' => '2.4.2'
         ];
 
         if ($preferredMethod !== null) {

Xendit/M2Invoice/composer.json

@@ -2,7 +2,7 @@
   "name": "xendit/m2invoice",
   "description": "Xendit Payment Gateway Module",
   "type": "magento2-module",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": [
     "GPL-3.0"
   ],

Xendit/M2Invoice/etc/module.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Xendit_M2Invoice" setup_version="2.4.1" active="true"></module>
+    <module name="Xendit_M2Invoice" setup_version="2.4.2" active="true"></module>
 </config>