Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local> Reviewed-on: #15
This commit was merged in pull request #15.
This commit is contained in:
@@ -537,7 +537,7 @@ class GadaiController extends Controller
|
||||
|
||||
public function getLaporanGadai($kodcaw,$tarikh){
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||
$gadai_data = Gadai::on($cawangan['mysql'])->select('cara_terima','t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent')
|
||||
$gadai_data = Gadai::on($cawangan['mysql'])->select('cara_terima','t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent','kadarrebet','diskaun')
|
||||
->where('t_gadai','=',$tarikh)
|
||||
->orderBy('teller')
|
||||
->orderBy('sirig')
|
||||
@@ -564,7 +564,9 @@ class GadaiController extends Controller
|
||||
"alamat1"=> $customer_info['alamat1'],
|
||||
"teller"=> $gadaiData['teller'],
|
||||
"onepercent"=> $gadaiData['onepercent'],
|
||||
"ujrah"=> $gadaiData['ujrah']
|
||||
"ujrah"=> $gadaiData['ujrah'],
|
||||
"kadarrebet"=> $gadaiData['kadarrebet'],
|
||||
"diskaun"=> $gadaiData['diskaun']
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -627,8 +629,7 @@ class GadaiController extends Controller
|
||||
"alamat1" => optional($customer)->alamat1,
|
||||
"t_gadai" => $g->t_gadai,
|
||||
"norujukan" => $g->norujukan,
|
||||
"cara_terima" => $g->cara_terima,
|
||||
"norujukan"=> $g->norujukan,
|
||||
"cara_terima" => strtoupper((string) ($g->cara_terima ?: 'TUNAI')),
|
||||
|
||||
"nokp"=> $g->nokp,
|
||||
"semakbarcode"=> $g->semakbarcode,
|
||||
@@ -642,6 +643,8 @@ class GadaiController extends Controller
|
||||
"teller"=> $g->teller,
|
||||
"ujrah"=> $g->ujrah,
|
||||
"onepercent"=> $g->onepercent,
|
||||
"kadarrebet"=> $g->kadarrebet,
|
||||
"diskaun"=> $g->diskaun,
|
||||
"tagbaru"=> $g->tagbaru,
|
||||
"kodkerja"=> optional($customer)->kodkerja,
|
||||
"bangsa"=> optional($customer)->bangsa,
|
||||
|
||||
Reference in New Issue
Block a user