KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in izzati-hotfix-gadai-tebus-keseluruhan (pull request #297)

Browse Source 
edit sort cawangan
This commit is contained in:
izzati zulkifli
2025-04-22 09:09:43 +00:00
parent 5682156272 f1580db8f0
commit 091822c725
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Reports/GadaianController.php
+17 -6
View File
@@ -26,13 +26,24 @@ class GadaianController extends Controller
$startDate = $request->startDate;
$endDate = $request->endDate;
// Get active branch DBs from helper
$active_cawangan_db_connection = Helper::getActiveCawanganDbConnection();
$active_cawangan_db_name = array_map(function ($db_connection) {
return config('database.connections' . '.' . $db_connection . '.' . 'database');
}, $active_cawangan_db_connection);
$active_cawangan_detail = Cawangan::select('kodcaw', 'details_caw')->whereIn('db_name', $active_cawangan_db_name)->get()->toArray();
// Fetch branch details with mysql info
$cawangan_available = Cawangan::select('kodcaw', 'details_caw', 'mysql')
->whereIn('mysql', $active_cawangan_db_connection)
->get();
// Get db connections
$active_cawangan_db_connection = array_column($cawangan_available->toArray(), 'mysql');
// Map branch info for response
$active_cawangan_detail = $cawangan_available->map(function ($c) {
return [
'kodcaw' => $c->kodcaw,
'details_caw' => $c->details_caw,
];
})->values()->toArray();
$summary_gadaian_data = array_map(function ($db_connection) use ($request) {
$query = Gadai::on($db_connection);
app/Http/Controllers/Reports/PenebusanController.php
+17 -9
View File
@@ -21,16 +21,24 @@ class PenebusanController extends Controller
public function getSummaryLaporanTebus(Request $request)
{
// Get active branch DBs from helper
$active_cawangan_db_connection = Helper::getActiveCawanganDbConnection();
$arrahn_master_db_connection = Cawangan::all()->pluck('mysql')->toArray();
$active_cawangan_db_connection = array_intersect($active_cawangan_db_connection, $arrahn_master_db_connection);
$active_cawangan_db_name = array_map(function ($db_connection) {
return config('database.connections' . '.' . $db_connection . '.' . 'database');
}, $active_cawangan_db_connection);
$active_cawangan_detail = Cawangan::select('kodcaw', 'details_caw')->whereIn('db_name', $active_cawangan_db_name)->get()->toArray();
// Fetch branch details with mysql info
$cawangan_available = Cawangan::select('kodcaw', 'details_caw', 'mysql')
->whereIn('mysql', $active_cawangan_db_connection)
->get();
// Get db connections
$active_cawangan_db_connection = array_column($cawangan_available->toArray(), 'mysql');
// Map branch info for response
$active_cawangan_detail = $cawangan_available->map(function ($c) {
return [
'kodcaw' => $c->kodcaw,
'details_caw' => $c->details_caw,
];
})->values()->toArray();
$summary_penebusan_data = array_map(function ($db_connection) use ($request) {
$penebusan = Tebus::on($db_connection)