From fd8e1d504d6e43502b7a52492defd82005b73a2c Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 4 May 2021 16:34:00 +0800 Subject: [PATCH] fix laporan --- app/Http/Controllers/GadaiController.php | 13 +++--- app/Http/Controllers/LaporanController.php | 22 +++++++++-- app/Http/Controllers/TebusController.php | 46 ++++++++++++++++++++++ routes/web.php | 3 +- 4 files changed, 73 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index acd4659..7498b05 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -892,16 +892,15 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $dateans = new Carbon($request->tarikh); - $dateans->addDays(1); - - $date = new Carbon($request->tarikh); - $gadai = Transaction::on('mysql7') - ->join('transaksi_keuntungan', 'transaction.norujukan', '=', 'transaksi_keuntungan.norujukan') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) ->where('transaction.trans_type','=','A') - ->where('transaction.created_at','>=',$date) - ->where('transaction.created_at','<=',$dateans) + ->whereDate('transaction.created_at','=',$dateans) ->get(); return response()->json($gadai); diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index fbcd868..5ee9dbe 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -34,8 +34,25 @@ class LaporanController extends Controller $total_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->sum('pinjaman'); $total_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('pinjaman'); $total_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->sum('duit_masuk'); - $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereRaw('DATE(tarikh_bayaran) = ?',[$request->tarikh])->sum('bayaran_keuntungan'); + // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan'); $total_upah = Advansur::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('upahdibayar'); + $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah'); + + $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7') + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereDate('trans.created_at','=',$request->tarikh) + ->where('trans.trans_type','=','A') + ->groupBy('trans.id') + ->sum('keuntungan_rebet'); + + // $total_ansuran = number_format($total_ansuran,2); + + $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); + //b $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count(); @@ -133,8 +150,7 @@ class LaporanController extends Controller 'jumlah_lelong'=>$jumlah_lelong, 'baki_lelong'=>$baki_lelong, 'rugi_lelong'=>$rugi_lelong, - 'total_keuntungan'=>$total_keuntungan, - 'total_upah'=>$total_upah, + 'total_keuntungan'=>floatval($total_keuntungan), 'petibesi_sistem'=>$petibesi_sistem, 'petibesi_deno'=>$petibesi_deno, 'stokaudit'=>$stokaudit diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 07d12d4..efda1e5 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -396,6 +396,34 @@ class TebusController extends Controller return response()->json($tebus); } + public function getLaporanTebusPengasingan($kodcaw,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $tebusarrahn = Tebus::on($cawangan['mysql']) + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('t_tebus','=',$request->tarikh) + ->whereNull('hargajualan'); + + $totalpenebusanarrahn = $tebusarrahn->sum('tebus.pinjaman'); + $bilpenebusanarrahn = $tebusarrahn->count(); + $totalkeuntunganarrahn = $tebusarrahn->sum('tebus.bakiupah'); + + $tebustawarruq = Tebus::on($cawangan['mysql']) + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('t_tebus','=',$request->tarikh) + ->whereNotNull('hargajualan'); + + $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman'); + $bilpenebusantawarruq = $tebustawarruq->count(); + $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate'); + $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah'); + + $array_penebusan = ['bilarrahn' => $bilpenebusanarrahn, 'totalarrahn' => $totalpenebusanarrahn, 'keuntunganarrahn' => $totalkeuntunganarrahn, 'biltawarruq' => $bilpenebusantawarruq, 'totaltawarruq' => $totalpenebusantawarruq,'totalrebate' => $totalrebatetawarruq,'keuntungantawarruq' => $totalkeuntungantawarruq]; + + return response()->json($array_penebusan); + } + public function listPenebusanBaru($kodcaw){ $current = Carbon::now(); @@ -569,6 +597,24 @@ class TebusController extends Controller } + public function advansurdetails($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','=',$request->tarikh); + + $countadvansur = $listadvansur->count(); + $totaladvansur = $listadvansur->sum('upahdibayar'); + + $arrayadvansur = ['bil' => $countadvansur, 'total' => $totaladvansur]; + + return response()->json($arrayadvansur,200); + } + public function getAdvansurByKodlaluan($kodcaw,Request $request) { $current = Carbon::now(); diff --git a/routes/web.php b/routes/web.php index 376fb1d..13c97dd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -86,12 +86,12 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']); $router->get('upahbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahNotTawarruq']); $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']); + $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); //Maintenance API TEBUS // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']); $router->get('listpenebusanhistory/{kodcaw}',['uses'=>'TebusController@listhistorypenebusan']); - //API FARIS $router->put('tebus/serah_marhun_teller/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodescanTebus']); // $router->get('tebus_serahan/{kodcaw}',['uses'=>'TebusController@SerahMarhunTeller']); @@ -188,6 +188,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']); $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']); + $router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']); $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);