From ccb79811ffab72964fa09d0b15551862323d1c1d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 6 Nov 2021 12:28:35 +0800 Subject: [PATCH] fix pendahuluanserahanbakieloong --- app/Http/Controllers/GadaiController.php | 105 ++++++++++++------ app/Http/Controllers/LelongController.php | 41 ++++++- .../PendahuluanSerahanController.php | 10 +- routes/web.php | 1 + 4 files changed, 118 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 0b4b3e9..7387700 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2885,42 +2885,83 @@ class GadaiController extends Controller $current = Carbon::now(); $current = new Carbon(); - $transaksi_data = TransaksiKeuntungan::on('mysql7') - ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->where('kodcaw',$kodcaw) - ->pluck('norujukan'); - - $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) - ->where([['sttebus',''],['hargajualan','<>','null']]) - ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']]) - ->pluck('norujukan'); - - $transaksi = TransaksiKeuntungan::on('mysql7') - ->whereIn('norujukan',$gadaiData) - ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - ->sum('bayaran_pembiayaan'); - + // $arraylejer = array(); // $transaksi_data = TransaksiKeuntungan::on('mysql7') - // // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) - // ->sum('bayaran_pembiayaan'); - // // ->get(); + // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->where('kodcaw',$kodcaw) + // ->pluck('norujukan'); - // dd($transaksi_data); - // $transaksi = 0; - // if($transaksi_data){ - // foreach($transaksi_data as $index=>$transaksiData){ - // $gadaiData = Gadai::on($cawangan['mysql'])->where('norujukan',$transaksiData['norujukan'])->first(); - // if($gadaiData && (($gadaiData['sttebus'] == '' && $gadaiData['hargajualan'] != null) || ($gadaiData['sttebus'] != '' && $gadaiData['t_update'] > $request->mula && $gadaiData['hargajualan'] != null))){ - // $transaksi += $transaksiData['bayaran_pembiayaan']; - // } - // } - // } + // $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) + // ->where([['sttebus',''],['hargajualan','<>','null']]) + // ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['hargajualan','<>','null']]) + // ->pluck('norujukan'); - return response($transaksi); + // $transaksi = TransaksiKeuntungan::on('mysql7') + // ->whereIn('norujukan',$gadaiData) + // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->sum('bayaran_pembiayaan'); + + $from = date($request->mula); + $to = date($request->hingga); + + $transaksi_data = TransaksiKeuntungan::on('mysql7') + // ->where([['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->whereDate('tarikh_bayaran','<=', $request->hingga) + ->whereDate('tarikh_bayaran','>=', $request->mula) + ->where('kodcaw',$kodcaw) + ->pluck('norujukan'); + + $transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) + ->where([['sttebus',''],['hargajualan','<>','null']]) + ->pluck('norujukan'); + + $transaksi_kredit = TransaksiKeuntungan::on('mysql7') + ->whereIn('norujukan',$transaksi_kredit_gadai) + ->whereDate('tarikh_bayaran','<=', $request->hingga) + ->whereDate('tarikh_bayaran','>=', $request->mula) + // ->whereBetween('tarikh_bayaran',[$from,$to]) + ->sum('bayaran_pembiayaan'); + + // $transaksi_kredit = TransaksiKeuntungan::on('mysql7') + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + // ->sum('bayaran_pembiayaan'); + + + $tebus = Gadai::on($cawangan['mysql']) + ->select('gadai.norujukan','gadai.hargajualan','gadai.bakihargajualan') + ->join('tebus as t','gadai.norujukan','=','t.norujukan') + ->where('gadai.sttebus','T') + ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]]) + ->groupBy('gadai.norujukan') + ->get(); + + $arraytebus = array(); + + foreach($tebus as $index => $t) + { + if($t['hargajualan'] != $t['bakihargajualan']) + { + array_push($arraytebus,$t['norujukan']); + } + } + + // dd($arraytebus); + + $transaksi_debit = 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'); + }) + ->where('trans.trans_type','=','A') + ->where('trans.norujukan',$arraytebus) + ->sum('bayaran_pembiayaan'); + + $arraylejer = ["keluar" => $transaksi_debit,"masuk" => $transaksi_kredit]; + + return response($arraylejer); } public function LaporanAuditAktif($kodcaw,Request $request) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f7e9329..3d99470 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -234,26 +234,42 @@ class LelongController extends Controller public function BakiLelongCalculationLejer($kodcaw,Request $request) { + $cas_lelong = 0; + $jumlah_lelong = 0; + $baki_lelong = 0; + $rugi_lelong = 0; $tarikhbaru = $request->mula; $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $bakilelong = Lelong::on($cawangan['mysql']) - ->where('trkhtuntut','>=',$request->mula) - ->where('trkhtuntut','<=',$request->hingga) - ->where('baki','>=',0) - ->sum('baki'); + ->where('trkhtuntut','>=',$request->mula) + ->where('trkhtuntut','<=',$request->hingga) + ->where('baki','>=',0) + ->sum('baki'); $rugilelong = Lelong::on($cawangan['mysql']) ->where('trkhtuntut','>=',$request->mula) ->where('trkhtuntut','<=',$request->hingga) ->where('baki','<',0) ->sum('baki'); + + $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])->get(); - $rugitotal = $rugilelong; + foreach($data_lelong as $index=>$lelong){ + if($lelong['baki'] >= 0){ + $cas_lelong += $lelong['cajlelong']; + $jumlah_lelong += $lelong['hargajual']; + $baki_lelong += $lelong['baki']; + }elseif($lelong['baki'] < 0){ + $cas_lelong += $lelong['cajlelong']; + $jumlah_lelong += $lelong['hargajual']; + $rugi_lelong += abs($lelong['baki']); + } + } - $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong, 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong]; return response()->json($arraylelong,200); } @@ -479,6 +495,19 @@ class LelongController extends Controller return response()->json($cajlelong,200); } + public function cajlelongcalculationLejer($kodcaw,Request $request) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $cajlelong = Lelong::on($cawangan['mysql']) + ->whereNotNull('t_jual') + ->where([['t_jual','<=', $request->mula],['t_jual','>=',$request->hingga]]) + ->sum('cajlelong'); + + return response()->json($cajlelong,200); + } + public function cajperkhidmatancalculation($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php index 5b1001d..4f66d96 100644 --- a/app/Http/Controllers/PendahuluanSerahanController.php +++ b/app/Http/Controllers/PendahuluanSerahanController.php @@ -94,7 +94,7 @@ class PendahuluanSerahanController extends Controller ->where('pendahuluan','>',0) ->orderby('tarikh','desc') ->get(); - }else{ + }else if($request->jenis == 'serahan'){ $gldetail=GlDetail::on($cawangan['mysql']) ->where('kodcaw','=',$kodcaw) @@ -103,6 +103,14 @@ class PendahuluanSerahanController extends Controller ->where('serahan','>',0) ->orderby('tarikh','desc') ->get(); + }else{ + $gldetail=GlDetail::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]]) + ->where('descpt','LIKE','SERAHAN BAYAR ONLINE%') + ->where('serahan','>',0) + ->orderby('tarikh','desc') + ->get(); } diff --git a/routes/web.php b/routes/web.php index 7b2e63c..88c3bcf 100644 --- a/routes/web.php +++ b/routes/web.php @@ -454,6 +454,7 @@ $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBa $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); + $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculationLejer']); // //-- Harta Semasa --// $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']);