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

Fix most errors on debug transaksi online

Browse Source
This commit is contained in:
Afiq Hamzah
2025-04-09 16:06:00 +08:00
parent 66fc240d9b
commit 9a9e870ec2
12 changed files with 323 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BillplzTransactionReviewController.php
+6 -2
View File
@@ -11,15 +11,19 @@ class BillplzTransactionReviewController extends Controller
{
$date = request()->selectedDate ?? Carbon::now()->toDateString();
$billPlzTransactionReview = Http::get(config('api.url_arrahn_portal') . '/api/billplz-transaction-review', ['date' => $date])->json();
[$pkbTransactionsReview, $kopkbTransactionsReview] = Http::get(config('api.url_arrahn_portal') . '/api/billplz-transaction-review', ['date' => $date])->json();
return view('online.billplz-transaction-review.index', compact('billPlzTransactionReview', 'date'));
return view('online.billplz-transaction-review.index', compact('pkbTransactionsReview', 'kopkbTransactionsReview', 'date'));
}
public function show($bill_id)
{
$billPlzTransactionReview = Http::get(config('api.url_arrahn_portal') . '/api/billplz-transaction-review/'. $bill_id)->json();
$billPlzTransactionReview = array_filter($billPlzTransactionReview, fn($x) => $x[0]['billplz_latest_transaction'] !== null);
$billPlzTransactionReview = array_pop($billPlzTransactionReview);
return view('online.billplz-transaction-review.show', compact('billPlzTransactionReview', 'bill_id'));
}
}
app/Http/Controllers/BillplzTransactionSummaryController.php
+4 -3
View File
@@ -13,16 +13,17 @@ class BillplzTransactionSummaryController extends Controller
$transactionDataPKB = collect( Http::arrahn()->get('/api/transaction/online/query', ['date' => $date, 'status' => 'paid'])->json() );
$transactionDataPKB = $transactionDataPKB->map(function($x){
$x['account_own_by'] = 'KOOP';
$x['account_own_by'] = 'PKB';
return $x;
});
$transactionDataKOOP = collect( Http::arrahn_koop()->get('/api/transaction/online/query', ['date' => $date, 'status' => 'paid'])->json() );
$transactionDataKOOP = $transactionDataKOOP->map(function($x){
$x['account_own_by'] = 'PKB';
$x['account_own_by'] = 'KOOP';
return $x;
});
$transactionData = $transactionDataPKB->merge($transactionDataKOOP);
$transactionDataPKB = $this->processArrahnTransactions($transactionDataPKB);
@@ -32,7 +33,7 @@ class BillplzTransactionSummaryController extends Controller
$billIds = $transactionData->map(fn($x) => ['bill_id' => $x['bill_id'], 'account_own_by' => $x['account_own_by']]);
$billplzBills = Http::get(config('api.url_arrahn_portal') . '/api/billplz', ['bill_ids' => json_encode($billIds)])->json();
$data = array_map(fn($x, $y) => $this->processBillplzBills($x, $y), $billplzBills, [$transactionDataPKB, $transactionDataKOOP]);
$data = array_map(fn($x, $y) => $this->processBillplzBills($x, $y), $billplzBills, [$transactionDataKOOP, $transactionDataPKB]);
[$billPlzTransactionSummaryKOOP, $billPlzTransactionSummaryPKB] = $data;
app/Http/Controllers/OnlineTransactionGadaianController.php
+8 -2
View File
@@ -7,10 +7,16 @@ use Carbon\Carbon;
class OnlineTransactionGadaianController extends Controller
{
public function __invoke($norujukan)
public function __invoke($norujukan, Request $request)
{
$gadaian = Http::arrahn()->get('/api/gadai/norujukan/'.$norujukan)->json()[0][0];
if($request->account_own_by === 'pkb'){
$gadaian = Http::arrahn()->get('/api/gadai/norujukan/'.$norujukan)->json()[0][0];
}
if($request->account_own_by === 'kopkb'){
$gadaian = Http::arrahn_koop()->get('/api/gadai/norujukan/'.$norujukan)->json()[0][0];
}
return view('online.gadaian.show', compact('gadaian'));
}
}
app/Http/Controllers/OnlineTransactionLogController.php
+23 -7
View File
@@ -11,18 +11,34 @@ class OnlineTransactionLogController extends Controller
{
$date = request()->selectedDate ?? Carbon::now()->toDateString();
$transactionLog = Http::get(config('api.url') . '/api/transaction/online/log', ['date' => $date])->json();
$logs = collect($transactionLog)->groupBy('bill_id');
return view('online.log.index', compact('logs', 'date'));
$transactionLogPKB = Http::arrahn()->get('/api/transaction/online/log', ['date' => $date])->json();
$transactionLogKOPKB = Http::arrahn_koop()->get('/api/transaction/online/log', ['date' => $date])->json();
$groupLogsByBillID = fn($x) => collect($x)->groupBy('bill_id');
$transactionLogPKB = $groupLogsByBillID($transactionLogPKB);
$transactionLogKOPKB = $groupLogsByBillID($transactionLogKOPKB);
$key_transactionLogKOPKB = $transactionLogKOPKB->keys();
$key_transactionLogPKB = $transactionLogPKB->keys();
// remove the KOPKB keys that are inside of PKB keys
$key_transactionLogPKB = $key_transactionLogPKB->diff($key_transactionLogKOPKB);
$transactionMain = collect($transactionLogPKB->all());
$transactionLogPKB = $transactionMain->only($key_transactionLogPKB);
$transactionLogKOPKB = $transactionMain->only($key_transactionLogKOPKB);
return view('online.log.index', compact('transactionLogPKB','transactionLogKOPKB','date'));
}
public function show($bill_id)
public function show($bill_id, Request $request)
{
$transactionLog = Http::arrahn()->get('/api/transaction/online/log/'.$bill_id)->json();
$transactionLog = Http::arrahn()->get('/api/transaction/online/log/'.$bill_id)->json();
$logs = collect($transactionLog)->groupBy('bill_id');
return view('online.log.show', compact('logs', 'bill_id'));
app/Http/Controllers/OnlineTransactionTrailController.php
+4 -4
View File
@@ -47,12 +47,12 @@ class OnlineTransactionTrailController extends Controller
'isGroupedByNorujukan' => $isGroupedByNorujukan,
];
$transactionTrailKOOP = Http::arrahn()->get('/api/transaction/online/trail', $queries)->json();
$transactionTrailKOOP = Http::arrahn_koop()->get('/api/transaction/online/trail', $queries)->json();
$transactionTrailPKB = Http::arrahn_koop()->get('/api/transaction/online/trail', $queries)->json();
$transactionTrailPKB = Http::arrahn()->get('/api/transaction/online/trail', $queries)->json();
$branchesPKB = Http::arrahn_koop()->get('/api/cawangan')->json();
$branchesKOOP = Http::arrahn()->get('/api/cawangan')->json();
$branchesPKB = Http::arrahn()->get('/api/cawangan')->json();
$branchesKOOP = Http::arrahn_koop()->get('/api/cawangan')->json();
$branches = array_merge($branchesKOOP, $branchesPKB);
return view('online.trail.index', compact('transactionTrailPKB', 'transactionTrailKOOP', 'startDate', 'endDate', 'norujukan', 'selectedStatus', 'statuses', 'billplzBillId', 'branches', 'selectedBranch'));
app/Providers/AppServiceProvider.php
+2 -2
View File
@@ -26,12 +26,12 @@ class AppServiceProvider extends ServiceProvider
public function boot()
{
Http::macro('arrahn', function () {
return Http::withOptions(['verify' => config('app.api_verify')])->baseUrl(config('api.url'));
return Http::withOptions(['verify' => config('app.api_verify')])->baseUrl(config('api.url_pkb'));
});
PendingRequest::macro('arrahn', function () {
$this->options['verify'] = config('app.api_verify');
$this->baseUrl(config('api.url'));
$this->baseUrl(config('api.url_pkb'));
return $this;
});