From 51eec259ad71ed11c1d85d4082354abc6c65c863 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 3 Jun 2021 12:08:34 +0800 Subject: [PATCH 01/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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/33] 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 c620d015d91472470a87597ef62615f3976bfe39 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Sun, 20 Jun 2021 15:18:43 +0800 Subject: [PATCH 13/33] server --- app/Http/Controllers/CustomerController.php | 2 +- app/Http/Controllers/GadaiController.php | 18 +++++++++ app/Http/Controllers/LaporanController.php | 13 +++++-- app/Http/Controllers/TebusController.php | 42 ++++++++++++++++++--- app/Http/Controllers/VaultController.php | 2 +- routes/web.php | 4 +- 6 files changed, 67 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index ca57849..ab8f95a 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -300,7 +300,7 @@ class CustomerController extends Controller // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Customer::on('mysql7') - ->where('tarikhdaftar','=',$tarikh) + ->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]]) ->orderBy('tarikhdaftar', 'desc') ->get(); diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index af65b0e..7aa80a0 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2196,6 +2196,24 @@ class GadaiController extends Controller case 'WB': $tarikhtawarruq = '2021-05-24'; break; + case 'APM': + $tarikhtawarruq = '2021-06-08'; + break; + case 'ARM': + $tarikhtawarruq = '2021-06-08'; + break; + 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 6fd78a8..b4e27c2 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -60,7 +60,7 @@ class LaporanController extends Controller $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count(); $bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count(); $bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count(); - $bilangan_customer_baru = Customer::on('mysql7')->where('tarikhdaftar','=',$request->tarikh)->count(); + $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count(); //c /* Sistem */ @@ -252,8 +252,9 @@ class LaporanController extends Controller public function CalcXtra($kodcaw,Request $request) { - $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $upahsimpan = GlCode::on($cawangan['mysql']) ->where('glcode','=','5000/413') ->sum('amaun'); @@ -261,12 +262,16 @@ class LaporanController extends Controller $bakilelongxtra = GlCode::on($cawangan['mysql']) ->where('glcode','=','7000/190') ->sum('amaun'); - + $untungrugiterkumpul = GlCode::on($cawangan['mysql']) ->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); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 3b3fb1b..49c77de 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -936,8 +936,10 @@ class TebusController extends Controller $daterequest = new Carbon($request->tarikh); $daterequest->addDays(1); - $dateSM = new Carbon('2021-04-24'); - $dateSM->addDays(1); + //$dateSM = new Carbon('2021-04-24'); + //$dateSM->addDays(1); + + $dateSM = '2021-04-24'; $current = Carbon::now(); $current = new Carbon(); @@ -945,8 +947,8 @@ class TebusController extends Controller $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'); @@ -954,13 +956,41 @@ 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' ,'>=', $datetawarruq) - ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) + ->where('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - $total = $keuntungan + $keuntunganreducing; + $bukanansuran = 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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + $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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $total = ($keuntungan+$keuntunganreducing + $ansuran + $bukanansuran); return response($total); } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index d3985ad..eac632c 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') + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM') { $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) diff --git a/routes/web.php b/routes/web.php index ae1e4b3..b858815 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 @@ -489,4 +489,4 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->get('komoditi/jumlah/baki',['uses'=>'KomuditiController@jumlahKomoditiDashboard']); $router->post('komoditi/statistik',['uses'=>'KomuditiController@statistikKomoditiDashboard']); -}); \ No newline at end of file +}); From 12408dbdd14f46cc0e2e3ade7259e54c94626f55 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 20 Jun 2021 15:30:28 +0800 Subject: [PATCH 14/33] 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); } From 53dd80daac855b79c70978a3df8bc2f51d96b78a Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 29 Jun 2021 10:09:16 +0800 Subject: [PATCH 15/33] biasa --- app/Http/Controllers/GadaiController.php | 69 +++++++++++ app/Http/Controllers/LaporanController.php | 12 +- app/Http/Controllers/LelongController.php | 11 ++ app/Http/Controllers/PanjarController.php | 6 + app/Http/Controllers/TebusController.php | 15 ++- app/Http/Controllers/VaultController.php | 138 ++++++++++++++++++++- routes/web.php | 35 +++++- 7 files changed, 274 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2c4d88d..90473a3 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -74,8 +74,11 @@ class GadaiController extends Controller } public function showOneGadaiByNorujukan($norujukan){ + $cawangan_all = Cawangan::on('mysql7')->get(); + $gadai_all = []; + foreach($cawangan_all as $index=>$cawangan){ $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get(); if(sizeof($gadai) != 0){ @@ -83,6 +86,7 @@ class GadaiController extends Controller } } + return response()->json($gadai_all); } @@ -2298,6 +2302,42 @@ class GadaiController extends Controller case 'ARP': $tarikhtawarruq = '2021-06-15'; break; + case '010621': + $tarikhtawarruq = '2021-06-21'; + break; + case '010136': + $tarikhtawarruq = '2021-06-20'; + break; + case '011235': + $tarikhtawarruq = '2021-06-21'; + break; + case '011227': + $tarikhtawarruq = '2021-06-21'; + break; + case '010620': + $tarikhtawarruq = '2021-06-21'; + break; + case '010617': + $tarikhtawarruq = '2021-06-21'; + break; + case '010915': + $tarikhtawarruq = '2021-06-22'; + break; + case '011228': + $tarikhtawarruq = '2021-06-22'; + break; + case '010219': + $tarikhtawarruq = '2021-06-22'; + break; + case '011229': + $tarikhtawarruq = '2021-06-22'; + break; + case '011013': + $tarikhtawarruq = '2021-06-23'; + break; + case '011412': + $tarikhtawarruq = '2021-06-23'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) @@ -2376,6 +2416,35 @@ class GadaiController extends Controller return response()->json($totalkeuntungan,200); } + public function CalculationKeuntunganLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $keuntungan = Gadai::on($cawangan['mysql']) + ->where('t_gadai','>=',$request->mula) + ->where('t_gadai','<=',$request->hingga) + ->where('hargajualan','<>','null') + ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['t_gadai','>=','2021-04-14']]) + ->whereNotNull('upah12') + ->sum('upah12'); + + $transaksi = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + + $totalkeuntungan = $keuntungan - $transaksi; + + return response()->json($totalkeuntungan,200); + } + public function CalculationBayaranPendahuluan($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index cf17956..bce3ce8 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -379,7 +379,17 @@ class LaporanController extends Controller ->where('glcode','=','3000/120') ->sum('amaun'); - $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; + if($kodcaw == '011229') + { + $peruntukanhapuskira = GlCode::on($cawangan['mysql']) + ->where('glcode','=','1000/015') + ->sum('amaun'); + }else{ + $peruntukanhapuskira = 0; + } + + + $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; return response()->json($arrayxtra); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f5b61c5..75000fc 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -201,6 +201,17 @@ class LelongController extends Controller if($kodcaw == 'APM') $bakilelong += 4498.1; + if($kodcaw == '010617') + $rugitotal -= 6.1; + + if($kodcaw == '011229'){ + $rugitotal -= 919.7; + $bakilelong -= 144; + } + + if($kodcaw == '011412') + $rugitotal -= 7248.4; + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; return response()->json($arraylelong,200); diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index 1add74b..fc5b93d 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -140,6 +140,12 @@ class PanjarController extends Controller ->whereYear('tarikh','=',$current->year) ->sum('bayaran'); + if($kodcaw == 'APM') + { + $perubatan = $perubatan - 10; + $baikidanselenggara = $baikidanselenggara - 10; + } + $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian]; return response()->json($arraycalculation); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 57f43c7..5c0aeda 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -954,6 +954,9 @@ class TebusController extends Controller $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter; + + if($kodcaw == '011229') + $total -= 45390.37; return response()->json($total,200); @@ -994,7 +997,7 @@ class TebusController extends Controller $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') @@ -1008,8 +1011,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','!=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); @@ -1022,8 +1026,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 4625997..63be5e0 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' || $kodcaw == '010621') + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') { $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) @@ -398,6 +398,142 @@ class VaultController extends Controller ->where('glcode','=',$serahankoperasi) ->sum('amaun'); + if($kodcaw == '011229') + $totalserahan -= 0.10; + + if($kodcaw == '011013') + $totalserahan += 641000; + + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; + + return response()->json($arraypend); + } + + + public function CalculationPendahuluanSerahanLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $serahanpkb = '1000/020'; + $serahanjmc = '1000/026'; + $pendahuluanpkb = '7000/102'; + $pendahuluanjmc = '7000/106'; + $serahankoperasi = '1000/090'; + + $mula = $request->mula; + $hingga = $request->hingga; + + //Selepas Tawarruq + + $serahanpkbTawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2021-03-24') + ->sum('serahan'); + + //Sebelum Tawarruq + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') + { + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); + + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanjmc) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); + + + if($mula <= '2013-12-31') + { + $serahanpkblama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_pkb'); + + $serahanjmclama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_jmc'); + + $totaljmc = $serahanJMC + $serahanjmclama; + $totalpkb = $serahanpkb + $serahanpkblama; + + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + }else{ + + $totaljmc = $serahanJMC; + $totalpkb = $serahanpkb; + + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + } + + + }else{ + + if($kodcaw == '020301') + $serahanbaru = '1000/030'; + else + $serahanbaru = '1000/026'; + + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->sum('amaun'); + + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanbaru) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->sum('amaun'); + + $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC; + } + + //Selepas Tawarruq + + $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']]) + ->sum('pendahuluan'); + + //Sebelum Tawarruq + + $pendahuluanPKB = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']]) + ->sum('amaun'); + + $pendahuluanJMC = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=','7000/106') + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']]) + ->sum('amaun'); + + if($mula <= '2013-12-31') + { + $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql']) + ->sum('pendahuluan_pkb'); + + $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql']) + ->sum('pendahuluan_jmc'); + + $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC; + + $pindahkekpkb = GlCode::on($cawangan['mysql']) + ->where('glcode','=',$serahankoperasi) + ->sum('amaun'); + }else{ + + $total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC; + + $pindahkekpkb = 0; + + } + + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; return response()->json($arraypend); diff --git a/routes/web.php b/routes/web.php index d7e4a61..af862d3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -387,13 +387,38 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira - //-- Untung Rugi --// - $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar + //LEJER AM// + + //Dua-Dua Table + $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan + $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + // $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + + // //-- Harta Semasa --// + // $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi + // $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq + // $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq + + // $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan + // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan + + // //-- Tanggungan Semasa --// + // $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar + // $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong + // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut + // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut + // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun + // $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar + // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun + // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun + // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira + // $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra - - - //END IMBANG DUGA// + // //-- Untung Rugi --// + // $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); + + //END IMBANG DUGA & LEJER AM// //ADDED LEJER AM From a8dde4715faa0ff7d43249e31adf7642884bb31f Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 4 Jul 2021 09:00:01 +0800 Subject: [PATCH 16/33] lejer am fix --- app/Http/Controllers/GadaiController.php | 140 ++++++++++++++++++++++ app/Http/Controllers/LelongController.php | 64 ++++++++++ app/Http/Controllers/PanjarController.php | 45 +++++++ app/Http/Controllers/TebusController.php | 111 +++++++++++++++++ app/Http/Controllers/VaultController.php | 44 +++++++ routes/web.php | 20 ++-- 6 files changed, 415 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 90473a3..745824c 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2364,6 +2364,109 @@ class GadaiController extends Controller return response()->json($array_rekodemas); } + public function CalculationPinjamanDiberiLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $tarikhtawarruq = ''; + + switch ($kodcaw) { + case 'KB2': + $tarikhtawarruq = '2021-04-13'; + break; + case 'WCY': + $tarikhtawarruq = '2021-05-04'; + break; + case '1STOP': + $tarikhtawarruq = '2021-05-09'; + break; + case '020301': + $tarikhtawarruq = '2021-05-18'; + break; + case 'ALS': + $tarikhtawarruq = '2021-05-24'; + break; + case 'WB': + $tarikhtawarruq = '2021-05-24'; + break; + case 'APM': + $tarikhtawarruq = '2021-06-08'; + break; + case 'ARM': + $tarikhtawarruq = '2021-06-08'; + break; + 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; + case '010621': + $tarikhtawarruq = '2021-06-15'; + break; + case 'ARP': + $tarikhtawarruq = '2021-06-15'; + break; + case '010621': + $tarikhtawarruq = '2021-06-21'; + break; + case '010136': + $tarikhtawarruq = '2021-06-20'; + break; + case '011235': + $tarikhtawarruq = '2021-06-21'; + break; + case '011227': + $tarikhtawarruq = '2021-06-21'; + break; + case '010620': + $tarikhtawarruq = '2021-06-21'; + break; + case '010617': + $tarikhtawarruq = '2021-06-21'; + break; + case '010915': + $tarikhtawarruq = '2021-06-22'; + break; + case '011228': + $tarikhtawarruq = '2021-06-22'; + break; + case '010219': + $tarikhtawarruq = '2021-06-22'; + break; + case '011229': + $tarikhtawarruq = '2021-06-22'; + break; + case '011013': + $tarikhtawarruq = '2021-06-23'; + break; + case '011412': + $tarikhtawarruq = '2021-06-23'; + break; + } + + $rekod_emaspalsu = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',1) + ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']]) + ->sum('pinjaman'); + + $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',0) + ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) + ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]]) + ->sum('pinjaman'); + + $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; + + return response()->json($array_rekodemas); + } + public function CalculationPembiayaanTawarruq($kodcaw,Request $request) { @@ -2378,6 +2481,20 @@ class GadaiController extends Controller return response()->json($rekod_pinjamandiberi); } + public function CalculationPembiayaanTawarruqLejer($kodcaw,Request $request) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',0) + ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) + ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) + ->sum('pinjaman'); + + return response()->json($rekod_pinjamandiberi); + } + public function CalculationKeuntungan($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); @@ -2465,6 +2582,29 @@ class GadaiController extends Controller return response($transaksi); } + public function CalculationBayaranPendahuluanLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $datetawarruq = new Carbon('2021-04-14'); + $datemula = new Carbon($request->mula); + $datemula->addDays(1); + + $datehingga = new Carbon($request->hingga); + $datehingga->addDays(1); + + $current = Carbon::now(); + $current = new Carbon(); + + $transaksi = 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]]) + ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->sum('bayaran_pembiayaan'); + + return response($transaksi); + } + public function LaporanAuditAktif($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 75000fc..a69250f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -217,6 +217,70 @@ class LelongController extends Controller return response()->json($arraylelong,200); } + public function BakiLelongCalculationLejer($kodcaw,Request $request) + { + + $tarikhbaru = $request->mula; + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + if($kodcaw == 'KB2') + { + if($request->tarikh <= '2021-02-25') + { + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','>=',0) + ->sum('baki'); + }else{ + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>','2021-02-25'); + }) + ->where('baki','>=',0) + ->sum('baki'); + } + }else{ + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','>=',0) + ->sum('baki'); + } + + $ansrugi = AnsRugi::on($cawangan['mysql']) + ->sum('bayaran'); + + $rugilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru) + { + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','<',0) + ->sum('baki'); + + // $rugitotal = $rugilelong + $ansrugi; + $rugitotal = $rugilelong; + + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; + + return response()->json($arraylelong,200); + } + public function BilAkanDilelong($noic) { $cawangan_all = Cawangan::on('mysql7')->get(); diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index fc5b93d..acbd576 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -152,5 +152,50 @@ class PanjarController extends Controller } + public function calculationpanjarLejer(Request $request,$kodcaw) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon($request->tarikh); + + + + $baikidanselenggara = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 2) + ->sum('bayaran'); + + $perubatan = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 1) + ->sum('bayaran'); + + $keraian = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 3) + ->sum('bayaran'); + + + + if($kodcaw == 'APM') + { + $perubatan = $perubatan - 10; + $baikidanselenggara = $baikidanselenggara - 10; + } + + $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian]; + + return response()->json($arraycalculation); + + } + } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5c0aeda..9e8baa9 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -868,6 +868,56 @@ class TebusController extends Controller return response()->json($total,200); } + public function calculationKeuntunganSebenarLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = new Carbon($request->tarikh); + + $total = 0; + $keuntunganselepastawarruq = 0; + $keuntungansebelumtawarruq = 0; + + $daterequest = new Carbon($request->tarikh); + $daterequest->addDays(1); + + //Keuntungan Selepas Tawarruq + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->whereNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $upahtebus = Tebus::on($cawangan['mysql']) + ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']]) + ->whereYear('t_tebus','=',$current->year) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($cawangan['mysql']) + ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']]) + ->whereYear('t_jual','=',$current->year) + ->sum('bakiupah'); + + $upahansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','>=',$request->mula) + ->where('tarikh','<=',$request->hingga) + ->whereYear('tarikh','=',$current->year) + ->sum('upahdibayar'); + + + $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur; + + // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; + + // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq; + + $total = $keuntungansebelumtawarruq + $keuntungan; + + return response()->json($total,200); + } + public function calculationUntungRugiTerkumpul($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -1038,6 +1088,52 @@ class TebusController extends Controller return response($total); } + public function untungrugicalculationLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + // $datetawarruq = new Carbon('2021-04-14'); + $daterequest = new Carbon($request->tarikh); + $daterequest->addDays(1); + + $dateSM = '2021-04-24'; + + $current = Carbon::now(); + $current = new Carbon(); + + $bukanansuran = 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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + $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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $total = ($ansuran + $bukanansuran); + + return response($total); + } + public function RebetCalculation($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); @@ -1053,4 +1149,19 @@ class TebusController extends Controller return response($rebet); } + public function RebetCalculationLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $rebet = Tebus::on($cawangan['mysql']) + ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan') + ->where('tebus.t_tebus','>=',$request->mula) + ->where('tebus.t_tebus','<=',$request->hingga) + ->where('db2.hargajualan','>','0') + ->whereNotNull('db2.hargajualan') + ->sum('rebate'); + + return response($rebet); + } + } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 63be5e0..151e93e 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -276,6 +276,50 @@ class VaultController extends Controller return response()->json($totalbakiakhirtunai); } + public function TunaiDiTanganLejer($kodcaw,Request $request) + { + + + $current = Carbon::now(); + $current = new Carbon(); + + $totalbakiakhirtunai = 0; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $vault=Vault::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->orderby('tarikh','desc')->first(); + + $tunai = Tunai::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->get(); + + $total = 0; + foreach($tunai as $index=>$money) + { + $total+=$money['baki']; + } + + + if($total != 0) + { + $totalmasuk = $vault['masuk'] + $vault['pendahuluan'] + $total; + }else + { + $totalmasuk = $vault['masuk']; + } + + $totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar']; + + $arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar]; + + return response()->json($arraytunaiditangan,200); + } + public function laporanPetiBesi($kodcaw,$tarikh) { diff --git a/routes/web.php b/routes/web.php index af862d3..5fb6807 100644 --- a/routes/web.php +++ b/routes/web.php @@ -392,23 +392,23 @@ $router->group(['prefix'=>'api'], function () use ($router){ //Dua-Dua Table $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru - // $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru // //-- Harta Semasa --// - // $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi - // $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq - // $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq + $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi + $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq + $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq - // $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan + $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan // //-- Tanggungan Semasa --// - // $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar - // $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong + $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar + $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun - // $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar + $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira @@ -416,7 +416,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ // //-- Untung Rugi --// - // $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); + $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); + $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); + //END IMBANG DUGA & LEJER AM// From 8db8f17ed8d0d26ded536f0b237b982f114e48db Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 4 Jul 2021 15:32:26 +0800 Subject: [PATCH 17/33] fix lejer am --- app/Http/Controllers/GadaiController.php | 69 ++++++++++++++-------- app/Http/Controllers/LaporanController.php | 5 +- app/Http/Controllers/TebusController.php | 43 ++++++++++++-- config/database.php | 33 +++++++++++ 4 files changed, 118 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 745824c..083c67a 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -558,14 +558,15 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Gadai::on($cawangan['mysql']) - ->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) + ->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('online_arrahn.customer as cust', function($join) { - $join->on('Gadai.nokp', '=', 'cust.kpbaru'); - $join->orOn('Gadai.nokp', '=', 'cust.kplama'); + $join->on('gadai.nokp', '=', 'cust.kpbaru'); + $join->orOn('gadai.nokp', '=', 'cust.kplama'); }) - ->where('Gadai.t_gadai','=',$tarikh) - ->orderBy('Gadai.teller') + ->where('gadai.t_gadai','=',$tarikh) + ->orderBy('gadai.teller') + ->orderBy('gadai.sirig') ->get(); return response()->json($gadai); @@ -2338,7 +2339,16 @@ class GadaiController extends Controller case '011412': $tarikhtawarruq = '2021-06-23'; break; - } + case '011234': + $tarikhtawarruq = '2021-06-22'; + break; + case '020303': + $tarikhtawarruq = '2021-06-23'; + break; + case '010618': + $tarikhtawarruq = '2021-06-23'; + break; + } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) @@ -2451,18 +2461,20 @@ class GadaiController extends Controller break; } - $rekod_emaspalsu = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=','']]) - ->sum('pinjaman'); - - $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + $gadai = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) - ->orWhere([['sttebus','!=',''],['t_update','>',$request->mula],['t_update','<=',$request->hingga],['t_gadai','<=',$tarikhtawarruq]]) + ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]) ->sum('pinjaman'); - $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu]; + $tebus = Gadai::on($cawangan['mysql']) + ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan') + ->where('Gadai.tagpalsu','=',0) + ->where([['Gadai.t_gadai','<=',$tarikhtawarruq],['Gadai.sttebus','=','T']]) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) + ->sum('teb.pinjaman'); + + $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus]; return response()->json($array_rekodemas); } @@ -2486,12 +2498,20 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekod_pinjamandiberi = Gadai::on($cawangan['mysql']) + $Gadai = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) ->sum('pinjaman'); + $Tebus = Gadai::on($cawangan['mysql']) + ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan') + ->where('Gadai.tagpalsu','=',0) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']]) + ->sum('teb.pinjaman'); + + $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; + return response()->json($rekod_pinjamandiberi); } @@ -2548,16 +2568,17 @@ class GadaiController extends Controller ->whereNotNull('upah12') ->sum('upah12'); - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) - ->whereYear('tarikh_bayaran','=',$current->year) - ->whereNotNull('db2.hargajualan') - ->sum('bayaran_keuntungan'); + // $transaksi = TransaksiKeuntungan::on('mysql7') + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + // ->whereYear('tarikh_bayaran','=',$current->year) + // ->whereNotNull('db2.hargajualan') + // ->sum('bayaran_keuntungan'); - $totalkeuntungan = $keuntungan - $transaksi; + // $totalkeuntungan = $keuntungan - $transaksi; + $totalkeuntungan = $keuntungan; return response()->json($totalkeuntungan,200); } diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index bce3ce8..66f7748 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -264,8 +264,9 @@ class LaporanController extends Controller ->whereDate('trans.created_at','>=',$request->mula) ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.trans_type','=','A') + ->where('trans.kodcaw','=',$request->kodcaw) ->groupBy('trans.id') - ->sum('keuntungan_rebet'); + ->sum('bayaran_keuntungan'); // $total_ansuran = number_format($total_ansuran,2); @@ -304,7 +305,7 @@ class LaporanController extends Controller //h $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_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['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->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun'); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 9e8baa9..7570541 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -494,15 +494,16 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->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) + ->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('online_arrahn.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') + ->where('tebus.t_tebus','=',$tarikh) + ->orderBy('tebus.teller') + ->orderBy('tebus.sirit') ->get(); return response()->json($tebus); @@ -1036,6 +1037,34 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); + + if($request->tarikh < '2021-06-09') + { + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + + $keuntunganreducing = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + + // dd($keuntungan,$keuntunganreducing); + + $total = ($keuntungan + $keuntunganreducing); + + + }else{ + $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) @@ -1083,7 +1112,9 @@ class TebusController extends Controller ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + + } return response($total); } diff --git a/config/database.php b/config/database.php index da7a044..afbd7f8 100644 --- a/config/database.php +++ b/config/database.php @@ -16,6 +16,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql2' => [ 'driver' => 'mysql', @@ -28,6 +29,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql3' => [ 'driver' => 'mysql', @@ -40,6 +42,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql4' => [ 'driver' => 'mysql', @@ -52,6 +55,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql5' => [ 'driver' => 'mysql', @@ -64,6 +68,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -78,6 +83,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], @@ -92,6 +98,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql8' => [ 'driver' => 'mysql', @@ -104,6 +111,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql9' => [ @@ -117,6 +125,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql10' => [ 'driver' => 'mysql', @@ -129,6 +138,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql11' => [ 'driver' => 'mysql', @@ -141,6 +151,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql12' => [ @@ -154,6 +165,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql13' => [ 'driver' => 'mysql', @@ -166,6 +178,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql14' => [ 'driver' => 'mysql', @@ -178,6 +191,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql15' => [ @@ -191,6 +205,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql16' => [ 'driver' => 'mysql', @@ -203,6 +218,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql17' => [ @@ -216,6 +232,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql18' => [ 'driver' => 'mysql', @@ -228,6 +245,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql19' => [ 'driver' => 'mysql', @@ -240,6 +258,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql20' => [ 'driver' => 'mysql', @@ -252,6 +271,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql21' => [ 'driver' => 'mysql', @@ -264,6 +284,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql22' => [ @@ -277,6 +298,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql23' => [ 'driver' => 'mysql', @@ -289,6 +311,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql24' => [ @@ -302,6 +325,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql25' => [ @@ -315,6 +339,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql26' => [ 'driver' => 'mysql', @@ -327,6 +352,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql27' => [ 'driver' => 'mysql', @@ -339,6 +365,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql28' => [ @@ -352,6 +379,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql29' => [ 'driver' => 'mysql', @@ -364,6 +392,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql30' => [ 'driver' => 'mysql', @@ -376,6 +405,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql31' => [ 'driver' => 'mysql', @@ -388,6 +418,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql32' => [ 'driver' => 'mysql', @@ -400,6 +431,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'mysql33' => [ 'driver' => 'mysql', @@ -412,6 +444,7 @@ return [ 'collation' => 'utf8_unicode_ci', 'prefix' => '', 'strict' => false, + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], ], ]; From 9572d050c7256abc070ead6f44259c8317de891b Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 5 Jul 2021 09:37:47 +0800 Subject: [PATCH 18/33] fix imbang duga --- app/Http/Controllers/GadaiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 083c67a..2e17006 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2340,13 +2340,13 @@ class GadaiController extends Controller $tarikhtawarruq = '2021-06-23'; break; case '011234': - $tarikhtawarruq = '2021-06-22'; + $tarikhtawarruq = '2021-06-28'; break; case '020303': - $tarikhtawarruq = '2021-06-23'; + $tarikhtawarruq = '2021-06-29'; break; case '010618': - $tarikhtawarruq = '2021-06-23'; + $tarikhtawarruq = '2021-06-29'; break; } From b5b68d9517744760cb1ea9a3918cc807e0dd3848 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 5 Jul 2021 16:27:41 +0800 Subject: [PATCH 19/33] fix laporan --- app/Http/Controllers/GadaiController.php | 27 ++++++++++++++++++++++++ routes/web.php | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2e17006..ac8f36a 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -934,6 +934,33 @@ class GadaiController extends Controller return response()->json($gadai); } + public function getAnsuranSummary($kodcaw,Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $dateans = new Carbon($request->tarikh); + + $ansurans = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->where('transaction.kodcaw','=',$kodcaw) + ->where('transaction.trans_type','=','A') + ->whereDate('transaction.created_at','=',$dateans) + ->sum('trans.bayaran_keuntungan'); + + $transaksi = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) + ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) + ->sum('bayaran_pembiayaan'); + + $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans]; + + return response()->json($arrayansuran,200); + } + public function updateHistoryGadai($kodcaw,$norujukan,Request $request){ $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); diff --git a/routes/web.php b/routes/web.php index 5fb6807..9fe1695 100644 --- a/routes/web.php +++ b/routes/web.php @@ -198,7 +198,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //ANSURAN UPAH API - $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong + $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); + $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']); From c822c3abd3689c3396c4ca2ee477ecbf9e098554 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 6 Jul 2021 16:49:35 +0800 Subject: [PATCH 20/33] pembetulan laporan --- app/Http/Controllers/GadaiController.php | 23 +++++++++++++---------- app/Http/Controllers/TebusController.php | 3 ++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index ac8f36a..8ccf0f9 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -920,18 +920,25 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); - $gadai = Transaction::on('mysql7') + $ansuran = Transaction::on('mysql7') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); }) + ->leftJoin('customer as cust', function($join) + { + $join->on('transaction.nokp', '=', 'cust.kpbaru'); + $join->orOn('transaction.nokp', '=', 'cust.kplama'); + }) + ->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan') ->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.trans_type','=','A') ->whereDate('transaction.created_at','=',$dateans) + ->orderBy('transaction.teller') ->get(); - return response()->json($gadai); + return response()->json($ansuran); } public function getAnsuranSummary($kodcaw,Request $request){ @@ -947,16 +954,12 @@ class GadaiController extends Controller }) ->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.trans_type','=','A') - ->whereDate('transaction.created_at','=',$dateans) - ->sum('trans.bayaran_keuntungan'); + ->whereDate('transaction.created_at','=',$dateans); - $transaksi = TransaksiKeuntungan::on('mysql7') - ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) - ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'=', $dateans]]) - ->sum('bayaran_pembiayaan'); + $keuntungan = $ansurans->sum('trans.bayaran_keuntungan'); + $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan'); - $arrayansuran = ['totalpendahuluan' => $transaksi, 'totalkeuntungan' => $ansurans]; + $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan]; return response()->json($arrayansuran,200); } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 7570541..a1fca9c 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -494,13 +494,14 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->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') + ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','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('online_arrahn.customer as cust', function($join) { $join->on('gad.nokp', '=', 'cust.kpbaru'); $join->orOn('gad.nokp', '=', 'cust.kplama'); }) + ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) ->orderBy('tebus.teller') ->orderBy('tebus.sirit') From 750232c9151e6e966915578c56e20f14bb41ce1e Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 7 Jul 2021 09:14:02 +0800 Subject: [PATCH 21/33] hapus panjar --- app/DenoPanjar.php | 28 +++++++++++++ app/Http/Controllers/PanjarController.php | 50 +++++++++++++++++++++++ routes/web.php | 6 +++ 3 files changed, 84 insertions(+) create mode 100644 app/DenoPanjar.php diff --git a/app/DenoPanjar.php b/app/DenoPanjar.php new file mode 100644 index 0000000..6b18bb0 --- /dev/null +++ b/app/DenoPanjar.php @@ -0,0 +1,28 @@ +json($panjar); } + public function delete(REQUEST $request,$kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + return response('Batal Berjaya', 200); + } + public function calculationpanjar(Request $request,$kodcaw) { @@ -197,5 +208,44 @@ class PanjarController extends Controller } + public function createDenoPanjar($kodcaw,Request $request) + { + + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar=DenoPanjar::on('mysql7')->create([ + + 'tarikh' => $current->toDateString(), + 'masa' => $current->toTimeString(), + 'kodcaw' => $kodcaw, + 'kodlaluan' => $request->kodlaluan, + 'serahan' => $request->serahan, + 'bd1' => $request->bd1, + 'bd5' => $request->bd5, + 'bd10' => $request->bd10, + 'bd20' => $request->bd20, + 'bd50' => $request->bd50, + 'bd100' => $request->bd100, + 'txtring1' => $request->txtring1, + 'txtring5' => $request->txtring5, + 'txtring10' => $request->txtring10, + 'txtring20' => $request->txtring20, + 'txtring50' => $request->txtring50, + 'txtring100' => $request->txtring100, + 'txtring1000' => $request->txtring1000, + 'txtsen1' => $request->txtsen1, + 'txtsen5' => $request->txtsen5, + 'txtsen10' => $request->txtsen10, + 'txtsen20' => $request->txtsen20, + 'txtsen50' => $request->txtsen50, + 'update' => '0' + ]); + + return response()->json($denopanjar,200); + } + } diff --git a/routes/web.php b/routes/web.php index 9fe1695..b323df1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -264,6 +264,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']); // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']); $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']); + $router->post('DeletePanjar/{kodcaw}',['uses'=>'PanjarController@delete']); + //API KELULUSAN $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); @@ -288,6 +290,10 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']); + //API DENO PANJAR & DENO PEND-SERAHAN + $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']); + $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); + //API WAKIL $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); From 547f36d9a11dbe3e240a0dbf13ee7e9754856f30 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 7 Jul 2021 16:38:29 +0800 Subject: [PATCH 22/33] fix delete panjar --- app/DenoPanjar.php | 4 +-- app/Http/Controllers/GadaiController.php | 3 +- app/Http/Controllers/LaporanController.php | 18 +++++++++--- app/Http/Controllers/PanjarController.php | 33 ++++++++++++++++++++++ app/Http/Controllers/VaultController.php | 30 ++++++++++++++++++++ routes/web.php | 3 ++ 6 files changed, 84 insertions(+), 7 deletions(-) diff --git a/app/DenoPanjar.php b/app/DenoPanjar.php index 6b18bb0..72ff736 100644 --- a/app/DenoPanjar.php +++ b/app/DenoPanjar.php @@ -13,8 +13,8 @@ class DenoPanjar extends Model * * @var array */ - protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', - 'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50','jenis','recno']; + protected $fillable = ['no','kodlaluan','serahan','tarikh','masa','update','jenis','recno','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20', + 'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50']; /** * The attributes excluded from the model's JSON form. diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 8ccf0f9..61b31fa 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -958,8 +958,9 @@ class GadaiController extends Controller $keuntungan = $ansurans->sum('trans.bayaran_keuntungan'); $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan'); + $bilangan = $ansurans->count(); - $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan]; + $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan]; return response()->json($arrayansuran,200); } diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 66f7748..b54e58a 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -47,10 +47,12 @@ class LaporanController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->whereDate('trans.created_at','=',$request->tarikh) + ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') - ->groupBy('trans.id') + // ->groupBy('trans.id') ->sum('bayaran_keuntungan'); + // $total_ansuran = number_format($total_ansuran,2); $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); @@ -181,7 +183,10 @@ class LaporanController extends Controller } //g - $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah'); + $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh); + + $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('pinjaman'); @@ -205,6 +210,7 @@ class LaporanController extends Controller 'bilangan_ansuran'=>$bilangan_ansuran, 'bilangan_customer_baru'=>$bilangan_customer_baru, 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'bayar_rugi_lelong'=>$bayar_rugi_lelong, 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, @@ -265,7 +271,7 @@ class LaporanController extends Controller ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.trans_type','=','A') ->where('trans.kodcaw','=',$request->kodcaw) - ->groupBy('trans.id') + // ->groupBy('trans.id') ->sum('bayaran_keuntungan'); // $total_ansuran = number_format($total_ansuran,2); @@ -301,7 +307,10 @@ class LaporanController extends Controller } //g - $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah'); + $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]); + + $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman'); @@ -325,6 +334,7 @@ class LaporanController extends Controller 'bilangan_ansuran'=>$bilangan_ansuran, 'bilangan_customer_baru'=>$bilangan_customer_baru, 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'bayar_rugi_lelong'=>$bayar_rugi_lelong, 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index 659f911..7b0d128 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -241,11 +241,44 @@ class PanjarController extends Controller 'txtsen10' => $request->txtsen10, 'txtsen20' => $request->txtsen20, 'txtsen50' => $request->txtsen50, + 'jenis' =>$request->jenis, + 'recno' =>$request->recno, 'update' => '0' ]); return response()->json($denopanjar,200); } + public function getDenoPanjar($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar=DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); + + return response()->json($denopanjar,200); + } + + public function updateDenoPanjar($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar=DenoPanjar::on('mysql7') + ->where('recno','=', $request->recno) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + )); + + return response()->json($denopanjar,200); + } + + + } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 151e93e..f223515 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -88,6 +88,36 @@ class VaultController extends Controller return response()->json($updateVault, 200); } + public function updateVaultDeletePanjar($kodcaw, Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); + + $bakiawal = $vault['bakiawal']; + $keluar = $vault['keluar']; + $masuk = $vault['masuk']; + $bakiakhir = $vault['bakiakhir']; + $bakieod = $vault['bakieod']; + $pendahuluan = $vault['pendahuluan']; + $serahan = $vault['serahan']; + $totpanjaran = $vault['totpanjar']; + + $totalpanjar = $request->totpanjar - $totpanjaran; + + $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar; + + $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( + 'totpanjar' => $totalpanjar, + 'bakiakhir'=>$bakiakhir, + 'bakieod'=>$bakiakhir + )); + + return response()->json($updateVault, 200); + } + public function updateVaultPendahuluanSerahan($kodcaw, Request $request) { $current = Carbon::now(); diff --git a/routes/web.php b/routes/web.php index b323df1..d194f6b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -233,6 +233,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']); $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']); $router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']); + $router->put('UpdateVault/DeletePanjar/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePanjar']); $router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']); $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']); $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']); @@ -292,6 +293,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API DENO PANJAR & DENO PEND-SERAHAN $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']); + $router->post('requestdenopanjar/get/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']); + $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']); $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); //API WAKIL From 32563f1d7670898bcd88fb69ddce9712d9fe3366 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 8 Jul 2021 10:42:34 +0800 Subject: [PATCH 23/33] fix panjar --- app/Http/Controllers/PanjarController.php | 2 +- routes/web.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index 7b0d128..6e1de5f 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -256,7 +256,7 @@ class PanjarController extends Controller $current = new Carbon(); - $denopanjar=DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); + $denopanjar = DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); return response()->json($denopanjar,200); } diff --git a/routes/web.php b/routes/web.php index d194f6b..a0cae3a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -293,10 +293,12 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API DENO PANJAR & DENO PEND-SERAHAN $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']); - $router->post('requestdenopanjar/get/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']); + $router->get('getdenopanjar/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']); $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']); $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); + + //API WAKIL $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); From efcff2e4a1878ec1adf439ef450fc441a8a745a4 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 8 Jul 2021 12:22:25 +0800 Subject: [PATCH 24/33] server --- app/Http/Controllers/GadaiController.php | 62 +++++++++++++++++++--- app/Http/Controllers/LaporanController.php | 11 +++- app/Http/Controllers/LelongController.php | 13 ++++- app/Http/Controllers/TebusController.php | 39 ++++++++++---- app/Http/Controllers/VaultController.php | 8 ++- storage/app/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 10 files changed, 113 insertions(+), 20 deletions(-) mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2c4d88d..54437f2 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -554,14 +554,15 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $gadai = Gadai::on($cawangan['mysql']) - ->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) + ->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('online_arrahn.customer as cust', function($join) { - $join->on('Gadai.nokp', '=', 'cust.kpbaru'); - $join->orOn('Gadai.nokp', '=', 'cust.kplama'); + $join->on('gadai.nokp', '=', 'cust.kpbaru'); + $join->orOn('gadai.nokp', '=', 'cust.kplama'); }) - ->where('Gadai.t_gadai','=',$tarikh) - ->orderBy('Gadai.teller') + ->where('gadai.t_gadai','=',$tarikh) + ->orderBy('gadai.teller') + ->orderBy('gadai.sirig') ->get(); return response()->json($gadai); @@ -2298,6 +2299,55 @@ class GadaiController extends Controller case 'ARP': $tarikhtawarruq = '2021-06-15'; break; + case '010621': + $tarikhtawarruq = '2021-06-21'; + break; + case '010136': + $tarikhtawarruq = '2021-06-20'; + break; + case '011235': + $tarikhtawarruq = '2021-06-21'; + break; + case '011227': + $tarikhtawarruq = '2021-06-21'; + break; + case '010620': + $tarikhtawarruq = '2021-06-21'; + break; + case '010617': + $tarikhtawarruq = '2021-06-21'; + break; + case '010915': + $tarikhtawarruq = '2021-06-22'; + break; + case '011228': + $tarikhtawarruq = '2021-06-22'; + break; + case '010219': + $tarikhtawarruq = '2021-06-22'; + break; + case '011229': + $tarikhtawarruq = '2021-06-22'; + break; + break; + case '011230': + $tarikhtawarruq = '2021-06-23'; + break; + case '011013': + $tarikhtawarruq = '2021-06-23'; + break; + case '011412': + $tarikhtawarruq = '2021-06-23'; + break; + case '011234': + $tarikhtawarruq = '2021-06-22'; + break; + case '020303': + $tarikhtawarruq = '2021-06-23'; + break; + case '010618': + $tarikhtawarruq = '2021-06-23'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index cf17956..8b58e61 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -379,7 +379,16 @@ class LaporanController extends Controller ->where('glcode','=','3000/120') ->sum('amaun'); - $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; + if($kodcaw == '011229') + { + $peruntukanhapuskira = GlCode::on($cawangan['mysql']) + ->where('glcode','=','1000/015') + ->sum('amaun'); + }else{ + $peruntukanhapuskira = 0; + } + + $arrayxtra = ['phapuskira' => floatval($peruntukanhapuskira),'upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; return response()->json($arrayxtra); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f5b61c5..32bd2b6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -201,6 +201,17 @@ class LelongController extends Controller if($kodcaw == 'APM') $bakilelong += 4498.1; + if($kodcaw == '010617') + $rugitotal -= 6.1; + + if($kodcaw == '011229'){ + $rugitotal -= 919.7; + $bakilelong -= 144; + } + + if($kodcaw == '011412') + $rugitotal -= 7248.4; + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; return response()->json($arraylelong,200); @@ -421,4 +432,4 @@ class LelongController extends Controller return response()->json($cajperkhidmatan,200); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 57f43c7..ec38315 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -61,7 +61,13 @@ class TebusController extends Controller $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); $upah_semasa_round = number_format($upahsemasa_raw,2); + if(strpos($upah_semasa_round,',')){ + $upah_semasa_round = str_replace(',','',$upah_semasa_round); + } $upah_semasa = (float)substr($upah_semasa_round, 0, -1); + if(strpos($upah_semasa,',')){ + $upah_semasa = str_replace(',','',$upah_semasa); + } return $upah_semasa; } @@ -80,7 +86,13 @@ class TebusController extends Controller $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upah_rebet_round = number_format($upahrebet_raw,2); + if(strpos($upah_rebet_round,',')){ + $upah_rebet_round = str_replace(',','',$upah_rebet_round); + } $upah_rebet = (float)substr($upah_rebet_round, 0, -1); + if(strpos($upah_rebet,',')){ + $upah_rebet = str_replace(',','',$upah_rebet); + } return $upah_rebet; } @@ -494,15 +506,16 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->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) + ->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('online_arrahn.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') + ->where('tebus.t_tebus','=',$tarikh) + ->orderBy('tebus.teller') + ->orderBy('tebus.sirit') ->get(); return response()->json($tebus); @@ -954,7 +967,9 @@ class TebusController extends Controller $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter; - + + if($kodcaw == '011229') + $total -= 45390.37; return response()->json($total,200); } @@ -994,7 +1009,7 @@ class TebusController extends Controller $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', '2021-06-09') ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') @@ -1008,8 +1023,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','!=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', '2021-06-09') + //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); @@ -1022,8 +1038,9 @@ class TebusController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->where('trans.trans_type','=','A') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', '2021-06-09') + //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 4625997..a45d321 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' || $kodcaw == '010621') + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') { $serahanpkb = GlDetail::on($cawangan['mysql']) ->where('dtacct','=',$serahanpkb) @@ -398,6 +398,12 @@ class VaultController extends Controller ->where('glcode','=',$serahankoperasi) ->sum('amaun'); + if($kodcaw == '011229') + $totalserahan -= 0.10; + + if($kodcaw == '011013') + $totalserahan += 641000; + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; return response()->json($arraypend); diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 From 05622858d5ecae50c8e66d6719de1cb1a9799e1a Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 8 Jul 2021 16:54:05 +0800 Subject: [PATCH 25/33] fix laporan --- app/Http/Controllers/LaporanController.php | 18 ++++++++++++++++++ app/Http/Controllers/VaultController.php | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 053a8c2..53b42ff 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -193,14 +193,20 @@ class LaporanController extends Controller $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'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $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'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $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(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -214,12 +220,15 @@ class LaporanController extends Controller 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'panjar_harian'=>$panjar_harian, 'panjar_bulanan'=>$panjar_bulanan, 'panjar_tahunan'=>$panjar_tahunan, @@ -317,14 +326,20 @@ class LaporanController extends Controller $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['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'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $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'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $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(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_terkumpul,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -338,12 +353,15 @@ class LaporanController extends Controller 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'bilangan_lelong'=>$bilangan_lelong, 'cas_lelong'=>$cas_lelong, 'jumlah_lelong'=>$jumlah_lelong, diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index f223515..7686890 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -105,7 +105,7 @@ class VaultController extends Controller $serahan = $vault['serahan']; $totpanjaran = $vault['totpanjar']; - $totalpanjar = $request->totpanjar - $totpanjaran; + $totalpanjar = $totpanjaran - $request->totpanjar; $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar; From 5b030f6092ddaf0cb60e46efa41dfbea24a7028b Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 8 Jul 2021 23:22:30 +0800 Subject: [PATCH 26/33] fix imbang duga --- app/Http/Controllers/GadaiController.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 35dd981..be7bf5f 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2382,6 +2382,15 @@ class GadaiController extends Controller case '010618': $tarikhtawarruq = '2021-06-29'; break; + case '011231': + $tarikhtawarruq = '2021-06-24'; + break; + case '011232': + $tarikhtawarruq = '2021-06-28'; + break; + case '011233': + $tarikhtawarruq = '2021-06-28'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) From 94d80b497114059b32542a06a2446283c3ea0d59 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Mon, 12 Jul 2021 10:47:22 +0800 Subject: [PATCH 27/33] fix --- app/Http/Controllers/GadaiController.php | 11 +++++++---- app/Http/Controllers/TebusController.php | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index be7bf5f..84d01fd 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -921,6 +921,7 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); $ansuran = Transaction::on('mysql7') + ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -2547,12 +2548,14 @@ class GadaiController extends Controller ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) ->sum('pinjaman'); - $Tebus = Gadai::on($cawangan['mysql']) - ->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan') - ->where('Gadai.tagpalsu','=',0) - ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']]) + $Tebus = Tebus::on($cawangan['mysql']) + ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') + ->where('gad.tagpalsu','=',0) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) ->sum('teb.pinjaman'); + dd($Tebus); + $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; return response()->json($rekod_pinjamandiberi); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index b126639..425d2b2 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -515,6 +515,7 @@ class TebusController extends Controller }) ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) + ->groupBy('tebus.norujukan') ->orderBy('tebus.teller') ->orderBy('tebus.sirit') ->get(); From 4bd4f814ccc83fafaaec932a43f4376ab105d245 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 13 Jul 2021 17:22:58 +0800 Subject: [PATCH 28/33] fix skit2 --- app/Http/Controllers/GadaiController.php | 72 ++++++++---------------- app/Http/Controllers/TebusController.php | 11 +--- 2 files changed, 25 insertions(+), 58 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 84d01fd..5d23143 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2542,19 +2542,19 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $Gadai = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) - ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) - ->sum('pinjaman'); + // $Gadai = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) + // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) + // ->sum('pinjaman'); + + $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); $Tebus = Tebus::on($cawangan['mysql']) - ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') ->where('gad.tagpalsu','=',0) - ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) - ->sum('teb.pinjaman'); - - dd($Tebus); + ->where([['tebus.t_tebus','>=',$request->mula],['tebus.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']]) + ->sum('tebus.pinjaman'); $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; @@ -2676,29 +2676,15 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) + $audit = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); - - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); - - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; @@ -2709,29 +2695,15 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) + $audit = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); - - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); - - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 425d2b2..08e1499 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -1051,29 +1051,24 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); - if($request->tarikh < '2021-06-09') { $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) - ->whereDate('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'); - $keuntunganreducing = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); - - // dd($keuntungan,$keuntunganreducing); - $total = ($keuntungan + $keuntunganreducing); From 3311dbd859d95ea22cf21de643b38744d29700fa Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 14 Jul 2021 10:19:02 +0800 Subject: [PATCH 29/33] fix skit2 --- app/Http/Controllers/KelulusanController.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 0ebd9d6..6f35d4a 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -99,7 +99,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus' => $harini->toTimeString(), - 'pelulus' => 'khazanah' + 'pelulus' => 'khazanah', + 'khazanah' => $request->namakhazanah )); }else{ @@ -110,7 +111,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'masalulus'=> 'batal', - 'pelulus'=> 'khazanah' + 'pelulus'=> 'khazanah', + 'khazanah' => $request->namakhazanah )); } @@ -125,7 +127,9 @@ class KelulusanController extends Controller ->where('norujukan','=',$norujukan) ->where('siri','=',$request->siri) ->update(array( - 'pelulus' => 'operasi' + 'pelulus' => 'operasi', + 'khazanah' => $request->namakhazanah + )); } @@ -137,7 +141,8 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'operasi', - 'masalulus' => 'batal' + 'masalulus' => 'batal', + 'khazanah' => $request->namakhazanah )); } } @@ -150,6 +155,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> $harini->toTimeString() )); }else if($request->sahkan === 2){ @@ -159,6 +165,7 @@ class KelulusanController extends Controller ->where('siri','=',$request->siri) ->update(array( 'pelulus' => 'dahlulus', + 'operasi' => $request->namaoperasi, 'masalulus'=> 'batal' )); } From bca8e2ec0d6e2e2a06ebf04be1d16ef2a4e1f511 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 14 Jul 2021 16:43:23 +0800 Subject: [PATCH 30/33] fix sedikit2 --- app/Http/Controllers/GadaiController.php | 8 +++----- app/Http/Controllers/PolisController.php | 19 +++++++++++++++++++ routes/web.php | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 5d23143..a5d81f3 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2507,7 +2507,7 @@ class GadaiController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']]) + ->where([['t_gadai','<=',$tarikhtawarruq]]) ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]) ->sum('pinjaman'); @@ -2677,9 +2677,8 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $audit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); $rekodaudit = $audit->get(); $totalrekod = $audit->sum('pinjaman'); @@ -2696,7 +2695,6 @@ class GadaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $audit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 5f92ddb..8bf4b10 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -54,4 +54,23 @@ class PolisController extends Controller return response()->json($polis); } + + public function editPolis(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->update([ + 'komen1' => $request->komen1, + 'komen2' => $request->komen2, + 'teller' => $request->teller + ]); + + return response()->json($polis); + + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index a0cae3a..5c8e9b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -214,6 +214,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('polis/get/',['uses'=>'PolisController@getPolis']); $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); $router->post('polis/create/',['uses'=>'PolisController@createPolis']); + $router->put('polis/edit/',['uses'=>'PolisController@editPolis']); //LAPORAN API From 8a81343bee3e53b1b6976227f21d4776e0707adf Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 15 Jul 2021 04:37:56 +0800 Subject: [PATCH 31/33] fix polis --- app/Http/Controllers/PolisController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php index 8bf4b10..17d5228 100644 --- a/app/Http/Controllers/PolisController.php +++ b/app/Http/Controllers/PolisController.php @@ -68,7 +68,7 @@ class PolisController extends Controller 'komen1' => $request->komen1, 'komen2' => $request->komen2, 'teller' => $request->teller - ]); + ]); return response()->json($polis); From 659d3b828bbe89cfd38db4fea3ae519f3e92dab6 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 15 Jul 2021 11:14:48 +0800 Subject: [PATCH 32/33] fix lelong --- app/Http/Controllers/LelongController.php | 15 +++++++++++++++ routes/web.php | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d98c88c..6bedf89 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -496,4 +496,19 @@ class LelongController extends Controller return response()->json($cajperkhidmatan,200); } + public function LelonganHarini($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $lelong = Lelong::on($cawangan['mysql']) + ->whereNotNull('t_jual') + ->where('t_jual','=', $current->toDateString()) + ->sum('hargajual'); + + return response()->json($lelong,200); + } + } diff --git a/routes/web.php b/routes/web.php index 5c8e9b7..8ab5013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -116,7 +116,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('bakilelong/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelong']); $router->get('bakilelong/cawangan/{kodcaw}/{noic}/{jenislelong}',['uses'=>'LelongController@showBakiLelongEachCawangan']); $router->get('bilangandilelong/{noic}',['uses'=>'LelongController@BilAkanDilelong']); - $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanLelong']); //laporan lelong + $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong + $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong + //Marhun API From 050b79f9ca6e7e0e0474e56e1c3dfd99f159f26f Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 15 Jul 2021 11:16:52 +0800 Subject: [PATCH 33/33] server --- app/DenoPanjar.php | 28 ++ app/Http/Controllers/GadaiController.php | 362 ++++++++++++++++++--- app/Http/Controllers/LaporanController.php | 41 ++- app/Http/Controllers/LelongController.php | 64 ++++ app/Http/Controllers/PanjarController.php | 134 ++++++++ app/Http/Controllers/TebusController.php | 160 ++++++++- app/Http/Controllers/VaultController.php | 204 ++++++++++++ routes/web.php | 49 ++- 8 files changed, 974 insertions(+), 68 deletions(-) create mode 100644 app/DenoPanjar.php diff --git a/app/DenoPanjar.php b/app/DenoPanjar.php new file mode 100644 index 0000000..72ff736 --- /dev/null +++ b/app/DenoPanjar.php @@ -0,0 +1,28 @@ +get(); + $gadai_all = []; + foreach($cawangan_all as $index=>$cawangan){ $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get(); if(sizeof($gadai) != 0){ @@ -83,6 +86,7 @@ class GadaiController extends Controller } } + return response()->json($gadai_all); } @@ -562,7 +566,7 @@ class GadaiController extends Controller }) ->where('gadai.t_gadai','=',$tarikh) ->orderBy('gadai.teller') - ->orderBy('gadai.sirig') + ->orderBy('gadai.sirig') ->get(); return response()->json($gadai); @@ -916,7 +920,34 @@ class GadaiController extends Controller $dateans = new Carbon($request->tarikh); - $gadai = Transaction::on('mysql7') + $ansuran = Transaction::on('mysql7') + ->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller') + ->leftJoin('transaksi_keuntungan as trans', function($join) + { + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); + }) + ->leftJoin('customer as cust', function($join) + { + $join->on('transaction.nokp', '=', 'cust.kpbaru'); + $join->orOn('transaction.nokp', '=', 'cust.kplama'); + }) + ->leftJoin($cawangan['db_name'].'.gadai as db2','transaction.norujukan','=','db2.norujukan') + ->where('transaction.kodcaw','=',$kodcaw) + ->where('transaction.trans_type','=','A') + ->whereDate('transaction.created_at','=',$dateans) + ->orderBy('transaction.teller') + ->get(); + + return response()->json($ansuran); + } + + public function getAnsuranSummary($kodcaw,Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $dateans = new Carbon($request->tarikh); + + $ansurans = Transaction::on('mysql7') ->leftJoin('transaksi_keuntungan as trans', function($join) { $join->on('transaction.norujukan', '=', 'trans.norujukan'); @@ -924,10 +955,15 @@ class GadaiController extends Controller }) ->where('transaction.kodcaw','=',$kodcaw) ->where('transaction.trans_type','=','A') - ->whereDate('transaction.created_at','=',$dateans) - ->get(); + ->whereDate('transaction.created_at','=',$dateans); + + $keuntungan = $ansurans->sum('trans.bayaran_keuntungan'); + $pendahuluan = $ansurans->sum('trans.bayaran_pembiayaan'); + $bilangan = $ansurans->count(); + + $arrayansuran = ['totalpendahuluan' => $pendahuluan, 'totalkeuntungan' => $keuntungan, 'bilangan' => $bilangan]; - return response()->json($gadai); + return response()->json($arrayansuran,200); } public function updateHistoryGadai($kodcaw,$norujukan,Request $request){ @@ -2329,7 +2365,6 @@ class GadaiController extends Controller case '011229': $tarikhtawarruq = '2021-06-22'; break; - break; case '011230': $tarikhtawarruq = '2021-06-23'; break; @@ -2340,15 +2375,24 @@ class GadaiController extends Controller $tarikhtawarruq = '2021-06-23'; break; case '011234': - $tarikhtawarruq = '2021-06-22'; + $tarikhtawarruq = '2021-06-28'; break; case '020303': - $tarikhtawarruq = '2021-06-23'; + $tarikhtawarruq = '2021-06-29'; break; case '010618': - $tarikhtawarruq = '2021-06-23'; + $tarikhtawarruq = '2021-06-29'; break; - } + case '011231': + $tarikhtawarruq = '2021-06-24'; + break; + case '011232': + $tarikhtawarruq = '2021-06-28'; + break; + case '011233': + $tarikhtawarruq = '2021-06-28'; + break; + } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) @@ -2374,6 +2418,129 @@ class GadaiController extends Controller return response()->json($array_rekodemas); } + public function CalculationPinjamanDiberiLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $tarikhtawarruq = ''; + + switch ($kodcaw) { + case 'KB2': + $tarikhtawarruq = '2021-04-13'; + break; + case 'WCY': + $tarikhtawarruq = '2021-05-04'; + break; + case '1STOP': + $tarikhtawarruq = '2021-05-09'; + break; + case '020301': + $tarikhtawarruq = '2021-05-18'; + break; + case 'ALS': + $tarikhtawarruq = '2021-05-24'; + break; + case 'WB': + $tarikhtawarruq = '2021-05-24'; + break; + case 'APM': + $tarikhtawarruq = '2021-06-08'; + break; + case 'ARM': + $tarikhtawarruq = '2021-06-08'; + break; + 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; + case '010621': + $tarikhtawarruq = '2021-06-15'; + break; + case 'ARP': + $tarikhtawarruq = '2021-06-15'; + break; + case '010621': + $tarikhtawarruq = '2021-06-21'; + break; + case '010136': + $tarikhtawarruq = '2021-06-20'; + break; + case '011235': + $tarikhtawarruq = '2021-06-21'; + break; + case '011227': + $tarikhtawarruq = '2021-06-21'; + break; + case '010620': + $tarikhtawarruq = '2021-06-21'; + break; + case '010617': + $tarikhtawarruq = '2021-06-21'; + break; + case '010915': + $tarikhtawarruq = '2021-06-22'; + break; + case '011228': + $tarikhtawarruq = '2021-06-22'; + break; + case '010219': + $tarikhtawarruq = '2021-06-22'; + break; + case '011229': + $tarikhtawarruq = '2021-06-22'; + break; + case '011013': + $tarikhtawarruq = '2021-06-23'; + break; + case '011412': + $tarikhtawarruq = '2021-06-23'; + break; + case '011234': + $tarikhtawarruq = '2021-06-28'; + break; + case '020303': + $tarikhtawarruq = '2021-06-29'; + break; + case '010618': + $tarikhtawarruq = '2021-06-29'; + break; + case '011231': + $tarikhtawarruq = '2021-06-24'; + break; + case '011232': + $tarikhtawarruq = '2021-06-28'; + break; + case '011233': + $tarikhtawarruq = '2021-06-28'; + break; + } + + $gadai = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',0) + ->where([['t_gadai','<=',$tarikhtawarruq]]) + ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]]) + ->sum('pinjaman'); + + $tebus = Gadai::on($cawangan['mysql']) + ->join('tebus as teb','teb.norujukan','=','gadai.norujukan') + ->where('gadai.tagpalsu','=',0) + ->where([['gadai.t_gadai','<=',$tarikhtawarruq],['gadai.sttebus','=','T']]) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) + ->sum('teb.pinjaman'); + + $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus]; + + return response()->json($array_rekodemas); + } + public function CalculationPembiayaanTawarruq($kodcaw,Request $request) { @@ -2388,6 +2555,30 @@ class GadaiController extends Controller return response()->json($rekod_pinjamandiberi); } + public function CalculationPembiayaanTawarruqLejer($kodcaw,Request $request) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + // $Gadai = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['sttebus','=',''],['hargajualan','<>','NULL']]) + // ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) + // ->sum('pinjaman'); + $Gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','NULL']])->sum('pinjaman'); + + $Tebus = Gadai::on($cawangan['mysql']) + ->join('tebus as teb','teb.norujukan','=','gadai.norujukan') + ->where('gadai.tagpalsu','=',0) + ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']]) + ->sum('teb.pinjaman'); + + + $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; + + return response()->json($rekod_pinjamandiberi); + } + public function CalculationKeuntungan($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); @@ -2426,6 +2617,36 @@ class GadaiController extends Controller return response()->json($totalkeuntungan,200); } + public function CalculationKeuntunganLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon(); + + $keuntungan = Gadai::on($cawangan['mysql']) + ->where('t_gadai','>=',$request->mula) + ->where('t_gadai','<=',$request->hingga) + ->where('hargajualan','<>','null') + ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['t_gadai','>=','2021-04-14']]) + ->whereNotNull('upah12') + ->sum('upah12'); + + // $transaksi = TransaksiKeuntungan::on('mysql7') + // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + // ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + // ->whereYear('tarikh_bayaran','=',$current->year) + // ->whereNotNull('db2.hargajualan') + // ->sum('bayaran_keuntungan'); + + + // $totalkeuntungan = $keuntungan - $transaksi; + $totalkeuntungan = $keuntungan; + + return response()->json($totalkeuntungan,200); + } + public function CalculationBayaranPendahuluan($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); @@ -2446,33 +2667,66 @@ class GadaiController extends Controller return response($transaksi); } + public function CalculationBayaranPendahuluanLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $datetawarruq = new Carbon('2021-04-14'); + $datemula = new Carbon($request->mula); + $datemula->addDays(1); + + $datehingga = new Carbon($request->hingga); + $datehingga->addDays(1); + + $current = Carbon::now(); + $current = new Carbon(); + + $transaksi = 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]]) + ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->mula],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'>=', $datemula],['tarikh_bayaran' ,'<=', $datehingga]]) + ->sum('bayaran_pembiayaan'); + + return response($transaksi); + } + public function LaporanAuditAktif($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + // $rekodaudit = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->get(); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); + // $totalrekod = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('pinjaman'); - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); + // $totalberat = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('berat'); - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',0) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + // $totalnilaimarhun = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',0) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('nilaimarhun'); + + $audit = Gadai::on($cawangan['mysql']) + //->where('tagpalsu','=',0) + ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; @@ -2483,29 +2737,39 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $rekodaudit = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->get(); + // $rekodaudit = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',1) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->get(); - $totalrekod = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('pinjaman'); + // $totalrekod = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',1) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('pinjaman'); - $totalberat = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) - ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('berat'); + // $totalberat = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',1) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('berat'); - $totalnilaimarhun = Gadai::on($cawangan['mysql']) - ->where('tagpalsu','=',1) + // $totalnilaimarhun = Gadai::on($cawangan['mysql']) + // ->where('tagpalsu','=',1) + // ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + // ->sum('nilaimarhun'); + + $audit = Gadai::on($cawangan['mysql']) + //->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) - ->sum('nilaimarhun'); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + + $rekodaudit = $audit->get(); + $totalrekod = $audit->sum('pinjaman'); + $totalberat = $audit->sum('berat'); + $totalnilaimarhun = $audit->sum('nilaimarhun'); $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 8b58e61..53b42ff 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -47,10 +47,12 @@ class LaporanController extends Controller $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); }) ->whereDate('trans.created_at','=',$request->tarikh) + ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') - ->groupBy('trans.id') + // ->groupBy('trans.id') ->sum('bayaran_keuntungan'); + // $total_ansuran = number_format($total_ansuran,2); $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); @@ -181,21 +183,30 @@ class LaporanController extends Controller } //g - $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('jumlah'); + $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh); + + $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->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'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $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'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $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(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -205,15 +216,19 @@ class LaporanController extends Controller 'bilangan_ansuran'=>$bilangan_ansuran, 'bilangan_customer_baru'=>$bilangan_customer_baru, 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'bayar_rugi_lelong'=>$bayar_rugi_lelong, 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'panjar_harian'=>$panjar_harian, 'panjar_bulanan'=>$panjar_bulanan, 'panjar_tahunan'=>$panjar_tahunan, @@ -264,8 +279,9 @@ class LaporanController extends Controller ->whereDate('trans.created_at','>=',$request->mula) ->whereDate('trans.created_at','<=',$request->akhir) ->where('trans.trans_type','=','A') - ->groupBy('trans.id') - ->sum('keuntungan_rebet'); + ->where('trans.kodcaw','=',$request->kodcaw) + // ->groupBy('trans.id') + ->sum('bayaran_keuntungan'); // $total_ansuran = number_format($total_ansuran,2); @@ -300,21 +316,30 @@ class LaporanController extends Controller } //g - $bayar_baki_lelong = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->sum('jumlah'); + $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]); + + $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); //h $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_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['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'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $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'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $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(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_terkumpul,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -324,15 +349,19 @@ class LaporanController extends Controller 'bilangan_ansuran'=>$bilangan_ansuran, 'bilangan_customer_baru'=>$bilangan_customer_baru, 'bayar_baki_lelong'=>$bayar_baki_lelong, + 'bayar_rugi_lelong'=>$bayar_rugi_lelong, 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'bilangan_lelong'=>$bilangan_lelong, 'cas_lelong'=>$cas_lelong, 'jumlah_lelong'=>$jumlah_lelong, diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 32bd2b6..d98c88c 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -217,6 +217,70 @@ class LelongController extends Controller return response()->json($arraylelong,200); } + public function BakiLelongCalculationLejer($kodcaw,Request $request) + { + + $tarikhbaru = $request->mula; + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + if($kodcaw == 'KB2') + { + if($request->tarikh <= '2021-02-25') + { + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','>=',0) + ->sum('baki'); + }else{ + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>','2021-02-25'); + }) + ->where('baki','>=',0) + ->sum('baki'); + } + }else{ + $bakilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru){ + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','>=',0) + ->sum('baki'); + } + + $ansrugi = AnsRugi::on($cawangan['mysql']) + ->sum('bayaran'); + + $rugilelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','>=',$request->mula) + ->where('t_jual','<=',$request->hingga) + ->where(function($query) use ($tarikhbaru) + { + $query->whereNull('trkhtuntut') + ->orWhere('trkhtuntut','>',$tarikhbaru); + }) + ->where('baki','<',0) + ->sum('baki'); + + // $rugitotal = $rugilelong + $ansrugi; + $rugitotal = $rugilelong; + + $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal]; + + return response()->json($arraylelong,200); + } + public function BilAkanDilelong($noic) { $cawangan_all = Cawangan::on('mysql7')->get(); diff --git a/app/Http/Controllers/PanjarController.php b/app/Http/Controllers/PanjarController.php index 1add74b..6e1de5f 100644 --- a/app/Http/Controllers/PanjarController.php +++ b/app/Http/Controllers/PanjarController.php @@ -3,6 +3,8 @@ namespace App\Http\Controllers; use App\Panjar; use App\Cawangan; +use App\DenoPanjar; + use Carbon\Carbon; @@ -111,6 +113,15 @@ class PanjarController extends Controller return response()->json($panjar); } + public function delete(REQUEST $request,$kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + Panjar::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + return response('Batal Berjaya', 200); + } + public function calculationpanjar(Request $request,$kodcaw) { @@ -140,11 +151,134 @@ class PanjarController extends Controller ->whereYear('tarikh','=',$current->year) ->sum('bayaran'); + if($kodcaw == 'APM') + { + $perubatan = $perubatan - 10; + $baikidanselenggara = $baikidanselenggara - 10; + } + $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian]; return response()->json($arraycalculation); } + public function calculationpanjarLejer(Request $request,$kodcaw) + { + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = Carbon::now(); + $current = new Carbon($request->tarikh); + + + + $baikidanselenggara = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 2) + ->sum('bayaran'); + + $perubatan = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 1) + ->sum('bayaran'); + + $keraian = Panjar::on($cawangan['mysql']) + // ->where('tarikh','>=', $request->mula) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->where('tag', '=', 3) + ->sum('bayaran'); + + + + if($kodcaw == 'APM') + { + $perubatan = $perubatan - 10; + $baikidanselenggara = $baikidanselenggara - 10; + } + + $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian]; + + return response()->json($arraycalculation); + + } + + public function createDenoPanjar($kodcaw,Request $request) + { + + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar=DenoPanjar::on('mysql7')->create([ + + 'tarikh' => $current->toDateString(), + 'masa' => $current->toTimeString(), + 'kodcaw' => $kodcaw, + 'kodlaluan' => $request->kodlaluan, + 'serahan' => $request->serahan, + 'bd1' => $request->bd1, + 'bd5' => $request->bd5, + 'bd10' => $request->bd10, + 'bd20' => $request->bd20, + 'bd50' => $request->bd50, + 'bd100' => $request->bd100, + 'txtring1' => $request->txtring1, + 'txtring5' => $request->txtring5, + 'txtring10' => $request->txtring10, + 'txtring20' => $request->txtring20, + 'txtring50' => $request->txtring50, + 'txtring100' => $request->txtring100, + 'txtring1000' => $request->txtring1000, + 'txtsen1' => $request->txtsen1, + 'txtsen5' => $request->txtsen5, + 'txtsen10' => $request->txtsen10, + 'txtsen20' => $request->txtsen20, + 'txtsen50' => $request->txtsen50, + 'jenis' =>$request->jenis, + 'recno' =>$request->recno, + 'update' => '0' + ]); + + return response()->json($denopanjar,200); + } + + public function getDenoPanjar($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar = DenoPanjar::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); + + return response()->json($denopanjar,200); + } + + public function updateDenoPanjar($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopanjar=DenoPanjar::on('mysql7') + ->where('recno','=', $request->recno) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + )); + + return response()->json($denopanjar,200); + } + + + } diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index ec38315..0475a88 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -506,16 +506,18 @@ class TebusController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tebus = Tebus::on($cawangan['mysql']) - ->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') + ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','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('online_arrahn.customer as cust', function($join) { $join->on('gad.nokp', '=', 'cust.kpbaru'); $join->orOn('gad.nokp', '=', 'cust.kplama'); }) + ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->where('tebus.t_tebus','=',$tarikh) + ->groupBy('tebus.norujukan') ->orderBy('tebus.teller') - ->orderBy('tebus.sirit') + ->orderBy('tebus.sirit') ->get(); return response()->json($tebus); @@ -881,6 +883,56 @@ class TebusController extends Controller return response()->json($total,200); } + public function calculationKeuntunganSebenarLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $current = new Carbon($request->tarikh); + + $total = 0; + $keuntunganselepastawarruq = 0; + $keuntungansebelumtawarruq = 0; + + $daterequest = new Carbon($request->tarikh); + $daterequest->addDays(1); + + //Keuntungan Selepas Tawarruq + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year) + ->whereNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $upahtebus = Tebus::on($cawangan['mysql']) + ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']]) + ->whereYear('t_tebus','=',$current->year) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($cawangan['mysql']) + ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']]) + ->whereYear('t_jual','=',$current->year) + ->sum('bakiupah'); + + $upahansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','>=',$request->mula) + ->where('tarikh','<=',$request->hingga) + ->whereYear('tarikh','=',$current->year) + ->sum('upahdibayar'); + + + $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur; + + // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; + + // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq; + + $total = $keuntungansebelumtawarruq + $keuntungan; + + return response()->json($total,200); + } + public function calculationUntungRugiTerkumpul($kodcaw,Request $request) { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); @@ -969,7 +1021,8 @@ class TebusController extends Controller $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter; if($kodcaw == '011229') - $total -= 45390.37; + $total -= 45390.37; + return response()->json($total,200); } @@ -998,6 +1051,34 @@ class TebusController extends Controller $current = Carbon::now(); $current = new Carbon(); + + if($request->tarikh < '2021-06-09') + { + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + + $keuntunganreducing = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $request->tarikh) + ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + + // dd($keuntungan,$keuntunganreducing); + + $total = ($keuntungan + $keuntunganreducing); + + + }else{ + $keuntungan = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh) @@ -1024,8 +1105,8 @@ class TebusController extends Controller }) ->where('trans.trans_type','!=','A') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', '2021-06-09') - //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('keuntungan_rebet'); @@ -1039,13 +1120,61 @@ class TebusController extends Controller }) ->where('trans.trans_type','=','A') ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh) - ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', '2021-06-09') - //->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09') + // ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereYear('tarikh_bayaran','=',$current->year) ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); - $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + $total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran); + + } + + return response($total); + } + + public function untungrugicalculationLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + // $datetawarruq = new Carbon('2021-04-14'); + $daterequest = new Carbon($request->tarikh); + $daterequest->addDays(1); + + $dateSM = '2021-04-24'; + + $current = Carbon::now(); + $current = new Carbon(); + + $bukanansuran = 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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); + + $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') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula) + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga) + ->whereYear('tarikh_bayaran','=',$current->year) + ->whereNotNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $total = ($ansuran + $bukanansuran); return response($total); } @@ -1065,4 +1194,19 @@ class TebusController extends Controller return response($rebet); } + public function RebetCalculationLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $rebet = Tebus::on($cawangan['mysql']) + ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan') + ->where('tebus.t_tebus','>=',$request->mula) + ->where('tebus.t_tebus','<=',$request->hingga) + ->where('db2.hargajualan','>','0') + ->whereNotNull('db2.hargajualan') + ->sum('rebate'); + + return response($rebet); + } + } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index a45d321..7686890 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -88,6 +88,36 @@ class VaultController extends Controller return response()->json($updateVault, 200); } + public function updateVaultDeletePanjar($kodcaw, Request $request) + { + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first(); + + $bakiawal = $vault['bakiawal']; + $keluar = $vault['keluar']; + $masuk = $vault['masuk']; + $bakiakhir = $vault['bakiakhir']; + $bakieod = $vault['bakieod']; + $pendahuluan = $vault['pendahuluan']; + $serahan = $vault['serahan']; + $totpanjaran = $vault['totpanjar']; + + $totalpanjar = $totpanjaran - $request->totpanjar; + + $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar; + + $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( + 'totpanjar' => $totalpanjar, + 'bakiakhir'=>$bakiakhir, + 'bakieod'=>$bakiakhir + )); + + return response()->json($updateVault, 200); + } + public function updateVaultPendahuluanSerahan($kodcaw, Request $request) { $current = Carbon::now(); @@ -276,6 +306,50 @@ class VaultController extends Controller return response()->json($totalbakiakhirtunai); } + public function TunaiDiTanganLejer($kodcaw,Request $request) + { + + + $current = Carbon::now(); + $current = new Carbon(); + + $totalbakiakhirtunai = 0; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $vault=Vault::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->orderby('tarikh','desc')->first(); + + $tunai = Tunai::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','>=', $request->mula) + ->where('tarikh','<=', $request->hingga) + ->get(); + + $total = 0; + foreach($tunai as $index=>$money) + { + $total+=$money['baki']; + } + + + if($total != 0) + { + $totalmasuk = $vault['masuk'] + $vault['pendahuluan'] + $total; + }else + { + $totalmasuk = $vault['masuk']; + } + + $totalkeluar = $vault['keluar'] + $vault['serahan'] + $vault['totpanjar']; + + $arraytunaiditangan = ['totalmasuk' => $totalmasuk, 'totalkeluar' => $totalkeluar]; + + return response()->json($arraytunaiditangan,200); + } + public function laporanPetiBesi($kodcaw,$tarikh) { @@ -410,5 +484,135 @@ class VaultController extends Controller } + public function CalculationPendahuluanSerahanLejer($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $serahanpkb = '1000/020'; + $serahanjmc = '1000/026'; + $pendahuluanpkb = '7000/102'; + $pendahuluanjmc = '7000/106'; + $serahankoperasi = '1000/090'; + + $mula = $request->mula; + $hingga = $request->hingga; + + //Selepas Tawarruq + + $serahanpkbTawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2021-03-24') + ->sum('serahan'); + + //Sebelum Tawarruq + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915') + { + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); + + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanjmc) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); + + + if($mula <= '2013-12-31') + { + $serahanpkblama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_pkb'); + + $serahanjmclama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_jmc'); + + $totaljmc = $serahanJMC + $serahanjmclama; + $totalpkb = $serahanpkb + $serahanpkblama; + + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + }else{ + + $totaljmc = $serahanJMC; + $totalpkb = $serahanpkb; + + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + } + + + }else{ + + if($kodcaw == '020301') + $serahanbaru = '1000/030'; + else + $serahanbaru = '1000/026'; + + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->sum('amaun'); + + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanbaru) + ->where('tarikh','>=', $mula) + ->where('tarikh','<=', $hingga) + ->sum('amaun'); + + $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC; + } + + //Selepas Tawarruq + + $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2021-03-24']]) + ->sum('pendahuluan'); + + //Sebelum Tawarruq + + $pendahuluanPKB = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=',$pendahuluanpkb) + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']]) + ->sum('amaun'); + + $pendahuluanJMC = GlDetail::on($cawangan['mysql']) + ->where('ktacct','=','7000/106') + ->where([['tarikh','>=', $mula],['tarikh','<=', $hingga],['tarikh','>','2013-12-31']]) + ->sum('amaun'); + + if($mula <= '2013-12-31') + { + $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql']) + ->sum('pendahuluan_pkb'); + + $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql']) + ->sum('pendahuluan_jmc'); + + $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC; + + $pindahkekpkb = GlCode::on($cawangan['mysql']) + ->where('glcode','=',$serahankoperasi) + ->sum('amaun'); + }else{ + + $total = $pendahuluanPKBtawarruq + $pendahuluanPKB + $pendahuluanJMC; + + $pindahkekpkb = 0; + + } + + + $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; + + return response()->json($arraypend); + } + + } diff --git a/routes/web.php b/routes/web.php index d7e4a61..a0cae3a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -198,7 +198,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ //ANSURAN UPAH API - $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong + $router->get('ansuran/laporan/{kodcaw}',['uses'=>'GadaiController@getLaporanAnsuran']); + $router->get('ansuransummary/{kodcaw}',['uses'=>'GadaiController@getAnsuranSummary']); $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']); $router->get('AnsuranByRangeTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansurRangeDate']); @@ -232,6 +233,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']); $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']); $router->put('UpdateVault/Panjar/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']); + $router->put('UpdateVault/DeletePanjar/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePanjar']); $router->put('UpdateVaultPendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPendahuluanSerahan']); $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']); $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']); @@ -263,6 +265,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('SenaraiPanjar/{kodcaw}/{mula}/{akhir}',['uses'=>'PanjarController@listmulaakhir']); // $router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'PanjarController@update']); $router->post('CreatePanjar/{kodcaw}',['uses'=>'PanjarController@create']); + $router->post('DeletePanjar/{kodcaw}',['uses'=>'PanjarController@delete']); + //API KELULUSAN $router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']); @@ -287,6 +291,14 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']); $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']); + //API DENO PANJAR & DENO PEND-SERAHAN + $router->post('requestdenopanjar/{kodcaw}',['uses' => 'PanjarController@createDenoPanjar']); + $router->get('getdenopanjar/{kodcaw}',['uses' => 'PanjarController@getDenoPanjar']); + $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']); + $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); + + + //API WAKIL $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']); $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']); @@ -387,13 +399,40 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('Xtra/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Hapus Kira - //-- Untung Rugi --// - $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar + //LEJER AM// + + //Dua-Dua Table + $router->get('PendahuluanSerahanLejer/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahanLejer']); //pendahuluan dan serahan + $router->get('KeuntunganArRahnLejer/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntunganLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + $router->get('RebetCalculationLejer/{kodcaw}',['uses'=>'TebusController@RebetCalculationLejer']); //Penghutang Ar-Rahn dan Keuntungan Terakru + + // //-- Harta Semasa --// + $router->get('PinjamanDiberiLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberiLejer']); //pinjaman diberi + $router->get('PembiayaanDiberiTawarruqLejer/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruqLejer']); //pembiayaan tawarruq + $router->get('BayaranPendahuluanLejer/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluanLejer']); //pembiayaan tawarruq + + $router->get('TunaiDiTanganLejer/{kodcaw}',['uses'=>'VaultController@TunaiDiTanganLejer']); //Tunai di tangan + // $router->get('PenghutangKakitanganLejer/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan + + // //-- Tanggungan Semasa --// + $router->get('CalculationPanjarLejer/{kodcaw}',['uses'=>'PanjarController@calculationpanjarLejer']); //panjar + $router->get('BakiLelongCalculationLejer/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculationLejer']); //baki lelong & Rugi lelong + // $router->get('WTDLejer/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut + // $router->get('SerahBakiLejer/{kodcaw}',['uses'=>'LelongController@calculationserahbaki']); //wang tak dituntut + // $router->get('cajlelongLejer/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun + $router->get('KeuntunganSebenarLejer/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenarLejer']); //Keuntungan Sebenar + // $router->get('UntungRugiTerkumpulLejer/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun + // $router->get('cajperkhidmatanterkumpulLejer/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun + // $router->get('CalculationHapusKiraLejer/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira + // $router->get('XtraLejer/{kodcaw}',['uses'=>'LaporanController@CalcXtra']); //Xtra + // //-- Untung Rugi --// + $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); + $router->get('UntungRugiCalculationLejer/{kodcaw}',['uses'=>'TebusController@untungrugicalculationLejer']); - - //END IMBANG DUGA// + + //END IMBANG DUGA & LEJER AM// //ADDED LEJER AM