Merge pull request #61 from xendit/TPI-2020/dana

Add DANA payment method
xendit · Nov 5, 2020 · f4b8367 · f4b8367
2 parents ce2f330 + 4397042
commit f4b8367
Show file tree

Hide file tree

Showing 33 changed files with 363 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 2.4.0 (2020-11-02)
+
+Features:
+
+- Add DANA payment method
+- Add Indomaret payment method
+
 ## 2.3.0 (2020-10-06)
 
 Features:

diff --git a/Xendit/M2Invoice/Controller/Checkout/Invoice.php b/Xendit/M2Invoice/Controller/Checkout/Invoice.php
@@ -68,7 +68,8 @@ private function getApiRequestData($order)
             'preferred_method' => $preferredMethod,
             'should_send_email' => $this->getDataHelper()->getSendInvoiceEmail() ? "true" : "false",
             'platform_callback_url' => $this->getXenditCallbackUrl(),
-            'client_type' => 'INTEGRATION'
+            'client_type' => 'INTEGRATION',
+            'payment_methods' => json_encode([strtoupper($preferredMethod)])
         ];
 
         return $requestData;

diff --git a/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php b/Xendit/M2Invoice/Controller/Checkout/InvoiceMultishipping.php
@@ -56,7 +56,8 @@ public function execute()
                 'preferred_method' => $preferredMethod,
                 'should_send_email' => $this->getDataHelper()->getSendInvoiceEmail() ? "true" : "false",
                 'platform_callback_url' => $this->getXenditCallbackUrl(),
-                'client_type' => 'INTEGRATION'
+                'client_type' => 'INTEGRATION',
+                'payment_methods' => json_encode([strtoupper($preferredMethod)])
             ];
 
             $invoice = $this->createInvoice($requestData);

