Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/api_arrahn into finadev
This commit is contained in:
@@ -813,7 +813,7 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent')
|
$gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent','tagbaru')
|
||||||
->where('t_gadai','>=',$request->mula)
|
->where('t_gadai','>=',$request->mula)
|
||||||
->where('t_gadai','<=',$request->akhir)
|
->where('t_gadai','<=',$request->akhir)
|
||||||
->orderBy('t_gadai')
|
->orderBy('t_gadai')
|
||||||
@@ -841,7 +841,9 @@ class GadaiController extends Controller
|
|||||||
"alamat1"=> $customer_info['alamat1'],
|
"alamat1"=> $customer_info['alamat1'],
|
||||||
"teller"=> $gadaiData['teller'],
|
"teller"=> $gadaiData['teller'],
|
||||||
"ujrah"=> $gadaiData['ujrah'],
|
"ujrah"=> $gadaiData['ujrah'],
|
||||||
"onepercent"=> $gadaiData['onepercent']
|
"onepercent"=> $gadaiData['onepercent'],
|
||||||
|
"tagbaru"=> $gadaiData['tagbaru']
|
||||||
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user