From 51eec259ad71ed11c1d85d4082354abc6c65c863 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 3 Jun 2021 12:08:34 +0800 Subject: [PATCH 01/13] kawalanstokbaru --- app/Http/Controllers/GadaiController.php | 57 ++++++++++ app/KawalanStok.php | 132 +++++++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 app/KawalanStok.php diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index af65b0e..a945d4f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -18,6 +18,7 @@ use App\Vault; use App\Tunai; use App\Komuditi; use App\KawalanStokLama; +use App\KawalanStok; use Illuminate\Http\Request; @@ -1133,6 +1134,62 @@ class GadaiController extends Controller $lelong3[0]['pinj'] = $lelpinj3; } + }else{ + // $kawalanstok = KawalanStok::on($cawangan['mysql']) + // ->get(); + + // foreach($kawalanstok as $indexgad => $gadaikawalanstok) + // { + + // //Gadai + // $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilgadcf1']); + // $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilgadcf2']); + // $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilgadcf3']); + // $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf1']); + // $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf2']); + // $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf3']); + + // $gadai1[0]['bil'] = $gad1; + // $gadai1[0]['pinj'] = $gadpinj1; + // $gadai2[0]['bil'] = $gad2; + // $gadai2[0]['pinj'] = $gadpinj2; + // $gadai3[0]['bil'] = $gad3; + // $gadai3[0]['pinj'] = $gadpinj3; + + // //Tebus + + // $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['biltebcf1']); + // $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['biltebcf2']); + // $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['biltebcf3']); + // $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf1']); + // $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf2']); + // $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf3']); + + // $tebus1[0]['bil'] = $teb1; + // $tebus1[0]['pinj'] = $tebpinj1; + // $tebus2[0]['bil'] = $teb2; + // $tebus2[0]['pinj'] = $tebpinj2; + // $tebus3[0]['bil'] = $teb3; + // $tebus3[0]['pinj'] = $tebpinj3; + + // //Lelong + + // $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['billelcf1']); + // $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['billelcf2']); + // $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['billelcf3']); + // $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf1']); + // $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf2']); + // $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf3']); + + // $lelong1[0]['bil'] = $lel1; + // $lelong1[0]['pinj'] = $lelpinj1; + // $lelong2[0]['bil'] = $lel2; + // $lelong2[0]['pinj'] = $lelpinj2; + // $lelong3[0]['bil'] = $lel3; + // $lelong3[0]['pinj'] = $lelpinj3; + + // } + } ////////////////// diff --git a/app/KawalanStok.php b/app/KawalanStok.php new file mode 100644 index 0000000..c38a6ab --- /dev/null +++ b/app/KawalanStok.php @@ -0,0 +1,132 @@ + Date: Sun, 6 Jun 2021 10:08:36 +0800 Subject: [PATCH 02/13] fix laporan lagi --- app/Http/Controllers/GadaiController.php | 5 - app/Http/Controllers/LaporanController.php | 216 +++++++++++++++++++++ app/Http/Controllers/TebusController.php | 16 ++ routes/web.php | 2 + 4 files changed, 234 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index a945d4f..71b0e96 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2284,16 +2284,11 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - // if($request->tarikh > '2021-04-13'){ $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]]) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=',''],['hargajualan','<>','NULL']]) - // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) - // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']]) ->sum('pinjaman'); - // } return response()->json($rekod_pinjamandiberi); } diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 30ea981..694ea5b 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -237,6 +237,222 @@ class LaporanController extends Controller return response()->json($laporan_harian); } + 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 = []; + + $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]]); + $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_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->mula) + ->whereDate('trans.created_at','<=',$request->hingga) + ->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->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 */ + + + + + + + //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(); + + $cas_lelong = 0; + $jumlah_lelong = 0; + $baki_lelong = 0; + $rugi_lelong = 0; + + 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']); + } + } + + //g + $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->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'); + + $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'); + + $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(); + + array_push($laporan_harian,[ + 'total_gadai'=>$total_gadai, + 'total_tebus'=>$total_tebus, + 'total_ansuran'=>$total_ansuran, + 'bilangan_gadai'=>$bilangan_gadai, + 'bilangan_tebus'=>$bilangan_tebus, + 'bilangan_ansuran'=>$bilangan_ansuran, + 'bilangan_customer_baru'=>$bilangan_customer_baru, + 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'gadai_70'=>$gadai_70, + 'gadai_75'=>$gadai_75, + 'gadai_80'=>$gadai_80, + 'nilaimarhun_70'=>$nilaimarhun_70, + 'nilaimarhun_75'=>$nilaimarhun_75, + 'nilaimarhun_80'=>$nilaimarhun_80, + '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 + + ]); + + return response()->json($laporan_harian); + } + public function CalcHapusKira($kodcaw,Request $request) { diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index c8cc9bb..10dfc37 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -687,6 +687,22 @@ class TebusController extends Controller return response()->json($listadvansur,200); } + public function SenaraiAdvansurRangeDate($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->mula) + ->where('tarikh','<=',$request->akhir) + ->orderBy('tarikh','desc') + ->get(); + + return response()->json($listadvansur,200); + } + public function advansurharini($kodcaw,Request $request){ $current = Carbon::now(); diff --git a/routes/web.php b/routes/web.php index 56022a4..5f8aec8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -196,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); + $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']); $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']); $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']); $router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']); @@ -413,6 +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->group(['prefix'=>'e-arrahn'], function () use ($router){ From 08eb8e22f1893abb95e86c9d64bf41d8073ea139 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 6 Jun 2021 13:56:54 +0800 Subject: [PATCH 03/13] fix laporan di ofis --- app/Http/Controllers/LaporanController.php | 159 ++++----------------- routes/web.php | 4 +- 2 files changed, 28 insertions(+), 135 deletions(-) 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){ From 52f009aa1e3c1171261d140d1a7e93ee3e167377 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 7 Jun 2021 19:48:03 +0800 Subject: [PATCH 04/13] fix penebusan & gadaian range --- app/Http/Controllers/GadaiController.php | 14 +++++ app/Http/Controllers/LaporanController.php | 4 +- app/Http/Controllers/TebusController.php | 61 ++++++++++++++++++++++ routes/web.php | 6 +++ 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 71b0e96..fbf3c72 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -561,6 +561,20 @@ class GadaiController extends Controller return response()->json($gadai); } + public function getLaporanGadaiRange($kodcaw,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $gadai = Gadai::on($cawangan['mysql']) + ->where('t_gadai','>=',$request->mula) + ->where('t_gadai','<=',$request->akhir) + ->orderBy('t_gadai','asc') + ->orderBy('sirig','asc') + ->get(); + + return response()->json($gadai); + } + public function getLaporanBatalGadai($kodcaw,$tarikh){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 20de60a..d139553 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -244,8 +244,8 @@ class LaporanController extends Controller $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]]); + $tebus = Tebus::on($cawangan['mysql'])->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->akhir]]); + $ansuran = Transaction::on('mysql7')->whereDate('created_at','>=',$request->mula)->whereDate('created_at','<=',$request->akhir)->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]]); //a diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 10dfc37..e11ada1 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -501,6 +501,19 @@ class TebusController extends Controller return response()->json($tebus); } + public function getLaporanTebusRange($kodcaw,Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $tebus = Tebus::on($cawangan['mysql']) + ->where('t_tebus','>=',$request->mula) + ->where('t_tebus','<=',$request->akhir) + ->orderBy('t_tebus','asc') + ->orderBy('sirit','asc') + ->get(); + + return response()->json($tebus); + } + public function getLaporanTebusPengasingan($kodcaw,Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -529,6 +542,36 @@ class TebusController extends Controller return response()->json($array_penebusan); } + public function getLaporanTebusPengasinganRange($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->mula) + ->where('t_tebus','<=',$request->akhir) + ->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->mula) + ->where('t_tebus','<=',$request->akhir) + ->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(); @@ -736,6 +779,24 @@ class TebusController extends Controller return response()->json($arrayadvansur,200); } + public function advansurdetailsRange($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->mula)->where('tarikh','<=',$request->akhir); + + $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 3e390ea..080e468 100644 --- a/routes/web.php +++ b/routes/web.php @@ -73,6 +73,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('gadaiansemasa/{kodcaw}',['uses'=>'GadaiController@getGadaianSemasa']); $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']); $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']); + $router->get('gadailaporanRange/{kodcaw}',['uses'=>'GadaiController@getLaporanGadaiRange']); //Range Date + $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']); $router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']); @@ -92,7 +94,10 @@ $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('tebuslaporanRange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusRange']); $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); + $router->get('tebuslaporanjenistawarruqrange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasinganRange']); + //Maintenance API TEBUS // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']); @@ -200,6 +205,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']); $router->get('advansurharini/{kodcaw}',['uses'=>'TebusController@advansurharini']); $router->get('advansurdetails/{kodcaw}',['uses'=>'TebusController@advansurdetails']); + $router->get('advansurdetailsrange/{kodcaw}',['uses'=>'TebusController@advansurdetailsRange']); $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']); From d7e6535be4651f98873ea31fbff27de09846cbac Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 7 Jun 2021 22:45:25 +0800 Subject: [PATCH 05/13] fix kawalan stok --- app/Http/Controllers/GadaiController.php | 88 ++++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index fbf3c72..6ac9f85 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1149,60 +1149,60 @@ class GadaiController extends Controller } }else{ - // $kawalanstok = KawalanStok::on($cawangan['mysql']) - // ->get(); + $kawalanstok = KawalanStok::on($cawangan['mysql']) + ->get(); - // foreach($kawalanstok as $indexgad => $gadaikawalanstok) - // { + foreach($kawalanstok as $indexgad => $gadaikawalanstok) + { - // //Gadai - // $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilgadcf1']); - // $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilgadcf2']); - // $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilgadcf3']); - // $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf1']); - // $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf2']); - // $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjgadcf3']); + //Gadai + $gad1 = $gadai1[0]['bil'] + intval($gadaikawalanstok['bilgadc1']); + $gad2 = $gadai2[0]['bil'] + intval($gadaikawalanstok['bilgadc2']); + $gad3 = $gadai3[0]['bil'] + intval($gadaikawalanstok['bilgadc3']); + $gadpinj1 = $gadai1[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc1']); + $gadpinj2 = $gadai2[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc2']); + $gadpinj3 = $gadai3[0]['pinj'] + floatval($gadaikawalanstok['pinjgadc3']); - // $gadai1[0]['bil'] = $gad1; - // $gadai1[0]['pinj'] = $gadpinj1; - // $gadai2[0]['bil'] = $gad2; - // $gadai2[0]['pinj'] = $gadpinj2; - // $gadai3[0]['bil'] = $gad3; - // $gadai3[0]['pinj'] = $gadpinj3; + $gadai1[0]['bil'] = $gad1; + $gadai1[0]['pinj'] = $gadpinj1; + $gadai2[0]['bil'] = $gad2; + $gadai2[0]['pinj'] = $gadpinj2; + $gadai3[0]['bil'] = $gad3; + $gadai3[0]['pinj'] = $gadpinj3; - // //Tebus + //Tebus - // $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['biltebcf1']); - // $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['biltebcf2']); - // $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['biltebcf3']); - // $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf1']); - // $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf2']); - // $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjtebcf3']); + $teb1 = $tebus1[0]['bil'] + intval($gadaikawalanstok['biltebc1']); + $teb2 = $tebus2[0]['bil'] + intval($gadaikawalanstok['biltebc2']); + $teb3 = $tebus3[0]['bil'] + intval($gadaikawalanstok['biltebc3']); + $tebpinj1 = $tebus1[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc1']); + $tebpinj2 = $tebus2[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc2']); + $tebpinj3 = $tebus3[0]['pinj'] + floatval($gadaikawalanstok['pinjtebc3']); - // $tebus1[0]['bil'] = $teb1; - // $tebus1[0]['pinj'] = $tebpinj1; - // $tebus2[0]['bil'] = $teb2; - // $tebus2[0]['pinj'] = $tebpinj2; - // $tebus3[0]['bil'] = $teb3; - // $tebus3[0]['pinj'] = $tebpinj3; + $tebus1[0]['bil'] = $teb1; + $tebus1[0]['pinj'] = $tebpinj1; + $tebus2[0]['bil'] = $teb2; + $tebus2[0]['pinj'] = $tebpinj2; + $tebus3[0]['bil'] = $teb3; + $tebus3[0]['pinj'] = $tebpinj3; - // //Lelong + //Lelong - // $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['billelcf1']); - // $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['billelcf2']); - // $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['billelcf3']); - // $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf1']); - // $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf2']); - // $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjlelcf3']); + $lel1 = $lelong1[0]['bil'] + intval($gadaikawalanstok['billelc1']); + $lel2 = $lelong2[0]['bil'] + intval($gadaikawalanstok['billelc2']); + $lel3 = $lelong3[0]['bil'] + intval($gadaikawalanstok['billelc3']); + $lelpinj1 = $lelong1[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc1']); + $lelpinj2 = $lelong2[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc2']); + $lelpinj3 = $lelong3[0]['pinj'] + floatval($gadaikawalanstok['pinjlelc3']); - // $lelong1[0]['bil'] = $lel1; - // $lelong1[0]['pinj'] = $lelpinj1; - // $lelong2[0]['bil'] = $lel2; - // $lelong2[0]['pinj'] = $lelpinj2; - // $lelong3[0]['bil'] = $lel3; - // $lelong3[0]['pinj'] = $lelpinj3; + $lelong1[0]['bil'] = $lel1; + $lelong1[0]['pinj'] = $lelpinj1; + $lelong2[0]['bil'] = $lel2; + $lelong2[0]['pinj'] = $lelpinj2; + $lelong3[0]['bil'] = $lel3; + $lelong3[0]['pinj'] = $lelpinj3; - // } + } } From d78a41adfb0ad40c318d8f13b28ca42f059490a2 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 8 Jun 2021 10:26:00 +0800 Subject: [PATCH 06/13] fix dashboard skit tapi xsiap lg --- app/Http/Controllers/KomuditiController.php | 8 ++++++++ routes/web.php | 1 + 2 files changed, 9 insertions(+) diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php index 7a2b395..d3a5119 100644 --- a/app/Http/Controllers/KomuditiController.php +++ b/app/Http/Controllers/KomuditiController.php @@ -22,6 +22,14 @@ class KomuditiController extends Controller return response()->json($komuditi); } + public function checkKomuditiDateChoose(Request $request){ + $current = Carbon::now(); + $current = new Carbon(); + + $komuditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$request->tarikh)->orderBy('created_at','desc')->first(); + return response()->json($komuditi); + } + public function checkKomuditiDashboard(){ $current = Carbon::now(); $current = new Carbon(); diff --git a/routes/web.php b/routes/web.php index 080e468..6e61b54 100644 --- a/routes/web.php +++ b/routes/web.php @@ -406,6 +406,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Komuditi Pukal $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']); + $router->get('komuditi/checkdate',['uses'=>'KomuditiController@checkKomuditiDateChoose']); $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']); $router->post('komuditi/jual',['uses'=>'KomuditiController@jualKomuditi']); $router->put('komuditi/update',['uses'=>'KomuditiController@updateKomuditi']); From 6d9e6fb178715f83ad0a4802982879e4182c3181 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 8 Jun 2021 14:17:24 +0800 Subject: [PATCH 07/13] fix upah skit2 --- app/Http/Controllers/GadaiController.php | 1 + app/Http/Controllers/TebusController.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 6ac9f85..b3db0a6 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -568,6 +568,7 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('t_gadai','>=',$request->mula) ->where('t_gadai','<=',$request->akhir) + ->orderBy('teller') ->orderBy('t_gadai','asc') ->orderBy('sirig','asc') ->get(); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index e11ada1..db9cdec 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -507,6 +507,7 @@ class TebusController extends Controller $tebus = Tebus::on($cawangan['mysql']) ->where('t_tebus','>=',$request->mula) ->where('t_tebus','<=',$request->akhir) + ->orderBy('teller') ->orderBy('t_tebus','asc') ->orderBy('sirit','asc') ->get(); @@ -740,7 +741,8 @@ class TebusController extends Controller $listadvansur = Advansur::on($cawangan['mysql']) ->where('tarikh','>=',$request->mula) ->where('tarikh','<=',$request->akhir) - ->orderBy('tarikh','desc') + ->orderBy('teller') + ->orderBy('tarikh','asc') ->get(); return response()->json($listadvansur,200); From c785af06b3f481e11789654441e78eb021d5f91e Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 9 Jun 2021 17:00:38 +0800 Subject: [PATCH 08/13] changes for keuntungan imbangduga --- app/Http/Controllers/TebusController.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index db9cdec..39de13d 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1032,14 +1032,27 @@ class TebusController extends Controller $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') + ->where('t.trans_type','!=','A') // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - $total = $keuntungan + $keuntunganreducing; + $keuntunganansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') + ->where('t.trans_type','=','A') + // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $total = $keuntungan + $keuntunganreducing + $keuntunganansuran; return response($total); } From 5e578a1a9ab8f5aac5230508cd5321a38eac5a1f Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 9 Jun 2021 17:29:32 +0800 Subject: [PATCH 09/13] fix imbangduga --- app/Http/Controllers/TebusController.php | 35 ++++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 39de13d..39455d8 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1030,11 +1030,25 @@ class TebusController extends Controller ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); + $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') - ->where('t.trans_type','!=','A') - // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + + + $keuntunganreducinga = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->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('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) @@ -1043,16 +1057,25 @@ class TebusController extends Controller $keuntunganansuran = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->join('transaction as t','transaksi_keuntungan.norujukan','=','t.norujukan') - ->where('t.trans_type','=','A') - // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) + ->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('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); + dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran); + + $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran); + dd($total); $total = $keuntungan + $keuntunganreducing + $keuntunganansuran; + // $total = $keuntungan + $keuntunganreducing; + return response($total); } From b4e82cc58ce1df77f4e1255981981a8d248603c0 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 10 Jun 2021 09:41:40 +0800 Subject: [PATCH 10/13] fix imbang duga untung rugi --- app/Http/Controllers/TebusController.php | 57 ++++++++++++------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 39455d8..971aceb 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1015,17 +1015,15 @@ class TebusController extends Controller $daterequest = new Carbon($request->tarikh); $daterequest->addDays(1); - $dateSM = new Carbon('2021-04-24'); - $dateSM->addDays(1); + $dateSM = '2021-04-24'; $current = Carbon::now(); $current = new Carbon(); $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) - ->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); @@ -1033,15 +1031,14 @@ class TebusController extends Controller $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - - $keuntunganreducinga = TransaksiKeuntungan::on('mysql7') + $bukanansuran = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->leftJoin('transaction as trans', function($join) { @@ -1049,31 +1046,35 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','!=','A') - ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + // ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - $keuntunganansuran = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->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('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) - ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) - ->whereYear('tarikh_bayaran','=',$current->year) - ->whereNotNull('db2.hargajualan') - ->sum('bayaran_keuntungan'); + $ansuran = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->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('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + // ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); - dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran); + dd($keuntunganreducing,$keuntungan,$bukanansuran,$ansuran); - $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran); - dd($total); - $total = $keuntungan + $keuntunganreducing + $keuntunganansuran; + // $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran); + // dd($total); + // $total = $keuntungan + $keuntunganreducing + $keuntunganansuran; // $total = $keuntungan + $keuntunganreducing; From 43cc37bfac79c9e74bcdaeb07eee201f28e8ce75 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 14 Jun 2021 15:54:04 +0800 Subject: [PATCH 11/13] fix imbang duga skit2 je --- app/Http/Controllers/GadaiController.php | 9 +++++++++ app/Http/Controllers/LaporanController.php | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 905ec31..9ac15fc 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2277,6 +2277,15 @@ class GadaiController extends Controller case '020306': $tarikhtawarruq = '2021-06-08'; break; + case '010311': + $tarikhtawarruq = '2021-06-13'; + break; + case 'GC': + $tarikhtawarruq = '2021-06-13'; + break; + case 'JLI': + $tarikhtawarruq = '2021-06-13'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index beb7d68..0b601d8 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -375,7 +375,11 @@ class LaporanController extends Controller ->where('glcode','=','7000/201') ->sum('amaun'); - $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul)]; + $kerugianlelongxtra = GlCode::on($cawangan['mysql']) + ->where('glcode','=','3000/120') + ->sum('amaun'); + + $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; return response()->json($arrayxtra); } From 42b83449f13fbb59dd8b6fbed949d63fc0f0cd5a Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 20 Jun 2021 11:25:23 +0800 Subject: [PATCH 12/13] fix penebusan rekod bayaran upah serahan kemaskini --- app/Http/Controllers/GadaiController.php | 16 +++++- app/Http/Controllers/GlejerController.php | 6 +-- app/Http/Controllers/LelongController.php | 5 +- app/Http/Controllers/TebusController.php | 60 +++++------------------ app/Http/Controllers/VaultController.php | 2 +- routes/web.php | 2 - 6 files changed, 35 insertions(+), 56 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 9ac15fc..2c4d88d 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -554,8 +554,14 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Gadai::on($cawangan['mysql']) - ->where('t_gadai','=',$tarikh) - ->orderBy('teller') + ->select('Gadai.t_gadai','Gadai.norujukan','cust.nama','Gadai.nokp','Gadai.semakbarcode','Gadai.masa','Gadai.berat','Gadai.nilaimarhun','Gadai.pinjaman','Gadai.upah12','Gadai.percentpinj','cust.alamat1','Gadai.teller') + ->join('Customer as cust', function($join) + { + $join->on('Gadai.nokp', '=', 'cust.kpbaru'); + $join->orOn('Gadai.nokp', '=', 'cust.kplama'); + }) + ->where('Gadai.t_gadai','=',$tarikh) + ->orderBy('Gadai.teller') ->get(); return response()->json($gadai); @@ -2286,6 +2292,12 @@ class GadaiController extends Controller case 'JLI': $tarikhtawarruq = '2021-06-13'; break; + case '010621': + $tarikhtawarruq = '2021-06-15'; + break; + case 'ARP': + $tarikhtawarruq = '2021-06-15'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) diff --git a/app/Http/Controllers/GlejerController.php b/app/Http/Controllers/GlejerController.php index add1b48..2505a32 100644 --- a/app/Http/Controllers/GlejerController.php +++ b/app/Http/Controllers/GlejerController.php @@ -39,10 +39,10 @@ class GlejerController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $db=$cawangan['mysql']; - - $glejer=DB::connection($db)->select("SELECT glcode, descpt , SUM(debit)AS total_debit, SUM(kredit) AS total_kredit, SUM(hariini) AS totalharini FROM glejer where tarikh BETWEEN '".$tarikh1."' and '".$tarikh2."' GROUP BY glcode,descpt ORDER BY glcode asc"); + + $glejer=DB::connection($db)->select( "SELECT glcode, descpt , SUM(debit)AS total_debit, SUM(kredit) AS total_kredit, SUM(hariini) AS totalharini FROM glejer where tarikh BETWEEN '".$tarikh1."' and '".$tarikh2."' GROUP BY glcode,descpt ORDER BY glcode asc" ); return response()->json($glejer); - + } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5230f2f..f5b61c5 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -196,7 +196,10 @@ class LelongController extends Controller ->where('baki','<',0) ->sum('baki'); - $rugitotal=$rugilelong + $ansrugi; + $rugitotal=$rugilelong + $ansrugi; + + if($kodcaw == 'APM') + $bakilelong += 4498.1; $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index d7bffd9..96ccf44 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -494,22 +494,15 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->where('t_tebus','=',$tarikh) - ->orderBy('teller') - ->get(); - - return response()->json($tebus); - } - - public function getLaporanTebusRange($kodcaw,Request $request){ - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - - $tebus = Tebus::on($cawangan['mysql']) - ->where('t_tebus','>=',$request->mula) - ->where('t_tebus','<=',$request->akhir) - ->orderBy('teller') - ->orderBy('t_tebus','asc') - ->orderBy('sirit','asc') + ->select('tebus.t_tebus', 'gad.t_gadai','Tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg') + ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') + ->join('Customer as cust', function($join) + { + $join->on('gad.nokp', '=', 'cust.kpbaru'); + $join->orOn('gad.nokp', '=', 'cust.kplama'); + }) + ->where('Tebus.t_tebus','=',$tarikh) + ->orderBy('Tebus.teller') ->get(); return response()->json($tebus); @@ -543,36 +536,6 @@ class TebusController extends Controller return response()->json($array_penebusan); } - public function getLaporanTebusPengasinganRange($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->mula) - ->where('t_tebus','<=',$request->akhir) - ->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->mula) - ->where('t_tebus','<=',$request->akhir) - ->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(); @@ -1066,7 +1029,10 @@ class TebusController extends Controller ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $total = ($keuntungan+$keuntunganreducing + $ansuran + $bukanansuran); + + $total = $bukanansuran + $ansuran + $keuntungan; + + // $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); return response($total); } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index eac632c..4625997 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -321,7 +321,7 @@ class VaultController extends Controller //Sebelum Tawarruq - if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM') + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621') { $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) diff --git a/routes/web.php b/routes/web.php index 9fafd36..90a2ac4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -94,9 +94,7 @@ $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('tebuslaporanRange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusRange']); $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']); - $router->get('tebuslaporanjenistawarruqrange/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasinganRange']); //Maintenance API TEBUS // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']); From 12408dbdd14f46cc0e2e3ade7259e54c94626f55 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 20 Jun 2021 15:30:28 +0800 Subject: [PATCH 13/13] fix conflict --- app/Http/Controllers/LaporanController.php | 3 +-- app/Http/Controllers/TebusController.php | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 0b601d8..c6a5197 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -49,10 +49,9 @@ class LaporanController extends Controller ->whereDate('trans.created_at','=',$request->tarikh) ->where('trans.trans_type','=','A') ->groupBy('trans.id') - ->sum('keuntungan_rebet'); + ->sum('bayaran_keuntungan'); // $total_ansuran = number_format($total_ansuran,2); - $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 96ccf44..a0d3952 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1003,7 +1003,7 @@ class TebusController extends Controller $bukanansuran = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->leftJoin('transaction as trans', function($join) + ->join('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); @@ -1017,7 +1017,7 @@ class TebusController extends Controller $ansuran = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->leftJoin('transaction as trans', function($join) + ->join('transaction as trans', function($join) { $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); @@ -1032,8 +1032,6 @@ class TebusController extends Controller $total = $bukanansuran + $ansuran + $keuntungan; - // $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); - return response($total); }