From b6204a5f9466e5673328cb30b89c3cdf5fe1a8d3 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Fri, 16 Sep 2022 11:19:53 +0700
Subject: [PATCH] fix recharge

---
 system/autoload/Package.php      | 8 ++++++++
 system/paymentgateway/duitku.php | 2 +-
 system/paymentgateway/tripay.php | 2 +-
 system/paymentgateway/xendit.php | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index 241261dd..6b1f4473 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -9,6 +9,14 @@ use PEAR2\Net\RouterOS;
 
 class Package
 {
+    /**
+     * @param int   $id_customer String user identifier
+     * @param string $router_name router name for this package
+     * @param int   $plan_id plan id for this package
+     * @param string $gateway payment gateway name
+     * @param string $channel channel payment gateway
+     * @return boolean
+     */
     public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel)
     {
         global $_c, $_L;
diff --git a/system/paymentgateway/duitku.php b/system/paymentgateway/duitku.php
index 421661fd..dfeb1055 100644
--- a/system/paymentgateway/duitku.php
+++ b/system/paymentgateway/duitku.php
@@ -139,7 +139,7 @@ function duitku_get_status($trx, $user)
     if ($result['statusCode'] == '01') {
         r2(U . "order/view/" . $trx['id'], 'w', Lang::T("Transaction still unpaid."));
     } else if ($result['statusCode'] == '00' && $trx['status'] != 2) {
-        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'],  $result['payment_method'] . ' ' . $result['payment_channel'])) {
+        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'],  $trx['payment_channel'])) {
             r2(U . "order/view/" . $trx['id'], 'd', Lang::T("Failed to activate your Package, try again later."));
         }
 
diff --git a/system/paymentgateway/tripay.php b/system/paymentgateway/tripay.php
index ad669d09..20d3d394 100644
--- a/system/paymentgateway/tripay.php
+++ b/system/paymentgateway/tripay.php
@@ -139,7 +139,7 @@ function tripay_get_status($trx, $user)
     if ($result['status'] == 'UNPAID') {
         r2(U . "order/view/" . $trx['id'], 'w', Lang::T("Transaction still unpaid."));
     } else if (in_array($result['status'], ['PAID', 'SETTLED']) && $trx['status'] != 2) {
-        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'],  $result['payment_method'] . ' ' . $result['payment_channel'])) {
+        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'],  $result['payment_name'])) {
             r2(U . "order/view/" . $trx['id'], 'd', Lang::T("Failed to activate your Package, try again later."));
         }
 
diff --git a/system/paymentgateway/xendit.php b/system/paymentgateway/xendit.php
index 5234ac22..9def308d 100644
--- a/system/paymentgateway/xendit.php
+++ b/system/paymentgateway/xendit.php
@@ -107,7 +107,7 @@ function xendit_get_status($trx, $user)
     if ($result['status'] == 'PENDING') {
         r2(U . "order/view/" . $trx['id'], 'w', Lang::T("Transaction still unpaid."));
     } else if (in_array($result['status'], ['PAID', 'SETTLED']) && $trx['status'] != 2) {
-        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'],  $result['payment_method'] . ' ' . $result['payment_channel'])) {
+        if (!Package::rechargeUser($user['id'], $trx['routers'], $trx['plan_id'], $trx['gateway'], $result['payment_channel'])) {
             r2(U . "order/view/" . $trx['id'], 'd', Lang::T("Failed to activate your Package, try again later."));
         }
         $trx->pg_paid_response = json_encode($result);