From f09184be1d5bcf4d3fb514deba72ae00821537f3 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 13 Apr 2021 21:48:46 +0800 Subject: [PATCH] fix separuh tebus --- app/Http/Controllers/KhazanahController.php | 62 ++- resources/views/khazanah/panjar.blade.php | 104 ++-- resources/views/modal/denopanjar.blade.php | 73 +-- resources/views/modal/panjar.blade.php | 79 +++ resources/views/penebusan/index.blade.php | 530 +++++++++++++++----- 5 files changed, 627 insertions(+), 221 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 137d17b..e06040d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -624,8 +624,6 @@ class KhazanahController extends Controller { $auth_user = Auth::user(); - // dd(request()->all()); - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bakiperubatan = 0; @@ -657,6 +655,58 @@ class KhazanahController extends Controller break; } + $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json(); + + //bundle initialize + $rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20']; + $rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100']; + + //wang Syilling Initialize + $rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10']; + $rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50']; + + //Wang Ringgit Initialize + $rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10']; + $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100']; + + //Tolok Rekod + $rekodsen1 -= intval($request->ambilansen1); + $rekodsen5 -= intval($request->ambilansen5); + $rekodsen10 -= intval($request->ambilansen10); + $rekodsen20 -= intval($request->ambilansen20); + $rekodsen50 -= intval($request->ambilansen50); + + $rekodring1 -= intval($request->ambilanring1); + $rekodring5 -= intval($request->ambilanring5); + $rekodring10 -= intval($request->ambilanring10); + $rekodring20 -= intval($request->ambilanring20); + $rekodring50 -= intval($request->ambilanring50); + $rekodring100 -= intval($request->ambilanring100); + + $denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ + 'bd1' => $rekodb1, + 'bd5'=> $rekodb5, + 'bd10'=> $rekodb10, + 'bd20'=> $rekodb20, + 'bd50'=> $rekodb50, + 'bd100'=> $rekodb100, + 'txtring1'=> $rekodring1, + 'txtring5'=> $rekodring5, + 'txtsen1'=> $rekodsen1, + 'txtsen5'=> $rekodsen5, + 'txtsen10'=> $rekodsen10, + 'txtsen20'=> $rekodsen20, + 'txtsen50'=> $rekodsen50, + 'txtring10'=> $rekodring10, + 'txtring20'=> $rekodring20, + 'txtring50'=> $rekodring50, + 'txtring100'=> $rekodring100, + 'txtring1000'=> "0", + 'jumlahbundle'=> "0", + 'txtjumlah'=> "0", + 'jumlahkeping' => "0" + ]); + $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ 'deskripsi' => $request->deskripsi, @@ -674,8 +724,6 @@ class KhazanahController extends Controller $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[ 'totpanjar'=>$request->bayaran ]); - - return response($updateVault); } @@ -1034,6 +1082,7 @@ class KhazanahController extends Controller $pendahuluanV=$latestVault[0]['pendahuluan']; $serahanV=$latestVault[0]['serahan']; $bakiAwalV=$latestVault[0]['bakiawal']; + $totpanjar = $latestVault[0]['totpanjar']; // return; // dd($tambahT); @@ -1043,7 +1092,7 @@ class KhazanahController extends Controller $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $bakiTerkini=$GetLatestBakiTunai; - $bakiAkhirV=$bakiAwalV-$keluarV+$masukV+$pendahuluanV-$serahanV; + $bakiAkhirV=$bakiAwalV - $keluarV + $masukV + $pendahuluanV - $serahanV - $totpanjar; // $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai; //try test $bakiEOD = $bakiAkhirV; @@ -1181,6 +1230,7 @@ class KhazanahController extends Controller $pendahuluanV=$latestVault[0]['pendahuluan']; $serahanV=$latestVault[0]['serahan']; $bakiAwalV=$latestVault[0]['bakiawal']; + $totpanjar = $latestVault[0]['totpanjar']; //dd($latestVault); @@ -1224,7 +1274,7 @@ class KhazanahController extends Controller $sumBaki=$GetLatestBakiTunai; - $bakiAkhirV=$bakiAwalV-$keluar_V+$masuk_V+$pendahuluan_V-$serahan_V; + $bakiAkhirV = $bakiAwalV - $keluar_V + $masuk_V + $pendahuluan_V - $serahan_V - $totpanjar; //dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V); $BakiEOD=$bakiAkhirV; diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 609507c..979283a 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -200,51 +200,51 @@ function checkformpanjar(formdata) { - let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan; + // let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan; - //Variable Initialize - let baucer = $(formdata).find("[name='baucer']").val(); - let tarikh = $(formdata).find("[name='tarikh']").val(); - let tuntutan = $(formdata).find("[name='tuntutan']").val(); - let tarikhbil = $(formdata).find("[name='tarikhbil']").val(); - let deskripsi = $(formdata).find("[name='deskripsi']").val(); - let bayaran = $(formdata).find("[name='bayaran']").val(); + // //Variable Initialize + // let baucer = $(formdata).find("[name='baucer']").val(); + // let tarikh = $(formdata).find("[name='tarikh']").val(); + // let tuntutan = $(formdata).find("[name='tuntutan']").val(); + // let tarikhbil = $(formdata).find("[name='tarikhbil']").val(); + // let deskripsi = $(formdata).find("[name='deskripsi']").val(); + // let bayaran = $(formdata).find("[name='bayaran']").val(); - var validation = Array.prototype.filter.call(formdata, function(form) { - if (form.checkValidity() === false) { - event.preventDefault(); - event.stopPropagation(); - } - form.classList.add('is-invalid'); - }); + // var validation = Array.prototype.filter.call(formdata, function(form) { + // if (form.checkValidity() === false) { + // event.preventDefault(); + // event.stopPropagation(); + // } + // form.classList.add('is-invalid'); + // }); - if(!tarikh) - { - console.log('tarikh xleh'); - } + // if(!tarikh) + // { + // console.log('tarikh xleh'); + // } - if(!tarikhbil) - { - console.log('tarikh xde'); - } + // if(!tarikhbil) + // { + // console.log('tarikh xde'); + // } - if(dapur === false) - { - if(!tuntutan) - console.log('tututan xde'); - } + // if(dapur === false) + // { + // if(!tuntutan) + // console.log('tututan xde'); + // } - if(deskripsi === '' || deskripsi === null) - { - console.log('deskripsi xde'); - } + // if(deskripsi === '' || deskripsi === null) + // { + // console.log('deskripsi xde'); + // } - if(bayaran === null || bayaran === '') - { - console.log('bayaran xde'); - } + // if(bayaran === null || bayaran === '') + // { + // console.log('bayaran xde'); + // } - return false; + // return false; } function openupdeno() @@ -278,6 +278,20 @@ $('input[name="bayaran"]').val(amaunkiraan); $('#denominasipanjar').modal('hide'); + // console.log($('input[name="ambilsen1"]').val()); + $('input[name="ambilansen1"]').val($('input[name="ambilsen1"]').val()); + $('input[name="ambilansen5"]').val($('input[name="ambilsen5"]').val()); + $('input[name="ambilansen10"]').val($('input[name="ambilsen10"]').val()); + $('input[name="ambilansen20"]').val($('input[name="ambilsen20"]').val()); + $('input[name="ambilansen50"]').val($('input[name="ambilsen50"]').val()); + + $('input[name="ambilanring1"]').val($('input[name="ambilring1"]').val()); + $('input[name="ambilanring5"]').val($('input[name="ambilring5"]').val()); + $('input[name="ambilanring10"]').val($('input[name="ambilring10"]').val()); + $('input[name="ambilanring20"]').val($('input[name="ambilring20"]').val()); + $('input[name="ambilanring50"]').val($('input[name="ambilring50"]').val()); + $('input[name="ambilanring100"]').val($('input[name="ambilring100"]').val()); + // $('#amaunkiraan').val(0); } @@ -296,7 +310,7 @@ $('#SelenggaraModal').on('hidden.bs.modal', function (e) { $(this) .find("input,textarea,select") - .val(0) + .val('') .end() .find("input[type=checkbox], input[type=radio]") .prop("checked", "") @@ -334,14 +348,14 @@ .end(); }); - $('#denominasipanjar').on('hidden.bs.modal', function (e) { - $(this) - .find("input") - .val('') - .end(); + // $('#denominasipanjar').on('hidden.bs.modal', function (e) { + // $(this) + // .find(".kosong") + // .val('') + // .end(); - $('#amaunkiraan').val(0); - }); + // $('#amaunkiraan').val(0); + // }); //End Modal Reset diff --git a/resources/views/modal/denopanjar.blade.php b/resources/views/modal/denopanjar.blade.php index 570aea4..8f7fc73 100644 --- a/resources/views/modal/denopanjar.blade.php +++ b/resources/views/modal/denopanjar.blade.php @@ -24,72 +24,73 @@ - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + +
Peti Besi Ambilan Jumlah (RM) Peti Besi Ambilan Jumlah (RM)
RM0.01 RM1
RM0.05 RM5
RM0.10 RM10
RM0.20 RM20
RM0.50 RM50
RM100 RM100
diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index 005e617..8621ce9 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -13,6 +13,20 @@