Merge pull request #63 from xendit/TPI-2768/ovo-phone

Tpi 2768/ovo phone

Author: IreneGohtami

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 2.4.1 (2020-11-06)
+
+Improvements:
+
+- Add OVO phone validation
+- Set default order status for Invoice methods
+
 ## 2.4.0 (2020-11-02)
 
 Features:

README.md

@@ -7,6 +7,7 @@ This module has been tested against the following tech stacks:
 
 | Magento Version | OS | Database | PHP | Web Server |
 | --- | --- | --- | --- | --- |
+| 2.4.0 | Ubuntu 18.04.2 LTS | MariaDB 10.1.39 | 7.4.1 | Apache 2.4.37 |
 | 2.3.2 | Ubuntu 18.04.2 LTS | MariaDB 10.1.39 | 7.2.12 | Apache 2.4.37 |
 | 2.2.5 | Debian GNU/Linux 9 | MariaDB 10.3 | 7.0.33 | Apache 2.2 |
 | 2.1.18 | Debian GNU/Linux 9 | MariaDB 10.3 | 7.0.33 | Apache 2.4 |

Xendit/M2Invoice/Controller/Checkout/Invoice.php

@@ -15,7 +15,10 @@ public function execute()
             $order = $this->getOrder();
             $apiData = $this->getApiRequestData($order);
 
