From 33d19d9fe5419dee4c5507205469492872920bc3 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 19 May 2021 16:35:33 +0800 Subject: [PATCH] fix imbang duga jelawat --- app/Http/Controllers/DaerahController.php | 9 ++++ app/Http/Controllers/GadaiController.php | 15 ++++-- app/Http/Controllers/LaporanController.php | 38 +++++++++++++-- app/Http/Controllers/NegeriController.php | 10 ++++ app/Http/Controllers/PolisController.php | 57 ++++++++++++++++++++++ app/Http/Controllers/VaultController.php | 56 ++++++++++++++------- app/Polis.php | 37 ++++++++++++++ routes/web.php | 9 ++++ 8 files changed, 207 insertions(+), 24 deletions(-) create mode 100644 app/Http/Controllers/PolisController.php create mode 100644 app/Polis.php diff --git a/app/Http/Controllers/DaerahController.php b/app/Http/Controllers/DaerahController.php index f1e3d19..56c4b80 100644 --- a/app/Http/Controllers/DaerahController.php +++ b/app/Http/Controllers/DaerahController.php @@ -14,4 +14,13 @@ class DaerahController extends Controller ->first(); return response()->json($daerah); } + + public function showOneNegeri($kodnegeri) + { + $daerah = Daerah::on('mysql7') + ->where('kodnegeri','=',$kodnegeri) + ->get(); + + return response()->json($daerah); + } } \ No newline at end of file diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index f607009..b8d5134 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1148,6 +1148,7 @@ class GadaiController extends Controller ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [1, 400.99]) ->groupBy('trans.id') ->get(); @@ -1162,6 +1163,7 @@ class GadaiController extends Controller // ->where('trans.created_at','=',$daterequest) ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [1, 400.99]) ->groupBy('trans.id') ->get(); @@ -1175,6 +1177,7 @@ class GadaiController extends Controller ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [401, 2000.99]) ->groupBy('trans.id') ->get(); @@ -1188,6 +1191,7 @@ class GadaiController extends Controller ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [401, 2000.99]) ->groupBy('trans.id') ->get(); @@ -1201,6 +1205,7 @@ class GadaiController extends Controller ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->where('trans.created_at','<',$daterequest) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [2001, 100000]) ->groupBy('trans.id') ->get(); @@ -1214,6 +1219,7 @@ class GadaiController extends Controller ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan') ->whereDate('trans.created_at','=',$tarikh) ->where('trans.trans_type','=','A') + ->where('db2.sttebus','=','') ->whereBetween('nilaimarhun', [2001, 100000]) ->groupBy('trans.id') ->get(); @@ -2179,6 +2185,9 @@ class GadaiController extends Controller case '1STOP': $tarikhtawarruq = '2021-05-09'; break; + case '020301'; + $tarikhtawarruq = '2021-05-19'; + break; } $rekod_emaspalsu = Gadai::on($cawangan['mysql']) @@ -2275,10 +2284,8 @@ class GadaiController extends Controller $transaksi = TransaksiKeuntungan::on('mysql7') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') - ->where('db2.sttebus','=','') - // ->where('tarikh_bayaran' ,'>=', $datetawarruq) - ->where('db2.hargajualan','<>','null') - ->where('tarikh_bayaran' ,'<=', $daterequest) + ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) + ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]]) ->sum('bayaran_pembiayaan'); return response($transaksi); diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 3d5e762..0c35076 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -16,6 +16,7 @@ use App\Advansur; use App\Vault; use App\Tunai; use App\Denominasi; +use App\Hapuskira; use Carbon\Carbon; @@ -119,8 +120,17 @@ class LaporanController extends Controller ->sum('pinjaman'); } - $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq); + $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 */ @@ -129,10 +139,19 @@ class LaporanController extends Controller ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); - $stokauditpembiayaan = $stokaudit->sum('pinjaman'); + $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 */ @@ -207,7 +226,7 @@ class LaporanController extends Controller 'total_keuntungan'=>floatval($total_keuntungan), 'petibesi_sistem'=>$petibesi_sistem, 'petibesi_deno'=>$petibesi_deno, - 'stokauditpembiayaan'=>$stokauditpembiayaan, + 'stokauditpembiayaan'=>$totalstokaudit, 'stokauditnilaimarhun'=>$stokauditnilaimarhun, 'stokauditcount'=>$stokauditcount, 'petibesiimbangduga'=>$totalbakiakhirtunai, @@ -217,4 +236,17 @@ class LaporanController extends Controller return response()->json($laporan_harian); } + + + public function CalcHapusKira($kodcaw,Request $request) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $hapuskira = HapusKira::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','<',$request->tarikh) + ->sum('amaun'); + + return response()->json($hapuskira); + } } \ No newline at end of file diff --git a/app/Http/Controllers/NegeriController.php b/app/Http/Controllers/NegeriController.php index 22e2534..c060b92 100644 --- a/app/Http/Controllers/NegeriController.php +++ b/app/Http/Controllers/NegeriController.php @@ -14,4 +14,14 @@ class NegeriController extends Controller ->first(); return response()->json($negeri); } + + public function NegeriListAll() + { + $negeri = Negeri::on('mysql7') + ->where('kodnegeri','<>','17') + ->where('kodnegeri','<>','00') + ->get(); + + return response()->json($negeri); + } } \ No newline at end of file diff --git a/app/Http/Controllers/PolisController.php b/app/Http/Controllers/PolisController.php new file mode 100644 index 0000000..5f92ddb --- /dev/null +++ b/app/Http/Controllers/PolisController.php @@ -0,0 +1,57 @@ +where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->get(); + + return response()->json($polis); + } + + public function PolischangeTebus(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->update(['tebus' => $request->tebus]); + + return response()->json($polis); + } + + public function createPolis(Request $request) + { + $harini = Carbon::now(); + $harini = new Carbon; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $polis = Polis::on($cawangan['mysql']) + ->create([ + 'tarikh' => $harini->toDateString(), + 'kodcaw' => $request->kodcaw, + 'norujukan' => $request->norujukan, + 'komen1' => $request->komen1, + 'komen2' => $request->komen2, + 'tebus' => 0, + 'teller' => $request->teller, + 'caj' => 0.00 + ]); + + return response()->json($polis); + + } +} \ No newline at end of file diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index dacd164..2d2d4dc 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -321,29 +321,50 @@ class VaultController extends Controller //Sebelum Tawarruq + if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP') + { + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','<=', $request->tarikh) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); - $serahanpkb = GlDetail::on($cawangan['mysql']) - ->where('dtacct','=',$serahanpkb) - ->where('tarikh','<=', $request->tarikh) - ->where('tarikh','>','2013-12-31') - ->sum('amaun'); + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanjmc) + ->where('tarikh','<=', $request->tarikh) + ->where('tarikh','>','2013-12-31') + ->sum('amaun'); - $serahanJMC = GlDetail::on($cawangan['mysql']) - ->where('dtacct','=',$serahanjmc) - ->where('tarikh','<=', $request->tarikh) - ->where('tarikh','>','2013-12-31') - ->sum('amaun'); + $serahanpkblama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_pkb'); - $serahanpkblama = imbangdugalama::on($cawangan['mysql']) - ->sum('serahan_pkb'); + $serahanjmclama = imbangdugalama::on($cawangan['mysql']) + ->sum('serahan_jmc'); - $serahanjmclama = imbangdugalama::on($cawangan['mysql']) - ->sum('serahan_jmc'); + $totaljmc = $serahanJMC + $serahanjmclama; + $totalpkb = $serahanpkb + $serahanpkblama; - $totaljmc = $serahanJMC + $serahanjmclama; - $totalpkb = $serahanpkb + $serahanpkblama; + $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + }else{ - $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb; + if($kodcaw == '020301') + $serahanbaru = '1000/030'; + else + $serahanbaru = '1000/026'; + + $serahanpkb = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanpkb) + ->where('tarikh','<=', $request->tarikh) + ->sum('amaun'); + + $serahanJMC = GlDetail::on($cawangan['mysql']) + ->where('dtacct','=',$serahanbaru) + ->where('tarikh','<=', $request->tarikh) + ->sum('amaun'); + + $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC; + } + //Selepas Tawarruq @@ -375,6 +396,7 @@ class VaultController extends Controller $pindahkekpkb = GlCode::on($cawangan['mysql']) ->where('glcode','=',$serahankoperasi) + ->orWhere('glcode','=',) ->sum('amaun'); $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb]; diff --git a/app/Polis.php b/app/Polis.php new file mode 100644 index 0000000..c705d76 --- /dev/null +++ b/app/Polis.php @@ -0,0 +1,37 @@ +group(['prefix'=>'api'], function () use ($router){ //Negeri API $router->get('negeri/{kodnegeri}',['uses'=>'NegeriController@showOneNegeri']); + $router->get('negeri/',['uses'=>'NegeriController@NegeriListAll']); //Daerah API $router->get('daerah/{koddaerah}',['uses'=>'DaerahController@showOneDaerah']); + $router->get('daerahkodnegeri/{kodnegeri}',['uses'=>'DaerahController@showOneNegeri']); //Bank API $router->get('bank',['uses'=>'BankController@showAllBank']); @@ -193,6 +195,11 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']); $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']); + //POLIS API + $router->get('polis/get/',['uses'=>'PolisController@getPolis']); + $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); + $router->post('polis/create/',['uses'=>'PolisController@createPolis']); + //LAPORAN API $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok @@ -361,6 +368,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun + $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira + //-- Untung Rugi --// $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar