KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge payments of KOPKB and PKB of online transaction trail

Browse Source
This commit is contained in:
Afiq Hamzah
2025-01-26 18:38:36 +08:00
parent 055357aee8
commit 4dbe7f22ce
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/OnlineTransactionTrailController.php
+17 -12
View File
@@ -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'));
app/Providers/AppServiceProvider.php
+2 -4
View File
@@ -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 () {