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

fix masa di laporan tebus(arrange)

Browse Source
This commit is contained in:
unknown
2024-10-27 13:34:41 +08:00
parent a04eb5351c
commit 7b58768bb4
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+34 -9
View File
@@ -249,14 +249,33 @@ class TebusController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$tebus_data = Tebus::on($cawangan['mysql']) $tebus_data = Tebus::on($cawangan['mysql'])
->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg','tebus.ujrah','tebus.onepercent','gad.tagbaru') ->select(
->join('gadai as gad','gad.norujukan','=','tebus.norujukan') 'tebus.t_tebus',
->where('tebus.t_tebus','>=',$request->mula) 'gad.t_gadai',
->where('tebus.t_tebus','<=',$request->akhir) 'gad.hargajualan',
->groupBy('tebus.norujukan') 'gad.bakihargajualan',
->orderBy('tebus.teller') 'gad.bakipjm as gadaibakipjm',
->orderBy('tebus.sirit') 'tebus.nilaimarhun',
->get(); 'tebus.tagterima',
'tebus.teller',
'tebus.jenistebus',
'tebus.pinjaman',
'tebus.bakiupah',
'tebus.bakipjm',
'gad.norujukan',
'gad.nokp',
'tebus.jbg',
'tebus.ujrah',
'tebus.onepercent',
'gad.tagbaru'
)
->join('gadai as gad', 'gad.norujukan', '=', 'tebus.norujukan')
->where('tebus.t_tebus', '>=', $request->mula)
->where('tebus.t_tebus', '<=', $request->akhir)
->groupBy('tebus.norujukan')
->orderBy('tebus.teller')
->orderBy('tebus.sirit')
->get();
$tebus = []; $tebus = [];
if($tebus_data){ if($tebus_data){
@@ -294,7 +313,13 @@ class TebusController extends Controller
$compare_teller = strcmp($a['teller'], $b['teller']); $compare_teller = strcmp($a['teller'], $b['teller']);
if ($compare_teller === 0) { if ($compare_teller === 0) {
return strcmp($a['t_tebus'], $b['t_tebus']); $compare_tebus = strcmp($a['t_tebus'], $b['t_tebus']);
if ($compare_tebus === 0) {
return $a['tarikh_bayaran'] <=> $b['tarikh_bayaran'];
}
return $compare_tebus;
} }
return $compare_teller; return $compare_teller;