From 53dd80daac855b79c70978a3df8bc2f51d96b78a Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 29 Jun 2021 10:09:16 +0800 Subject: [PATCH] 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