From 4dbe7f22ce9a596654fdb74ea553ffa69ab6bc50 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Sun, 26 Jan 2025 18:38:36 +0800
Subject: [PATCH] Merge payments of KOPKB and PKB of online transaction trail

---
 .../OnlineTransactionTrailController.php      | 29 +++++++++++--------
 app/Providers/AppServiceProvider.php          |  6 ++--
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/OnlineTransactionTrailController.php b/app/Http/Controllers/OnlineTransactionTrailController.php
index 1061eba..b1288f3 100644
--- a/app/Http/Controllers/OnlineTransactionTrailController.php
+++ b/app/Http/Controllers/OnlineTransactionTrailController.php
@@ -37,20 +37,25 @@ class OnlineTransactionTrailController extends Controller
             'UNSUCCESSFUL',
         ]; 
         
-        $transactionTrail = Http::arrahn()
-            ->get('/api/transaction/online/trail', [
-                'startDate' => $startDate,
-                'endDate' => $endDate,
-                'status' => $selectedStatus,
-                'branch' => $selectedBranch,
-                'billplzBillId' => $billplzBillId,
-                'norujukan' => $norujukan,
-                'isGroupedByNorujukan' => $isGroupedByNorujukan,
-            ])
-            ->json();
+        $queries = [
+            'startDate' => $startDate,
+            'endDate' => $endDate,
+            'status' => $selectedStatus,
+            'branch' => $selectedBranch,
+            'billplzBillId' => $billplzBillId,
+            'norujukan' => $norujukan,
+            'isGroupedByNorujukan' => $isGroupedByNorujukan,
+        ];
+        
+        $transactionTrailPKB = Http::arrahn()->get('/api/transaction/online/trail', $queries)->json();
             
+        $transactionTrailKOOP = Http::arrahn_koop()->get('/api/transaction/online/trail', $queries)->json();
+        
+        $transactionTrail = array_merge($transactionTrailPKB, $transactionTrailKOOP);
             
-        $branches = Http::arrahn()->get('/api/cawangan')->json();
+        $branchesKOOP = Http::arrahn_koop()->get('/api/cawangan')->json();
+        $branchesPKB = Http::arrahn()->get('/api/cawangan')->json();
+        $branches = array_merge($branchesKOOP, $branchesPKB);
         
         
         return view('online.trail.index', compact('transactionTrail', 'startDate', 'endDate', 'norujukan', 'selectedStatus', 'statuses', 'billplzBillId', 'branches', 'selectedBranch'));
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 78b6945..9497cc0 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -35,10 +35,8 @@ class AppServiceProvider extends ServiceProvider
             return $this;
         });
 
-	PendingRequest::macro('arrahn', function () {
-            $this->options['verify'] = config('app.api_verify');
-            $this->baseUrl(config('api.url'));
-            return $this;
+        Http::macro('arrahn_koop', function () {
+            return Http::withOptions(['verify' => config('app.api_verify')])->baseUrl(config('api.url_koop'));
         });
 
         PendingRequest::macro('arrahn_koop', function () {