diff --git a/Xendit/M2Invoice/Controller/Checkout/Notification.m22.php b/Xendit/M2Invoice/Controller/Checkout/Notification.m22.php
@@ -112,7 +112,7 @@ public function handleInvoiceCallback($callbackPayload) {
 
         $invoice = $this->getXenditInvoice($transactionId);
 
-        if( $isMultishipping ) {
+        if ($isMultishipping) {
             foreach ($orderIds as $key => $value) {
                 $order = $this->orderFactory->create();
                 $order->load($value);
@@ -237,13 +237,12 @@ private function checkOrder($order, $isEwallet, $callbackPayload, $invoice, $cal
                 $this->getCheckoutHelper()->restoreQuote(); //restore cart
             }
 
-            if ($isEwallet) {
-                $order  ->setState($orderState)
-                        ->setStatus($orderState);
-                $order  ->save();
+            $order  ->addStatusHistoryComment("Xendit payment " . strtolower($paymentStatus) . ". Transaction ID: $transactionId")
+                    ->save();
 
+            if ($isEwallet) {
                 $payment = $order->getPayment();
-                $payment->setAdditionalInformation('xendit_ewallet_failure_code', $failureCode);
+                $payment->setAdditionalInformation('xendit_ewallet_failure_code', $callbackPayload['failure_code']);
                 $payment->save();
             }
 
@@ -286,10 +285,6 @@ private function getEwalletStatus($ewalletType, $externalId)
             );
         }
 
-        if ($ewalletType == 'DANA') {
-            $response['status'] = $response['payment_status'];
-        }
-
         $statusList = array("COMPLETED", "PAID", "SUCCESS_COMPLETED"); //OVO, DANA, LINKAJA
         if (in_array($response['status'], $statusList)) {
             return "COMPLETED";

diff --git a/Xendit/M2Invoice/Controller/Checkout/Notification.m23.php b/Xendit/M2Invoice/Controller/Checkout/Notification.m23.php
@@ -123,7 +123,7 @@ public function handleInvoiceCallback($callbackPayload) {
 
         $invoice = $this->getXenditInvoice($transactionId);
 
-        if( $isMultishipping ) {
+        if ($isMultishipping) {
             foreach ($orderIds as $key => $value) {
                 $order = $this->orderFactory->create();
                 $order->load($value);
@@ -248,13 +248,12 @@ private function checkOrder($order, $isEwallet, $callbackPayload, $invoice, $cal
                 $this->getCheckoutHelper()->restoreQuote(); //restore cart
             }
 
+            $order  ->addStatusHistoryComment("Xendit payment " . strtolower($paymentStatus) . ". Transaction ID: $transactionId")
+                    ->save();
+
             if ($isEwallet) {
-                $order  ->setState($orderState)
-                        ->setStatus($orderState);
-                $order  ->save();
-
                 $payment = $order->getPayment();
-                $payment->setAdditionalInformation('xendit_ewallet_failure_code', $failureCode);
+                $payment->setAdditionalInformation('xendit_ewallet_failure_code', $callbackPayload['failure_code']);
                 $payment->save();
             }
 
@@ -297,10 +296,6 @@ private function getEwalletStatus($ewalletType, $externalId)
             );
         }
 
-        if ($ewalletType == 'DANA') {
-            $response['status'] = $response['payment_status'];
-        }
-
         $statusList = array("COMPLETED", "PAID", "SUCCESS_COMPLETED"); //OVO, DANA, LINKAJA
         if (in_array($response['status'], $statusList)) {
             return "COMPLETED";

diff --git a/Xendit/M2Invoice/Controller/Checkout/Redirect.php b/Xendit/M2Invoice/Controller/Checkout/Redirect.php
@@ -136,10 +136,6 @@ private function getEwalletStatus($ewalletType, $externalId)
             );
         }
 
-        if ($ewalletType == 'DANA') {
-            $response['status'] = $response['payment_status'];
-        }
-
         $statusList = array("COMPLETED", "PAID", "SUCCESS_COMPLETED"); //OVO, DANA, LINKAJA
         if (in_array($response['status'], $statusList)) {
             return "COMPLETED";

diff --git a/Xendit/M2Invoice/Helper/ApiRequest.php b/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.3.0'
+            'x-plugin-version' => '2.4.0'
         ];
 
         if ($preferredMethod !== null) {

diff --git a/Xendit/M2Invoice/Helper/Data.php b/Xendit/M2Invoice/Helper/Data.php
@@ -283,7 +283,9 @@ public function xenditPaymentMethod( $payment ){
             "mandiriva" => "mandiri",
             "permatava" => "permata",
             "alfamart" => "alfamart",
-            "ovo" => "ovo"
+            "ovo" => "ovo",
+            "dana" => "dana",
+            "indomaret" => "indomaret"
         ];
 
         $response = FALSE;

diff --git a/Xendit/M2Invoice/Model/Adminhtml/Source/ChosenMethod.php b/Xendit/M2Invoice/Model/Adminhtml/Source/ChosenMethod.php
@@ -28,6 +28,8 @@ public function toOptionArray($isMultiselect = false)
             ['value' => 'cc', 'label' => __('Credit Card')],
             ['value' => 'cc_installment', 'label' => __('Credit Card Installment')],
             ['value' => 'cc_subscription', 'label' => __('Credit Card Subscription')],
+            ['value' => 'dana', 'label' => __('DANA')],
+            ['value' => 'indomaret', 'label' => __('Indomaret')],
             ['value' => 'ovo', 'label' => __('OVO')],
         ];
 

diff --git a/Xendit/M2Invoice/Model/Payment/AbstractInvoice.php b/Xendit/M2Invoice/Model/Payment/AbstractInvoice.php
@@ -123,11 +123,11 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
                 return true;
             }
             //uncomment this block for local testing
-            /*if($this->methodCode == 'OVO'){
+            /*if($this->methodCode == 'OVO' || $this->methodCode == 'DANA'){
                 return true;
             }*/
 
-            if ( !in_array( strtoupper($this->methodCode), $availableMethod ) ) {
+            if (!in_array(strtoupper($this->methodCode), $availableMethod)) {
                 return false;
             }
 
@@ -156,7 +156,7 @@ private function getAvailableMethods()
             throw $e;
         }
 
-        if ( !isset($response['available_method']) ) {
+        if (!isset($response['available_method'])) {
             return [];
         }
 

diff --git a/Xendit/M2Invoice/Model/Payment/DANA.php b/Xendit/M2Invoice/Model/Payment/DANA.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Xendit\M2Invoice\Model\Payment;
+
+class DANA extends AbstractInvoice
+{
+    /**
+     * Payment code
+     *
+     * @var string
+     */
+    protected $_code = 'dana';
+    protected $_minAmount = 10000;
+    protected $_maxAmount = 10000000;
+    protected $methodCode = 'DANA';
+}
diff --git a/Xendit/M2Invoice/Model/Payment/Indomaret.php b/Xendit/M2Invoice/Model/Payment/Indomaret.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Xendit\M2Invoice\Model\Payment;
+
+class Indomaret extends AbstractInvoice
+{
+    /**
+     * Payment code
+     *
+     * @var string
+     */
+    protected $_code = 'indomaret';
+    protected $_minAmount = 10000;
+    protected $_maxAmount = 2500000;
+    protected $methodCode = 'Indomaret';
+}
diff --git a/Xendit/M2Invoice/composer.json b/Xendit/M2Invoice/composer.json
@@ -2,7 +2,7 @@
   "name": "xendit/m2invoice",
   "description": "Xendit Payment Gateway Module",
   "type": "magento2-module",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "license": [
     "GPL-3.0"
   ],

diff --git a/Xendit/M2Invoice/etc/adminhtml/system.xml b/Xendit/M2Invoice/etc/adminhtml/system.xml
@@ -64,7 +64,7 @@
                             function shouldDisplayAdditionalKYCWarningMethod() {
                                 var currentValue = specificSelection.val();
 
-                                if (currentValue.includes('ovo') || currentValue.includes('alfamart') || currentValue.includes('bcava')) {
+                                if (currentValue.includes('ovo') || currentValue.includes('alfamart') || currentValue.includes('bcava') || currentValue.includes('dana')) {
                                     displayAdditionalKYCWarning(true);
                                 } else {
                                     displayAdditionalKYCWarning(false);

diff --git a/Xendit/M2Invoice/etc/config.xml b/Xendit/M2Invoice/etc/config.xml
@@ -119,6 +119,26 @@
                 <cctypes>VI,MC,AE,JCB</cctypes>
                 <sort_order>10</sort_order>
             </cc_subscription>
+            <dana>
+                <active>1</active>
+                <payment_action>initialize</payment_action>
+                <model>Xendit\M2Invoice\Model\Payment\DANA</model>
+                <title>DANA</title>
+                <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>
+                <model>Xendit\M2Invoice\Model\Payment\Indomaret</model>
+                <title>Indomaret</title>
+                <is_gateway>1</is_gateway>
+                <can_initialize>1</can_initialize>
+                <can_use_checkout>1</can_use_checkout>
+                <sort_order>12</sort_order>
+            </indomaret>
             <ovo>
                 <active>1</active>
                 <payment_action>authorize</payment_action>
@@ -127,7 +147,7 @@
                 <is_gateway>1</is_gateway>
                 <can_initialize>1</can_initialize>
                 <can_use_checkout>1</can_use_checkout>
-                <sort_order>11</sort_order>
+                <sort_order>13</sort_order>
             </ovo>
         </payment>
     </default>

diff --git a/Xendit/M2Invoice/etc/module.xml b/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.3.0" active="true"></module>
+    <module name="Xendit_M2Invoice" setup_version="2.4.0" active="true"></module>
 </config>
diff --git a/Xendit/M2Invoice/etc/payment.xml b/Xendit/M2Invoice/etc/payment.xml
@@ -39,6 +39,12 @@ https://github.com/magento/magento2/blob/2.2.0-rc2.1/app/code/Magento/Multishipp
         <method name='cc_subscription'>
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name='dana'>
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
+        <method name='indomaret'>
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
         <method name='ovo'>
             <allow_multiple_address>1</allow_multiple_address>
         </method>

diff --git a/Xendit/M2Invoice/view/frontend/layout/multishipping_checkout_billing.xml b/Xendit/M2Invoice/view/frontend/layout/multishipping_checkout_billing.xml
@@ -22,6 +22,8 @@
                     <item name="mandiriva" xsi:type="string">Xendit_M2Invoice::multishipping/mandiriva.phtml</item>
                     <item name="permatava" xsi:type="string">Xendit_M2Invoice::multishipping/permatava.phtml</item>
                     <item name="ovo" xsi:type="string">Xendit_M2Invoice::multishipping/ovo.phtml</item>
+                    <item name="dana" xsi:type="string">Xendit_M2Invoice::multishipping/dana.phtml</item>
+                    <item name="indomaret" xsi:type="string">Xendit_M2Invoice::multishipping/indomaret.phtml</item>
                 </argument>
             </arguments>
         </referenceBlock>

diff --git a/Xendit/M2Invoice/view/frontend/templates/multishipping/dana.phtml b/Xendit/M2Invoice/view/frontend/templates/multishipping/dana.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'dana'
+            };
+            layout([
+                {
+                    component: 'Xendit_M2Invoice/js/view/payment/method-renderer/multishipping/dana',
+                    name: 'payment_method_dana',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/Xendit/M2Invoice/view/frontend/templates/multishipping/indomaret.phtml b/Xendit/M2Invoice/view/frontend/templates/multishipping/indomaret.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<script>
+    require([
+        'uiLayout',
+        'jquery'
+    ], function (layout, $) {
+        $(function () {
+            var paymentMethodData = {
+                method: 'indomaret'
+            };
+            layout([
+                {
+                    component: 'Xendit_M2Invoice/js/view/payment/method-renderer/multishipping/indomaret',
+                    name: 'payment_method_indomaret',
+                    method: paymentMethodData.method,
+                    item: paymentMethodData
+                }
+            ]);
+
+            $('body').trigger('contentUpdated');
+        })
+    })
+</script>
+<!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer.js b/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer.js
@@ -38,6 +38,14 @@ define(
                 type: 'ovo',
                 component: 'Xendit_M2Invoice/js/view/payment/method-renderer/ovo'
             },
+            {
+                type: 'dana',
+                component: 'Xendit_M2Invoice/js/view/payment/method-renderer/dana'
+            },
+            {
+                type: 'indomaret',
+                component: 'Xendit_M2Invoice/js/view/payment/method-renderer/indomaret'
+            },
             {
                 type: 'cc',
                 component: 'Xendit_M2Invoice/js/view/payment/method-renderer/cc'

diff --git a/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/alfamart.js b/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/alfamart.js
@@ -69,7 +69,7 @@ define(
                 }
 
                 if (totals.grand_total < 10000) {
-                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 11.000.'});
+                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 10,000.'});
                     return false;
                 }
 

diff --git a/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/bcava.js b/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/bcava.js
@@ -69,7 +69,7 @@ define(
                 }
 
                 if (totals.grand_total < 10000) {
-                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 11.000.'});
+                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 10,000.'});
                     return false;
                 }
 

diff --git a/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/bniva.js b/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/bniva.js
@@ -69,7 +69,7 @@ define(
                 }
 
                 if (totals.grand_total < 10000) {
-                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 11.000.'});
+                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 10,000.'});
                     return false;
                 }
 

diff --git a/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/briva.js b/Xendit/M2Invoice/view/frontend/web/js/view/payment/method-renderer/briva.js
@@ -69,7 +69,7 @@ define(
                 }
 
                 if (totals.grand_total < 10000) {
-                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 11.000.'});
+                    self.messageContainer.addErrorMessage({'message': 'Xendit doesn\'t support purchases less than Rp 10,000.'});
                     return false;
                 }