-            if ($order->getState() === Order::STATE_PROCESSING) {
+            if ($order->getState() === Order::STATE_PROCESSING || 
+                $order->getState() === Order::STATE_PENDING_PAYMENT || 
+                $order->getState() === Order::STATE_PAYMENT_REVIEW
+            ) {
                 $this->changePendingPaymentStatus($order);
                 $invoice = $this->createInvoice($apiData);
                 $this->addInvoiceData($order, $invoice);

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.0'
+            'x-plugin-version' => '2.4.1'
         ];
 
         if ($preferredMethod !== null) {

Xendit/M2Invoice/Model/Payment/AbstractInvoice.php

@@ -79,6 +79,11 @@ public function __construct(
         }
     }
 
+    public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
+    {
+        $payment->setIsTransactionPending(true);
+    }
+
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         if ($quote === null) {

Xendit/M2Invoice/Model/Payment/OVO.php

@@ -42,18 +42,29 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
         }
 
         $orderId = $order->getRealOrderId();
+        $billing = $order->getBillingAddress();
+        $phone = trim(!empty($additionalData['phone_number']) ? $additionalData['phone_number'] : $billing->getTelephone());
+
         try {
+            // validate phone number
+            if (!$phone || strpos($phone, '08') !== 0) {
+                $message = $this->mapOvoErrorCode('INVALID_PHONE_NUMBER');
+                throw new \Magento\Framework\Exception\LocalizedException(
+                    new Phrase($message)
+                );
+            }
+
             $args = [
                 'external_id' => $this->dataHelper->getExternalId($orderId),
                 'amount' => $amount,
-                'phone' => $additionalData['phone_number'],
+                'phone' => $phone,
                 'ewallet_type' => self::DEFAULT_EWALLET_TYPE,
                 'platform_callback_url' => $this->getXenditCallbackUrl()
             ];
 
             $ewalletPayment = $this->requestEwalletPayment($args);
 
-            if ( isset($ewalletPayment['error_code']) ) {
+            if (isset($ewalletPayment['error_code'])) {
                 if ($ewalletPayment['error_code'] == 'DUPLICATE_PAYMENT_REQUEST_ERROR') {
                     $args = array_replace($args, array(
                         'external_id' => $this->dataHelper->getExternalId($orderId, true)
@@ -147,9 +158,9 @@ private function processFailedPayment($payment, $message)
         $payment->setAdditionalInformation('xendit_failure_reason', $message);
     }
 
-    private function mapOvoErrorCode($errorCode)
+    private function mapOvoErrorCode($errorCode, $message = '')
     {
-        switch ( $errorCode ) {
+        switch ($errorCode) {
             case 'USER_DID_NOT_AUTHORIZE_THE_PAYMENT':
                 return 'Please complete the payment request within 60 seconds.';
             case 'USER_DECLINED_THE_TRANSACTION':
@@ -168,6 +179,8 @@ private function mapOvoErrorCode($errorCode)
             case 'DEVELOPMENT_MODE_PAYMENT_ACKNOWLEDGED':
                 return 'Development mode detected. Please refer to our documentations for successful payment
                     simulation';
+            case 'INVALID_PHONE_NUMBER':
+                return 'Phone number is either missing or incorrect. Format should be 08XXXXXXXXX (not using "+62").';
             default:
                 return "Failed to pay with eWallet. Error code: $errorCode";
         }

Xendit/M2Invoice/composer.json

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

Xendit/M2Invoice/etc/config.xml

@@ -25,59 +25,65 @@
             </m2invoice>
             <alfamart>
                 <active>1</active>
-                <payment_action>initialize</payment_action><!-- You can use another method like capture  -->
+                <payment_action>authorize</payment_action><!-- You can use another method like capture  -->
                 <model>Xendit\M2Invoice\Model\Payment\Alfamart</model>
                 <title>Alfamart</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>1</sort_order>
             </alfamart>
             <bcava>
                 <active>1</active>
-                <payment_action>initialize</payment_action><!-- You can use another method like capture  -->
+                <payment_action>authorize</payment_action><!-- You can use another method like capture  -->
                 <model>Xendit\M2Invoice\Model\Payment\BCAVA</model>
                 <title>Bank Transfer - BCA</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>2</sort_order>
             </bcava>
             <bniva>
                 <active>1</active>
-                <payment_action>initialize</payment_action>
+                <payment_action>authorize</payment_action>
                 <model>Xendit\M2Invoice\Model\Payment\BNIVA</model>
                 <title>Bank Transfer - BNI</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>3</sort_order>
             </bniva>
             <briva>
                 <active>1</active>
-                <payment_action>initialize</payment_action><!-- You can use another method like capture  -->
+                <payment_action>authorize</payment_action><!-- You can use another method like capture  -->
                 <model>Xendit\M2Invoice\Model\Payment\BRIVA</model>
                 <title>Bank Transfer - BRI</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>4</sort_order>
             </briva>
             <mandiriva>
                 <active>1</active>
-                <payment_action>initialize</payment_action><!-- You can use another method like capture  -->
+                <payment_action>authorize</payment_action><!-- You can use another method like capture  -->
                 <model>Xendit\M2Invoice\Model\Payment\MandiriVA</model>
                 <title>Bank Transfer - Mandiri</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>5</sort_order>
             </mandiriva>
             <permatava>
                 <active>1</active>
-                <payment_action>initialize</payment_action><!-- You can use another method like capture  -->
+                <payment_action>authorize</payment_action><!-- You can use another method like capture  -->
                 <model>Xendit\M2Invoice\Model\Payment\PermataVA</model>
                 <title>Bank Transfer - Permata</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
@@ -121,19 +127,21 @@
             </cc_subscription>
             <dana>
                 <active>1</active>
-                <payment_action>initialize</payment_action>
+                <payment_action>authorize</payment_action>
                 <model>Xendit\M2Invoice\Model\Payment\DANA</model>
                 <title>DANA</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
                 <sort_order>11</sort_order>
             </dana>
             <indomaret>
                 <active>1</active>
-                <payment_action>initialize</payment_action>
+                <payment_action>authorize</payment_action>
                 <model>Xendit\M2Invoice\Model\Payment\Indomaret</model>
                 <title>Indomaret</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
@@ -144,6 +152,7 @@
                 <payment_action>authorize</payment_action>
                 <model>Xendit\M2Invoice\Model\Payment\OVO</model>
                 <title>OVO</title>
+                <order_status>pending_payment</order_status><!-- set default order -->
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>

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.0" active="true"></module>
+    <module name="Xendit_M2Invoice" setup_version="2.4.1" active="true"></module>
 </config>

Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/ovo.js

@@ -141,7 +141,6 @@ define(
             },
 
             block: function() {
-                var overlayBox
                 if ($("[class='xendit-overlay-box']").length === 0) {
                     var overlayDiv = $( "<div class='xendit-overlay-box'>" +
                         "<div id='xendit-overlay-content'>\n" +