From 2033842d6cc6bdda6641a85cb5b26d1e65d61062 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 10 May 2023 10:43:48 +0800
Subject: [PATCH 1/3] only admin and upload honey trap csv

---
 resources/views/pages/honey_trap.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/honey_trap.blade.php b/resources/views/pages/honey_trap.blade.php
index 69c28f15..f0de7afe 100644
--- a/resources/views/pages/honey_trap.blade.php
+++ b/resources/views/pages/honey_trap.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row">
+    <div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
         <div class="col">
             <div class="row m-b-20">
                 <div class="col">

From 455d1d83faeb608ee3016b3a75de247664727da5 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 10 May 2023 13:38:11 +0800
Subject: [PATCH 2/3] fix sending billplz email to customer on development
 environment

---
 app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
index 1bed083c..a2947e82 100644
--- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
 
 class CreatesBillplzBill
@@ -26,7 +27,7 @@ class CreatesBillplzBill
             $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
                 'collection_id' => $wallet ? config('billplz.wallet_collection_id') : config('billplz.collection_id'),
                 'name' => $name,
-                'email' => $email,
+                'email' => App::environment('production') ? $email : 'development@cief-malaysia.com',
                 'description' => $description,
                 'amount' => $this->finalizeAmount($amount),
                 'redirect_url' => route('online_payment.redirect'),

From bc7c0026bd062a11aa15c07b653c7f116e8f623e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 10 May 2023 13:38:39 +0800
Subject: [PATCH 3/3] fix wallet bug

---
 .../Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index a6c0b7fd..a9beb2d0 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -91,7 +91,7 @@ class CallbackBillplzLogic
             $status = $billplzXSignatureObject->getStatus() === 'failed' ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
         }
 
-        if($transaction->status !== ApprovalStatus::COMPLETED){
+        if($transaction->status !== ApprovalStatus::COMPLETED && $transaction->status !== ApprovalStatus::APPROVED){
 
             if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED && $status === ApprovalStatus::APPROVED) {
                 $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);