From b5b68d9517744760cb1ea9a3918cc807e0dd3848 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 5 Jul 2021 16:27:41 +0800 Subject: [PATCH] fix laporan --- app/Http/Controllers/GadaiController.php | 27 ++++++++++++++++++++++++ routes/web.php | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2e17006..ac8f36a 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -934,6 +934,33 @@ class GadaiController extends Controller return response()->json($gadai); } + public function getAnsuranSummary($kodcaw,Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $dateans = new Carbon($request->tarikh); + + $ansurans = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->where('transaction.kodcaw','=',$kodcaw) + ->where('transaction.trans_type','=','A') + ->whereDate('transaction.created_at','=',$dateans) + ->sum('trans.bayaran_keuntungan'); + + $transaksi = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) + ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) + ->sum('bayaran_pembiayaan'); + + $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans]; + + return response()->json($arrayansuran,200); + } + public function updateHistoryGadai($kodcaw,$norujukan,Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/routes/web.php b/routes/web.php index 5fb6807..9fe1695 100644 --- a/routes/web.php +++ b/routes/web.php @@ -198,7 +198,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //ANSURAN UPAH API - $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong + $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); + $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']);