Merge branch 'apiaku' of https://gitlab.com/online-sistem1/api_arrahn into apiaku
This commit is contained in:
@@ -1940,28 +1940,32 @@ class GadaiController extends Controller
|
||||
->sum('pinjaman');
|
||||
|
||||
|
||||
if($request->tarikh <= '2021-02-25')
|
||||
{
|
||||
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
|
||||
->where('tagpalsu','=',0)
|
||||
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
||||
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
|
||||
->sum('pinjaman');
|
||||
|
||||
}
|
||||
else{
|
||||
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
|
||||
->where('tagpalsu','=',0)
|
||||
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
||||
->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
|
||||
->sum('pinjaman');
|
||||
}
|
||||
|
||||
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
|
||||
|
||||
return response()->json($array_rekodemas);
|
||||
}
|
||||
|
||||
public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
|
||||
{
|
||||
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||
|
||||
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
|
||||
->where('tagpalsu','=',0)
|
||||
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
||||
->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
|
||||
->sum('pinjaman');
|
||||
|
||||
return response()->json($rekod_pinjamandiberi);
|
||||
}
|
||||
|
||||
public function CalculationKeuntungan($kodcaw,Request $request)
|
||||
{
|
||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
|
||||
|
||||
@@ -327,6 +327,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
||||
|
||||
//-- Harta Semasa --//
|
||||
$router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
|
||||
$router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
|
||||
|
||||
$router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
|
||||
$router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
|
||||
|
||||
|
||||
Reference in New Issue
Block a user