From 597da27c6f2687a3a4658bfb17351ac19d2b28bc Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Sun, 26 Jan 2025 14:25:54 +0800 Subject: [PATCH] Fix billplz transaction summary v3 page not working with split payments bills --- .../BillplzTransactionSummaryController.php | 4 +++- app/Providers/AppServiceProvider.php | 12 ++++++++++++ config/api.php | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/BillplzTransactionSummaryController.php b/app/Http/Controllers/BillplzTransactionSummaryController.php index dbfcf00..c85783d 100644 --- a/app/Http/Controllers/BillplzTransactionSummaryController.php +++ b/app/Http/Controllers/BillplzTransactionSummaryController.php @@ -11,7 +11,9 @@ class BillplzTransactionSummaryController extends Controller { $date = $request->selectedDate ?? Carbon::now()->toDateString(); - $transactionData = collect( Http::arrahn()->get('/api/transaction/online/query', ['date' => $date, 'status' => 'paid'])->json() ); + $transactionDataPKB = collect( Http::arrahn()->get('/api/transaction/online/query', ['date' => $date, 'status' => 'paid'])->json() ); + $transactionDataKOOP = collect( Http::arrahn_koop()->get('/api/transaction/online/query', ['date' => $date, 'status' => 'paid'])->json() ); + $transactionData = $transactionDataPKB->merge($transactionDataKOOP); // Group transactionData by bill_id $transactionData = $transactionData->groupBy(function($transaction) { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 42e7c33..78b6945 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -34,5 +34,17 @@ class AppServiceProvider extends ServiceProvider $this->baseUrl(config('api.url')); return $this; }); + + PendingRequest::macro('arrahn', function () { + $this->options['verify'] = config('app.api_verify'); + $this->baseUrl(config('api.url')); + return $this; + }); + + PendingRequest::macro('arrahn_koop', function () { + $this->options['verify'] = config('app.api_verify'); + $this->baseUrl(config('api.url_koop')); + return $this; + }); } } diff --git a/config/api.php b/config/api.php index a9d4da0..248b103 100644 --- a/config/api.php +++ b/config/api.php @@ -1,5 +1,6 @@ env('API_URL'), + 'url_koop' => env('API_URL_KOOP'), 'url_arrahn_portal' => env('API_ARRAHN_PORTAL_URL') ];