diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 694ea5b..20de60a 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -238,26 +238,23 @@ class LaporanController extends Controller } public function laporanTerkumpul(Request $request){ - // $tarikh_request = $request->tarikh; - - // $startDate = Carbon::parse($tarikh_request); - // $firstDay = $startDate->firstOfMonth(); - // $startDateYear = Carbon::parse($tarikh_request); - // $firstDayYear = $startDateYear->firstOfYear(); - + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $laporan_harian = []; + $laporan_terkumpul = []; - $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]); - $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','>=',$request->hingga]]); + $gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir]]); + + $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','>=',$request->akhir]]); $ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]); + + //a $total_gadai = $gadai->sum('pinjaman'); $total_tebus = $tebus->sum('pinjaman'); $total_ansuran = $ansuran->sum('duit_masuk'); // $total_keuntungan = TransaksiKeuntungan::on('mysql7')->whereDate('tarikh_bayaran','=',$request->tarikh)->sum('bayaran_keuntungan'); - $total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])->sum('upahdibayar'); - $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga]])->sum('bakiupah'); + $total_upah = Advansur::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->akhir]])->sum('upahdibayar'); + $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]])->sum('bakiupah'); $total_keuntunganansuran = TransaksiKeuntungan::on('mysql7') ->leftJoin('transaction as trans', function($join) @@ -266,7 +263,7 @@ class LaporanController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->whereDate('trans.created_at','>=',$request->mula) - ->whereDate('trans.created_at','<=',$request->hingga) + ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.trans_type','=','A') ->groupBy('trans.id') ->sum('keuntungan_rebet'); @@ -280,107 +277,11 @@ class LaporanController extends Controller $bilangan_gadai = $gadai->count(); $bilangan_tebus = $tebus->count(); $bilangan_ansuran = $ansuran->count(); - $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->hingga]])->count(); - - //c - /* Sistem */ - $petibesi_sistem = Vault::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('bakiakhir'); - - /* Imbang Duga */ - $totalbakiakhirtunai = 0; - - $vault=Vault::on($cawangan['mysql']) - ->where('kodcaw','=',$request->kodcaw) - ->where('tarikh','<=', $request->tarikh) - ->orderby('tarikh','desc')->first(); - - $tunai = Tunai::on($cawangan['mysql']) - ->where('kodcaw','=',$request->kodcaw) - ->where('tarikh','=', $request->tarikh) - ->get(); - - $total = 0; - foreach($tunai as $index=>$money) - { - $total+=$money['baki']; - } - - - if($total != 0) - { - $totalbakiakhirtunai = $vault['bakiakhir'] + $total; - }else - { - $totalbakiakhirtunai = $vault['bakiakhir']; - } - - /* Denominasi */ - $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); - - - //d - $panjar_terkumpul = Panjar::on($cawangan['mysql'])->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])->sum('bayaran'); - - //e - /* Imbang Duga */ - - $rekodkoop = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']]) - ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']]) - ->sum('pinjaman'); - - if($request->tarikh > '2021-04-13'){ - $rekodtawarruq = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) - ->sum('pinjaman'); - } - - $daterequest = new Carbon($request->tarikh); - $daterequest->addDays(1); - - $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where('db2.sttebus','=','') - ->where('db2.hargajualan','<>','null') - ->where('tarikh_bayaran' ,'<=', $daterequest) - ->sum('bayaran_pembiayaan'); - - $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan); - - /* Stok Audit */ - - $stokaudit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - - $stokauditget = $stokaudit->get(); - $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); - $stokauditcount = $stokaudit->count(); - - $totalstokaudit = 0; - foreach($stokauditget as $index1=>$stokA) - { - if($stokA['hargajualan'] == null) - $totalstokaudit += $stokA['pinjaman']; - else - $totalstokaudit += $stokA['bakipjm']; - } - - - /* Kawalan Stok */ - - - - - + $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where([['tarikhdaftar','>=',$request->mula],['tarikhdaftar','<=',$request->akhir]])->count(); //f - $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get(); - $bilangan_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->count(); + $data_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->get(); + $bilangan_lelong = Lelong::on($cawangan['mysql'])->where([['t_jual','=',$request->mula],['t_jual','=',$request->akhir]])->count(); $cas_lelong = 0; $jumlah_lelong = 0; @@ -400,22 +301,22 @@ class LaporanController extends Controller } //g - $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah'); + $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah'); //h - $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman'); - $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman'); - $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); + $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman'); + $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',75]])->sum('pinjaman'); + $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); - $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('nilaimarhun'); - $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); - $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); + $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun'); + $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); + $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); - $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->count(); - $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->count(); - $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->count(); + $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->count(); + $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->count(); + $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->count(); - array_push($laporan_harian,[ + array_push($laporan_terkumpul,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, 'total_ansuran'=>$total_ansuran, @@ -433,24 +334,16 @@ class LaporanController extends Controller 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, - 'panjar_terkumpul'=>$panjar_terkumpul, 'bilangan_lelong'=>$bilangan_lelong, 'cas_lelong'=>$cas_lelong, 'jumlah_lelong'=>$jumlah_lelong, 'baki_lelong'=>$baki_lelong, 'rugi_lelong'=>$rugi_lelong, - 'total_keuntungan'=>floatval($total_keuntungan), - 'petibesi_sistem'=>$petibesi_sistem, - 'petibesi_deno'=>$petibesi_deno, - 'stokauditpembiayaan'=>$totalstokaudit, - 'stokauditnilaimarhun'=>$stokauditnilaimarhun, - 'stokauditcount'=>$stokauditcount, - 'petibesiimbangduga'=>$totalbakiakhirtunai, - 'outstandingimbangduga'=>$outstandingimbangduga + 'total_keuntungan'=>floatval($total_keuntungan) ]); - return response()->json($laporan_harian); + return response()->json($laporan_terkumpul); } diff --git a/routes/web.php b/routes/web.php index 5f8aec8..3e390ea 100644 --- a/routes/web.php +++ b/routes/web.php @@ -175,7 +175,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('transaksi_keuntungan',['uses'=>'TransaksiKeuntunganController@createTransaksiKeuntungan']); - $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413 + $router->get('latest_transaksi_untung/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']); // new added 20210413 $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']); // new added 20210413 @@ -414,7 +414,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('komoditi/rekod/transaksi',['uses'=>'KomuditiController@rekodTransaksiKomoditi']); $router->get('laporan/harian',['uses'=>'LaporanController@laporanHarian']); - $router->get('laporan/terkumpuil',['uses'=>'LaporanController@laporanTerkumpul']); + $router->get('laporan/terkumpul',['uses'=>'LaporanController@laporanTerkumpul']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){