From 25d3da66adf92a272b52ee30463ce7fe4f5f2353 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 24 Sep 2021 06:11:08 +0800 Subject: [PATCH 1/2] untuk laporan harian --- app/Http/Controllers/LaporanController.php | 77 +++++++++++++++++++--- 1 file changed, 67 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 9381385..fe99a89 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -41,6 +41,7 @@ class LaporanController extends Controller $total_keuntungantebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->sum('bakiupah'); $total_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'); @@ -49,12 +50,65 @@ class LaporanController extends Controller ->whereDate('trans.created_at','=',$request->tarikh) ->where('trans.kodcaw','=',$request->kodcaw) ->where('trans.trans_type','=','A') - // ->groupBy('trans.id') + ->whereNotNull('db2.hargajualan') ->sum('bayaran_keuntungan'); + $total_keuntunganbukanansuran = 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('trans.created_at','=',$request->tarikh) + ->where('trans.kodcaw','=',$request->kodcaw) + ->whereNotNull('db2.hargajualan') + ->sum('keuntungan_rebet'); - // $total_ansuran = number_format($total_ansuran,2); - $total_keuntungan = floatval($total_upah) + floatval($total_keuntunganansuran) + floatval($total_keuntungantebus); + $keuntungan = TransaksiKeuntungan::on('mysql7') + ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') + ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'=', $request->tarikh) + ->whereNull('db2.hargajualan') + ->sum('bayaran_keuntungan'); + + $upahtebus = Tebus::on($cawangan['mysql']) + ->where('t_tebus','=',$request->tarikh) + ->sum('upahdibayar'); + + $upahlelong = Lelong::on($cawangan['mysql']) + ->where('t_jual','=',$request->tarikh) + ->sum('bakiupah'); + + $upahansur = Advansur::on($cawangan['mysql']) + ->where('tarikh','=',$request->tarikh) + ->sum('upahdibayar'); + + + $upahsimpan = $keuntungan + $upahtebus + $upahlelong + $upahansur; + $keuntungansebenar = $total_keuntunganansuran + $total_keuntunganbukanansuran; + + + $total_keuntungan = floatval($upahsimpan) + floatval($keuntungansebenar); + + + $tebus = Tebus::on($cawangan['mysql']) + ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg') + ->join('gadai as gad','gad.norujukan','=','tebus.norujukan') + ->where('tebus.t_tebus','=',$request->tarikh) + ->get(); + + $totalpenebusan = 0; + + foreach($tebus as $index1=>$teb) + { + if($teb['gad.hargajualan'] != $teb['bakihargajualan']) + { + $totalpenebusan += $teb['gadaibakipjm']; + }else{ + $totalpenebusan += $teb['pinjaman']; + } + } //b @@ -183,10 +237,12 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->where('jumlah','>',0); + + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); - $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'); @@ -209,7 +265,7 @@ class LaporanController extends Controller array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, - 'total_tebus'=>$total_tebus, + 'total_tebus'=>$totalpenebusan, 'total_ansuran'=>$total_ansuran, 'bilangan_gadai'=>$bilangan_gadai, 'bilangan_tebus'=>$bilangan_tebus, @@ -316,10 +372,11 @@ class LaporanController extends Controller } //g - $tuntut_baki = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]]); + $tuntut_baki_rugi = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','<',0); + $tuntut_baki_bayar = TuntutBaki::on($cawangan['mysql'])->where([['tarikh','=',$request->mula],['tarikh','=',$request->akhir]])->where('jumlah','>',0); - $bayar_rugi_lelong = $tuntut_baki->where('jumlah','<',0)->sum('jumlah'); - $bayar_baki_lelong = $tuntut_baki->where('jumlah','>',0)->sum('jumlah'); + $bayar_rugi_lelong = $tuntut_baki_rugi->sum('jumlah'); + $bayar_baki_lelong = $tuntut_baki_bayar->sum('jumlah'); //h $gadai_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('pinjaman'); From 466f41ae50b4cfc6589a0854891a298b6b80f8ab Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 2 Oct 2021 09:55:22 +0800 Subject: [PATCH 2/2] fix mohon and pendser --- app/DenoPendSer.php | 28 ++++++ app/Http/Controllers/KelulusanController.php | 19 +++- .../PendahuluanSerahanController.php | 96 +++++++++++++++++++ app/Http/Controllers/TunaiController.php | 1 + app/Http/Controllers/VaultController.php | 33 +++++++ app/Mohon.php | 9 +- app/Mohonid.php | 4 + app/Polis.php | 4 +- routes/web.php | 10 ++ 9 files changed, 197 insertions(+), 7 deletions(-) create mode 100644 app/DenoPendSer.php create mode 100644 app/Http/Controllers/PendahuluanSerahanController.php diff --git a/app/DenoPendSer.php b/app/DenoPendSer.php new file mode 100644 index 0000000..8a23a20 --- /dev/null +++ b/app/DenoPendSer.php @@ -0,0 +1,28 @@ + $norujukan, 'siri' => $request->siri, 'komen' => $request->komen, - 'lastdategadai' => $request->dategadai, + 'margin' => $request->margin, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'status' => $request->status, 'bilgad' => $request->bilgadai, 'jumpinj' => $request->jumpinjam, 'jenistebus' => $request->jenistebus, 'teller' => $request->teller, 'pelulus' => ($request->pelulus) ? $request->pelulus : '' + + ]); } else if($roles == "operasi") @@ -226,7 +231,10 @@ class KelulusanController extends Controller 'norujukan'=> $norujukan, 'siri' => $request->siri, 'komen' => $request->komen, - 'lastdategadai' => $request->dategadai, + 'margin' => $request->margin, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'status' => $request->status, 'bilgad' => $request->bilgadai, 'jumpinj' => $request->jumpinjam, 'jenistebus' => $request->jenistebus, @@ -255,7 +263,11 @@ class KelulusanController extends Controller 'tarikh'=> $harini->toDateString(), 'mohon' => $request->mohon, 'norujukan' => $norujukan, - 'katalaluan' => $request->message, + 'katalaluan' => '', + 'pinjaman' => $request->pinjaman, + 'nilaimarhun' => $request->nilaimarhun, + 'berat' => $request->berat, + 'margin' => $request->margin, 'benar' => '0', 'teller' => $request->teller ]); @@ -276,6 +288,7 @@ class KelulusanController extends Controller ->where('tarikh','=',$harini->toDateString()) ->where('norujukan','=',$norujukan) ->update(array( + 'katalaluan' => $request->komen, 'benar' => '2', 'id' => $request->khazanah )); diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php new file mode 100644 index 0000000..983b7d3 --- /dev/null +++ b/app/Http/Controllers/PendahuluanSerahanController.php @@ -0,0 +1,96 @@ +create([ + + 'tarikh' => $current->toDateString(), + 'masa' => $current->toTimeString(), + 'kodcaw' => $kodcaw, + 'kodlaluan' => $request->kodlaluan, + 'amaun' => $request->amaun, + '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($denopendser,200); + } + + public function getDenoPendSer($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopendser = DenoPendSer::on('mysql7')->where('kodcaw','=', $kodcaw)->where('recno','=', $request->recno)->get(); + + return response()->json($denopendser,200); + } + + public function updateDenoPendSer($kodcaw,Request $request) + { + + $current = Carbon::now(); + $current = new Carbon(); + + + $denopendser = DenoPendSer::on('mysql7') + ->where('recno','=', $request->recno) + ->update(array( + 'pelulus' => $request->pelulus, + 'masalulus'=> $harini->toTimeString() + )); + + return response()->json($denopendser,200); + } + + public function delete(REQUEST $request,$kodcaw) + { + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + GlDetail::on($cawangan['mysql'])->where('recno','=',$request->recno)->delete(); + + return response('Batal Berjaya', 200); + } + + +} diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 0cd76a5..7054128 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -394,6 +394,7 @@ class TunaiController extends Controller $teller = Tunai::on($cawangan['mysql']) ->select('kodlaluan') ->whereRaw('LENGTH(kodlaluan) > 14') + ->orWhere('kodlaluan','=','LELONG') ->distinct() ->get(); diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 66daf7f..c30a119 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -8,6 +8,7 @@ use App\AddTunai; use App\GlDetail; use App\imbangdugalama; use App\GlCode; +use App\Panjar; use Illuminate\Http\Request; use Carbon\Carbon; @@ -163,6 +164,38 @@ class VaultController extends Controller return response()->json($updateVault, 200); } + public function updateVaultDeletePendahuluanSerahan($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']; + + $glpend = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('pendahuluan'); + $glser = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('serahan'); + + $bakiakhir = $bakiawal - $keluar + $masuk + $glpend - $glser - $totpanjaran; + + $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array( + 'pendahuluan' => $glpend, + 'serahan' => $glser, + 'bakiakhir'=>$bakiakhir, + 'bakieod'=>$bakiakhir + )); + + return response()->json($updateVault, 200); + } + public function create($kodcaw,Request $request) { $current = Carbon::now(); diff --git a/app/Mohon.php b/app/Mohon.php index 291f5a3..06a9b16 100644 --- a/app/Mohon.php +++ b/app/Mohon.php @@ -19,14 +19,17 @@ class Mohon extends Model 'norujukan', 'siri', 'komen', - 'lastdategadai', - 'bildad', + 'bilgad', 'jumpinj', 'jenistebus', 'teller', 'pelulus', 'peloperasi', - 'masalulus' + 'masalulus', + 'margin', + 'nilaimarhun', + 'berat', + 'status' ]; /** diff --git a/app/Mohonid.php b/app/Mohonid.php index 75a5f61..c474be9 100644 --- a/app/Mohonid.php +++ b/app/Mohonid.php @@ -23,6 +23,10 @@ class Mohonid extends Model 'id', 'katalaluan', 'benar', + 'pinjaman', + 'nilaimarhun', + 'berat', + 'margin', 'teller' ]; diff --git a/app/Polis.php b/app/Polis.php index c705d76..5222f27 100644 --- a/app/Polis.php +++ b/app/Polis.php @@ -23,7 +23,9 @@ class Polis extends Model 'tebus', 'recno', 'teller', - 'caj' + 'caj', + 'koddaerah', + 'kodnegeri' ]; diff --git a/routes/web.php b/routes/web.php index 0804f6f..eb09cf5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -317,6 +317,16 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->post('requestdenopanjar/update/{kodcaw}',['uses' => 'PanjarController@updateDenoPanjar']); $router->post('requestdenopanjar/batal/{kodcaw}',['uses' => 'PanjarController@batalDenoPanjar']); + $router->post('requestdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@createDenoPendSer']); + $router->get('getdenopendser/{kodcaw}',['uses' => 'PendahuluanSerahanController@getDenoPendSer']); + $router->post('requestdenopendser/update/{kodcaw}',['uses' => 'PendahuluanSerahanController@updateDenoPendSer']); + $router->get('SenaraiPendSer/listeach/{kodcaw}',['uses'=>'PendahuluanSerahanController@listeachpendser']); + $router->post('DeletePendSer/{kodcaw}',['uses'=>'PendahuluanSerahanController@delete']); + + // $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']); + $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePendahuluanSerahan']); + // $router->post('requestdenopendser/batal/{kodcaw}',['uses' => 'PendahuluanSerahanController@batalDenoPanjar']); + //API WAKIL