From b9c89b1d6acee765abf1c6edd61382b20ef4b2e5 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 11 May 2021 16:36:47 +0800 Subject: [PATCH 1/6] fix tuntutbaki --- app/Http/Controllers/AliranTunaiController.php | 10 ++++++++-- app/Http/Controllers/LelongController.php | 6 ++++-- resources/views/lelongan/index.blade.php | 8 ++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index b355410..65c86a1 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1431,7 +1431,7 @@ class AliranTunaiController extends Controller $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json(); $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json(); - + $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json(); $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json(); $totalserahan = 0; @@ -1501,11 +1501,17 @@ class AliranTunaiController extends Controller $totalupahlama += $upahlama['upahDibayar']; } + $totaltuntutbaki = 0; + foreach($tuntutbaki as $index1=>$tb) + { + $totaltuntutbaki += $tb['jumlah']; + } + $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); $gadaian = floatval($totalgadai); - $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)); + $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false; diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5f07630..9f64533 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -91,8 +91,10 @@ class LelongController extends Controller $bakiakhir = $baki; - $bakiakhir -= $request->jumlah; - + if($request->jenis == 'T') + $bakiakhir -= $request->jumlah; + else + $bakiakhir += -($request->jumlah); //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index e275dfb..b1bd3fb 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -207,6 +207,8 @@ buttonsStyling: false }); + let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); + swalWithBootstrapButtons.fire({ title: 'Dapatkan Pengesahan Khazanah', text: "Tuntutan Baki Pelanggan!", @@ -246,9 +248,9 @@ } - let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val(); + let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val(); let cajlain = 0.00; let cajlelong = $('#cajlelong').val(); - let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); + let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); $.ajax({ method:'post', @@ -273,8 +275,6 @@ var channel = pusher.subscribe('notice-ubahhapus'); channel.bind('my-ubahhapus', function(data) { - console.log(data); - if(data.norujukan == norujukan) { From 42b6079331a713df1c97841c79546ed3186d8b59 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 11 May 2021 17:17:12 +0800 Subject: [PATCH 2/6] caj perkhidmatan terkumpul tertinggal --- app/Http/Controllers/KhazanahController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 9586863..87b9f32 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3427,6 +3427,7 @@ class KhazanahController extends Controller if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); From eeb8e32743d7a06fea7662344ff073f2a41f9b28 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 12 May 2021 09:05:56 +0800 Subject: [PATCH 3/6] fix penebusan --- app/Http/Controllers/PenebusanController.php | 30 +++++ public/js/main.js | 109 ++++++++++++++++++- resources/views/khazanah/panjar.blade.php | 4 +- resources/views/modal/denopanjar.blade.php | 22 ++-- resources/views/penebusan/index.blade.php | 10 +- routes/web.php | 1 + 6 files changed, 158 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index da38505..e61b57d 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -38,6 +38,36 @@ class PenebusanController extends Controller return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa')); } + public function tebuspenuh(Request $request) + { + $api_url = config('api.url'); + + $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $request->kodcaw .'/' . $request->norujukan,[ + "nopelanggan" => $request->nopelanggan, + "jenistebus" => $request->jenistebus, + "jbg" => $request->jbg, + "kadarupah" => $request->kadarupah, + "nilai_marhun" => $request->nilai_marhun, + "pinjaman" => $request->pinjaman, + "ansuran" => $request->ansuran, + "addpinjaman" => $request->addpinjaman, + "bakipinjaman" => $request->bakipinjaman, + "bakiupah" => $request->bakiupah, + "historygadaian" => $request->historygadaian, + "marhun" => $request->marhun, + "nowakil" => $request->nowakil, + "jenisbayarantebus" => $request->jenisbayarantebus, + "teller" => $request->teller + ])->json(); + + if($updatetebus) + { + return response('success'); + }else{ + return response('fail'); + } + } + public function bayaransuransTawarruq(Request $request) { $api_url = config('api.url'); diff --git a/public/js/main.js b/public/js/main.js index 9d027d9..7403408 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -135,7 +135,6 @@ function totalkeyserahan(datakeyin) $.each(arrayambilan, function( index, arr ){ if(arr[0] == idkey) { - arrayambilan[index][1] = totalamount(idkey,valkey); } @@ -267,6 +266,114 @@ function kiraan(datakeyin) } +function kiraanpanjar(datakeyin) +{ + var idkey = $(datakeyin).attr('id'); + var valkey = $(datakeyin).val(); + var amount = 0; + let amountkiraan = 0; + + var validate = parseFloat($('#amaundiminta').val()); + + console.log(validate); + $.each(arrayambilan, function( index, arr ){ + if(arr[0] == idkey) + { + + arrayambilan[index][1] = totalamount(idkey,valkey); + } + + amount += arr[1]; + }); + + if(amount > validate) + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Jumlah denominasi melebihi kadar' + }); + } + else + { + + $('#amaunkiraan').val(amount); + + } + + switch(idkey) { + case 'bundle1': + amountkiraan += (valkey * 100); + $('#totalb1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle20': + amountkiraan += (valkey * 1000); + $('#totalb20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle5': + amountkiraan += (valkey * 500); + $('#totalb5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle50': + amountkiraan += (valkey * 5000); + $('#totalb50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle10': + amountkiraan += (valkey * 1000); + $('#totalb10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'bundle100': + amountkiraan += (valkey * 5000); + $('#totalb100').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen1': + amountkiraan += (valkey * 0.01); + $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen5': + amountkiraan += (valkey * 0.05); + $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen10': + amountkiraan += (valkey * 0.05); + $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen20': + amountkiraan += (valkey * 0.20); + $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'sen50': + amountkiraan += (valkey * 0.50); + $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit1': + amountkiraan += (valkey * 1); + $('#totalring1').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit5': + amountkiraan += (valkey * 5); + $('#totalring5').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit10': + amountkiraan += (valkey * 10); + $('#totalring10').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit20': + amountkiraan += (valkey * 20); + $('#totalring20').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit50': + amountkiraan += (valkey * 50); + $('#totalring50').val(formatter.format(amountkiraan.toFixed(2))); + break; + case 'ringgit100': + amountkiraan += (valkey * 100); + $('#totalring100').val(formatter.format(amountkiraan.toFixed(2))); + break; + } + +} + async function openuptambahdanserah(e) { var id = $(e).attr('id'); diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 2a5f9e7..190d327 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -134,7 +134,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Tambah Marhun Tidak Berjaya' + text: 'Panjar Tak Berjaya' }); console.log(xhRequest); } @@ -196,7 +196,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Tambah Marhun Tidak Berjaya' + text: 'Panjar Tidak Berjaya' }); console.log(xhRequest); } diff --git a/resources/views/modal/denopanjar.blade.php b/resources/views/modal/denopanjar.blade.php index 8f7fc73..76119ce 100644 --- a/resources/views/modal/denopanjar.blade.php +++ b/resources/views/modal/denopanjar.blade.php @@ -35,51 +35,51 @@ RM0.01 - + RM1 - + RM0.05 - + RM5 - + RM0.10 - + RM10 - + RM0.20 - + RM20 - + RM0.50 - + RM50 - + @@ -89,7 +89,7 @@ RM100 - + diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index cdc7a04..55aa5ad 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -926,10 +926,12 @@ var nowakil = nw; $.ajax({ - method:'put', + method:'get', datatype: 'json', - url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan, + url: "{{ route('tebus.penuh') }}", data:{ + "kodcaw" : kodcaw, + "norujukan" : norujukan, "nopelanggan" : nopelanggan, "jenistebus" : jenistebus, "jbg" : jbg, @@ -949,7 +951,7 @@ success:function(success_data){ - if(success_data == 1) + if(success_data == 'success') { $.ajax({ method: 'put', @@ -980,7 +982,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!', + text: 'norujukan Sudah ditebus di dalam table gadai!', }); } } diff --git a/routes/web.php b/routes/web.php index 7dec167..bf260ff 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,7 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira //MAINTENANCE +Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller'); Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller'); Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller'); From e7a9a92699fda0dbd165d2f29b1c8b41003c817c Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 12 May 2021 17:44:53 +0800 Subject: [PATCH 4/6] fix plenaggan --- app/Http/Controllers/KhazanahController.php | 44 +- .../views/homepage/khazanah/home.blade.php | 2 +- resources/views/khazanah/index.blade.php | 653 ++++++++++- resources/views/khazanah/info.blade.php | 1034 +++++++++++++---- routes/web.php | 3 +- 5 files changed, 1423 insertions(+), 313 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 87b9f32..f88e879 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -36,25 +36,57 @@ class KhazanahController extends Controller $api_url = config('api.url'); $auth_user = Auth::user(); + $idtype = 'nokp'; $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::get(config('api.url') . '/api/bank')->json(); - return view('khazanah.index',compact('search','cawangan_info','bank','api_url')); + return view('khazanah.index',compact('search','cawangan_info','bank','api_url','idtype')); + } + + public function search(Request $request){ + $noic = $request->noic; + $idtype = $request->customerIDType; + Session::put('noic', $noic); + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $bank = Http::get(config('api.url') . '/api/bank')->json(); + $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + + if($customers_info){ + $customer_info = $customers_info[0]; + }else{ + $customer_info = $customers_info; + } + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + $search = true; + + if($customer_info){ + Session::put('customer_info_khazanah',$customer_info); + return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + }else{ + return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype')); + } } public function info(Request $request){ $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->noic)->json(); + $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); if($customers_info){ $customer_info = $customers_info[0]; }else{ $customer_info = $customers_info; } + $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json(); + $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json(); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); - return view('khazanah.info',compact('cawangan_info','api_url','customer_info')); + return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong')); } public function menu() @@ -2838,7 +2870,7 @@ class KhazanahController extends Controller } public function cetakLaporanRingkasanHarian(Request $request){ - // dd($request); + $api_url = config('api.url'); $auth_user = Auth::user(); $current = Carbon::now(); @@ -2904,11 +2936,11 @@ class KhazanahController extends Controller $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil']; $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil']; - $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); + $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj']; $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj']; - $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); + $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; $totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira; $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira; diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 9769bbe..c70cbe4 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -174,7 +174,7 @@
- Pelanggan + Pelanggan
Laporan diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php index 78fc091..4195a35 100644 --- a/resources/views/khazanah/index.blade.php +++ b/resources/views/khazanah/index.blade.php @@ -10,17 +10,31 @@
+ + +
masukkan nombor kad pengenalan
-
+
-
+
- +
- + +
+
+
@@ -29,14 +43,14 @@
@if($search == true )
-
@endif
- +
+
@@ -151,271 +400,529 @@
- - -
-
-
- -

maklumat pelanggan

- -
-
-
-
- Nama -
-
- -
-
-
-
-
-
- No Kad Pengenalan -
-
- -
-
-
- -
-
- - - -
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- - {{-- Sudah Tebus --}} - - - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- - - - - - - - - - - - - - - - - - -
BilNo RujukanTarikh GadaiPembiayaanNilai MarhunTempohKeuntunganTarikh MatangMarginKos KeuntunganHapus Gadai
- -
-
-
-
-
@endsection diff --git a/routes/web.php b/routes/web.php index bf260ff..eefb395 100644 --- a/routes/web.php +++ b/routes/web.php @@ -125,6 +125,7 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah'); Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); +Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); @@ -143,7 +144,7 @@ Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahControlle Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah'); Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah'); Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah'); -Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); +Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah'); Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah'); Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller'); From 0f96ef1efea37a47021637c9ddd7b11703150b95 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 16 May 2021 07:22:57 +0800 Subject: [PATCH 5/6] fix skit2 --- .../Controllers/AliranTunaiController.php | 13 +- app/Http/Controllers/LelongController.php | 7 +- public/js/main.js | 6 +- resources/views/khazanah/dashboard.blade.php | 4 +- resources/views/khazanah/panjar.blade.php | 204 ++++++++++++++---- .../khazanah/pendahuluanserahanmain.blade.php | 71 +++++- ...enominasimodalpendahuluanserahan.blade.php | 1 + resources/views/modal/panjar.blade.php | 149 +++++++------ .../views/modal/pendahuluanserahan.blade.php | 3 + .../views/print/laporan_gadaian.blade.php | 2 +- .../print/laporan_marhunterkumpul.blade.php | 47 ++-- .../views/print/laporan_penebusan.blade.php | 40 +++- 12 files changed, 408 insertions(+), 139 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 65c86a1..12a57bb 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -1502,14 +1502,23 @@ class AliranTunaiController extends Controller } $totaltuntutbaki = 0; + $bakilelong = 0; + $rugilelong = 0; foreach($tuntutbaki as $index1=>$tb) { + if($tb['jenis'] == 'T') + { + $bakilelong += $tb['jumlah']; + }else{ + $rugilelong += -($tb['jumlah']); + } + $totaltuntutbaki += $tb['jumlah']; } $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama); - $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); - $gadaian = floatval($totalgadai); + $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama) + $rugilelong; + $gadaian = floatval($totalgadai) + $bakilelong; $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9f64533..530f5a1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -91,10 +91,15 @@ class LelongController extends Controller $bakiakhir = $baki; - if($request->jenis == 'T') + if($request->jenis == 'T'){ $bakiakhir -= $request->jumlah; + $keluar += $request->jumlah; + } else + { $bakiakhir += -($request->jumlah); + $masuk += -($request->jumlah); + } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/public/js/main.js b/public/js/main.js index 7403408..d422400 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -273,9 +273,8 @@ function kiraanpanjar(datakeyin) var amount = 0; let amountkiraan = 0; - var validate = parseFloat($('#amaundiminta').val()); + var validate = parseFloat($(datakeyin).data('amaun')); - console.log(validate); $.each(arrayambilan, function( index, arr ){ if(arr[0] == idkey) { @@ -286,13 +285,14 @@ function kiraanpanjar(datakeyin) amount += arr[1]; }); - if(amount > validate) + if(Number(valkey) > Number(validate)) { Swal.fire({ icon: 'error', title: 'Amaran', text: 'Jumlah denominasi melebihi kadar' }); + $(datakeyin).val(''); } else { diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 4d34971..46c23a3 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -150,11 +150,11 @@
Keuntungan :
-

RM {{ number_format($keuntungan) }}

+

RM {{ number_format($keuntungan,2) }}

Upah Simpan :
-

RM {{ number_format($upahsimpan) }}

+

RM {{ number_format($upahsimpan,2) }}

diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 190d327..67b0b5e 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -208,52 +208,81 @@ function checkformpanjar(formdata) { + + // let keraian = $('#KeraianForm').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 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(); + let tarikhbil = $(formdata).find("[name='bil']").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'); - // }); - // if(!tarikh) - // { - // console.log('tarikh xleh'); - // } + let booltarikh = false;let booltuntutan = false; let booltarikhbil = false; let booldeskripsi = false; let boolbayaran = false; - // if(!tarikhbil) - // { - // console.log('tarikh xde'); - // } + if(!tarikh) + { + $(formdata).find("[name='errortarikh']").show(); + $(formdata).find("[name='errortarikh']").text("*Isikan tarikh dalam input!"); + $(formdata).find("[name='tarikh']").addClass('is-invalid'); + $(formdata).find("[name='tarikh']").parent().removeClass("mb-4"); - // if(dapur === false) - // { - // if(!tuntutan) - // console.log('tututan xde'); - // } + booltarikh = true; + } - // if(deskripsi === '' || deskripsi === null) - // { - // console.log('deskripsi xde'); - // } + if(!tarikhbil) + { + $(formdata).find("[name='errorbil']").show(); + $(formdata).find("[name='errorbil']").text("*Isikan tarikh bil dalam input!"); + $(formdata).find("[name='tarikhbil']").addClass('is-invalid'); + $(formdata).find("[name='tarikhbil']").parent().removeClass("mb-4"); + + booltarikhbil = true; + + } + + if(!$.trim(deskripsi)) + { + $(formdata).find("[name='errordeskripsi']").show(); + $(formdata).find("[name='errordeskripsi']").text("*Isikan tarikh deskripsi dalam input!"); + $(formdata).find("[name='deskripsi']").addClass('is-invalid'); + $(formdata).find("[name='deskripsi']").parent().removeClass("mb-4"); + + booldeskripsi = true; + } + + if(!bayaran) + { + $(formdata).find("[name='errorbayaran']").show(); + $(formdata).find("[name='errorbayaran']").text("*Isikan bayaran dalam input!"); + $(formdata).find("[name='bayaran']").addClass('is-invalid'); + $(formdata).find("[name='bayaran']").parent().removeClass("mb-4"); + + boolbayaran = true; + + } + + let errorbaucer = $(formdata).find("[name='errorbaucer']").text(); + let errortarikh = $(formdata).find("[name='errortarikh']").text(); + let errortuntutan = $(formdata).find("[name='errortuntutan']").text(); + let errortarikhbil = $(formdata).find("[name='errorbil']").text(); + let errordeskripsi = $(formdata).find("[name='errordeskripsi']").text(); + let errorbayaran = $(formdata).find("[name='errorbayaran']").text(); - // if(bayaran === null || bayaran === '') - // { - // console.log('bayaran xde'); - // } - // return false; + if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true) + { + event.preventDefault(); + return; + }else{ + return true; + } + + event.preventDefault(); + return; + + } function openupdeno() @@ -314,6 +343,27 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); + }); $('#SelenggaraModal').on('hidden.bs.modal', function (e) { @@ -324,6 +374,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); $('#BelanjaamModal').on('hidden.bs.modal', function (e) { @@ -334,6 +404,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); $('#PerubatanModal').on('hidden.bs.modal', function (e) { @@ -344,6 +434,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); @@ -355,6 +465,26 @@ .find("input[type=checkbox], input[type=radio]") .prop("checked", "") .end(); + + $(this).find("[name='errortarikh']").hide(); + $(this).find("[name='tarikh']").removeClass('is-invalid'); + $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errortuntutan']").hide(); + $(this).find("[name='tuntutan']").removeClass('is-invalid'); + $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find("[name='errorbil']").hide(); + $(this).find("[name='tarikhbil']").removeClass('is-invalid'); + $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + $(this).find("[name='errordeskripsi']").hide(); + $(this).find("[name='deskripsi']").removeClass('is-invalid'); + $(this).find("[name='deskripsi']").parent().addClass("mb-4"); + + $(this).find("[name='errorbayaran']").hide(); + $(this).find("[name='bayaran']").removeClass('is-invalid'); + $(this).find("[name='bayaran']").parent().addClass("mb-4"); }); // $('#denominasipanjar').on('hidden.bs.modal', function (e) { diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index 951cc09..4d6230a 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -150,12 +150,77 @@ let dtacct = $('#dtacct').val(); let ktacct = $('#ktacct').val(); - $('#amaundiminta').val(amaun); + let boolamaun = false;let boolketerangan = false;let booljenis = false; + if(!amaun) + { + $("[name='erroramaun']").show(); + $("[name='erroramaun']").text("*Isikan amaun dalam input!"); + $("[name='amaun']").addClass('is-invalid'); - $('#denominasiHQModal').modal('show'); - $('#pendahuluanserahanModal').modal('hide'); + boolamaun = true; + }else{ + $("[name='erroramaun']").hide(); + $("[name='amaun']").removeClass('is-invalid'); + + boolamaun = false; + } + + if(!keterangan) + { + $("[name='errorketerangan']").show(); + $("[name='errorketerangan']").text("*Isikan keterangan dalam input!"); + $("[name='keterangan']").addClass('is-invalid'); + + boolketerangan = true; + }else{ + $("[name='errorketerangan']").hide(); + $("[name='keterangan']").removeClass('is-invalid'); + + boolketerangan = false; + } + + if(!jenis) + { + $(".invalid-feedback").show(); + + booljenis = true; + }else{ + $(".invalid-feedback").hide(); + + booljenis = false; + } + + if(boolamaun === false && boolketerangan === false && booljenis === false) + { + console.log('masuk'); + $('#amaundiminta').val(amaun); + $('#denominasiHQModal').modal('show'); + $('#pendahuluanserahanModal').modal('hide'); + return true; + }else{ + event.preventDefault(); + return false; + } + + } + $('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) { + + $(this).find("[name='erroramaun']").hide(); + $(this).find("[name='amaun']").removeClass('is-invalid'); + // $(this).find("[name='tarikh']").parent().addClass("mb-4"); + + $(this).find("[name='errorketerangan']").hide(); + $(this).find("[name='keterangan']").removeClass('is-invalid'); + // $(this).find("[name='tuntutan']").parent().addClass("mb-4"); + + $(this).find(".invalid-feedback").hide(); + // $(this).find("[name='errorradio']").removeClass('is-invalid'); + // $(this).find("[name='tarikhbil']").parent().addClass("mb-4"); + + }); + function funcbatal() { $('#denominasiHQModal').modal('hide'); diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index 2c9179d..c5f5b76 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -118,6 +118,7 @@ + RM100 diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index 8621ce9..73ac7aa 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -8,7 +8,7 @@
-
+ @csrf
@@ -31,60 +31,50 @@
-
- +
+ +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
-
- @foreach($usercawangan as $user) @endforeach -
- tarikh haruslah dimasukkan ke dalam ni! -
- {{-- --}} +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
-
- -
- tarikh haruslah dimasukkan ke dalam ni! -
+
+ +
- + -
- tarikh haruslah dimasukkan ke dalam ni! -
+
@@ -132,35 +122,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -169,6 +164,7 @@
+
@@ -216,35 +212,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -253,6 +254,7 @@
+
@@ -302,35 +304,40 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -339,6 +346,7 @@
+
@@ -387,36 +395,41 @@
+
-
- +
+ +
-
- @foreach($usercawangan as $user) @endforeach + {{-- --}}
-
- +
+ +
-
- +
+ +
@@ -472,25 +485,29 @@
+
-
- +
+ +
-
- +
+ +
-
+
{{-- --}} - + +
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index a3c84af..aa519f0 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -13,6 +13,7 @@
+
Pilih Jenis Pendahuluan-Serahan
@@ -31,10 +32,12 @@
+
+
diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 031a6b8..579693b 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -261,7 +261,7 @@ {{ number_format($totalupah12,2) }} - @php $counter = 1; @endphp + @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp @endif @else diff --git a/resources/views/print/laporan_marhunterkumpul.blade.php b/resources/views/print/laporan_marhunterkumpul.blade.php index 6d5fb6b..19eb078 100644 --- a/resources/views/print/laporan_marhunterkumpul.blade.php +++ b/resources/views/print/laporan_marhunterkumpul.blade.php @@ -222,30 +222,34 @@ N.Marhun Catatan - @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;@endphp + @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;$totalkeseluruhanmarhun = 0;$totalkeseluruhanpinjaman = 0;$totalkeseluruhanberat = 0;@endphp @foreach($marhun as $index=>$item) + @php $totalkeseluruhanmarhun += floatval($item['n_marhun']);$totalkeseluruhanberat += floatval($item['berat']); @endphp @if($index == 0) + {{-- masuk mula --}} {{ $counter }} {{ $item['norujukan'] }} {{ $item['nokp'] }} {{ $item['nama'] }} - {{ $item['pinjaman'] }} + {{ number_format($item['pinjaman'],2) }} {{ $item['marhun'] }} {{ $item['karat'] }} {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['n_marhun'],2) }} @if($index != sizeof($marhun) - 1) + {{-- kedua --}} @if($item['norujukan'] != $marhun[$index+1]['norujukan']) + {{-- ketiga --}} - JUMLAH + JUMLAH {{ number_format($item['berat'],2) }} {{ number_format($item['n_marhun'],2) }} @@ -256,7 +260,7 @@ @endif @endif - @php $counter++; @endphp + @php $counter++; $masuk = true;@endphp @else @if($item['norujukan'] == $marhun[$index-1]['norujukan']) {{-- masuk 1 --}} @@ -267,8 +271,8 @@ {{ $item['marhun'] }} {{ $item['karat'] }} - {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['berat'],2) }} + {{ number_format($item['n_marhun'],2) }} @@ -280,21 +284,21 @@ @endphp @else - @php - $totalberat += floatval($item['berat']); - $totalnm += floatval($item['n_marhun']); - @endphp + @php + $totalberat += floatval($item['berat']); + $totalnm += floatval($item['n_marhun']); + @endphp {{-- masuk2 --}} {{ $counter }} {{ $item['norujukan'] }} {{ $item['nokp'] }} {{ $item['nama'] }} - {{ $item['pinjaman'] }} + {{ number_format($item['pinjaman'],2) }} {{ $item['marhun'] }} {{ $item['karat'] }} - {{ $item['berat'] }} - {{ $item['n_marhun'] }} + {{ number_format($item['berat'],2) }} + {{ number_format($item['n_marhun'],2) }} @@ -324,7 +328,7 @@ @endif @if(($index == sizeof($marhun) - 1)) - {{-- kucen --}} + {{-- kucen2 --}} JUMLAH @@ -342,6 +346,19 @@ @endforeach + + + + + JUMLAH + {{ number_format($totalkeseluruhanberat,2) }} + {{ number_format($totalkeseluruhanmarhun,2) }} + + + + + +
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0a0a048..442e8cb 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -213,13 +213,15 @@ T Gadai T Tebus JBG + J Tebus Pembiayaan(RM) Upah/Keuntungan(RM) Bayaran(RM) + Jumlah(RM) @php $counter = 1; $totalbayaran = 0;@endphp @foreach($tebus as $index=>$item) - @php $totalbayaran += $item['bakipjm'] @endphp + @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp @if($index > 0) @if($item['teller'] != $tebus[$index - 1]['teller']) @@ -231,7 +233,7 @@ Teller : {{ $item['teller'] }} - @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp + @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp @endif {{ $counter }} @@ -249,33 +251,46 @@ @php $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']); $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) + echo($formattedweddingdate); @endphp - {{$item['t_tebus']}} - {{$item['jbg']}} - {{$item['pinjaman']}} - {{$item['bakiupah']}} - {{$item['bakipjm']}} + + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate); + @endphp + + {{ $item['jbg'] }} + {{$item['jenistebus']}} + {{ number_format($item['pinjaman'],2) }} + {{ number_format($item['bakiupah'],2) }} + {{ number_format($item['bakipjm'],2) }} + @php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp @php $counter++; @endphp @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp + @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp @if($index+1 < sizeof($tebus)) @if($item['teller'] != $tebus[$index + 1]['teller']) {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpinjamanteller,2) }} {{ number_format($totalupahteller,2) }} {{ number_format($totalbayaranteller,2) }} + {{ number_format($totaljumlahteller,2) }} - @php $counter = 0; @endphp + @php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp @endif @else {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ number_format($totalpinjamanteller,2) }} {{ number_format($totalupahteller,2) }} {{ number_format($totalbayaranteller,2) }} + {{ number_format($totaljumlahteller,2) }} @endif @endforeach @@ -334,6 +349,13 @@ {{ number_format($upahlama['total'],2) }} Not Applicable + + 0 + Baki Lelong + 0.00 + Not Applicable + Not Applicable + From 7074d2da715c31bf867485ff8b51a03394021f16 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 16 May 2021 14:42:09 +0800 Subject: [PATCH 6/6] fix audio operasi --- app/Http/Controllers/KhazanahController.php | 388 +++--- app/Http/Controllers/PenebusanController.php | 20 + resources/views/customers/info.blade.php | 4 +- .../views/homepage/khazanah/home.blade.php | 2 +- resources/views/khazanah/info.blade.php | 2 +- resources/views/layouts/app_operasi.blade.php | 20 +- resources/views/operasi/kelulusan.blade.php | 17 + .../views/penebusan/index-khazanah.blade.php | 1080 +++++++++++++++++ .../views/print/laporan_gadaian.blade.php | 16 + .../print/laporan_marhunterkumpul.blade.php | 2 +- routes/web.php | 1 + 11 files changed, 1350 insertions(+), 202 deletions(-) create mode 100644 resources/views/penebusan/index-khazanah.blade.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index f88e879..3bf3069 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Hash; use Carbon\Carbon; use PDF; +use DateTime; class KhazanahController extends Controller { @@ -1209,7 +1210,6 @@ class KhazanahController extends Controller $bakiperubatan = 0; - switch ($request->jenismodal) { case "selenggara": $kategori = "Baiki dan Selenggara"; @@ -1289,6 +1289,9 @@ class KhazanahController extends Controller 'jumlahkeping' => "0" ]); + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil); + $tarikhbil = $myDateTime->format('dmY'); + $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ 'deskripsi' => $request->deskripsi, @@ -1298,7 +1301,7 @@ class KhazanahController extends Controller 'id' => $auth_user['name'], 'bakiperubatan' => $bakiperubatan, 'nobaucer' => $request->baucer, - 'nobil' => "3213231", + 'nobil' => $tarikhbil, 'tuntutoleh' => $request->tuntutan ])->json(); @@ -1321,9 +1324,9 @@ class KhazanahController extends Controller $keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode $actype=$get_glCode_Details[0]['acttype']; //keterangan acctype - $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); - if(sizeof($get_Panjar_AM)==0) - { + $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); + if(sizeof($get_Panjar_AM)==0) + { $jumlah=0.0; $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); if(sizeof($getGLedjer_Semalam)==0) @@ -1433,28 +1436,28 @@ class KhazanahController extends Controller 'kelmarin'=>$kelmarin_panjar, - ]); + ]); - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } @@ -1471,62 +1474,62 @@ class KhazanahController extends Controller $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); if(sizeof($get_Panjar_AM)==0) { - $jumlah=0.0; - $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - if(sizeof($getGLedjer_Semalam)==0) - { - $jumlah=0.0; - } - else - { + $jumlah=0.0; + $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + if(sizeof($getGLedjer_Semalam)==0) + { + $jumlah=0.0; + } + else + { - $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; - $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; - $jumlah=$jumlah_semalam+$hariIniSemalam; - } - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { + $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; + $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; + $jumlah=$jumlah_semalam+$hariIniSemalam; + } + $jumlahBulan_ini=0.0; + $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + + if( sizeof($get_GlejerBulan_Tahun)==0) + { + $jumlahBulan_ini=0.0; + } + else + { + $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; + $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; + + }//end bulan tahun + $Jumlah_TahunIni=0.0; + $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + if(sizeof($get_Glejer_Tahun)==0) + { + $Jumlah_TahunIni=0.0; + } + else + { + + $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; + $Jumlah_TahunIni=$jumlah-$JumTahunIni; - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } + } - $HariIni=0.00-$request->bayaran; - $kelmarin=$jumlah-$HariIni; - - //insert glejer untuk current date /hari ini - $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$KERAIAN, - 'descpt'=>$keterangan, - 'debit'=>$request->bayaran, - 'kredit'=>0.0, - 'hariini'=>$HariIni, - 'kelmarin'=>$kelmarin, - 'jumlah'=>$jumlah, - 'bulanini'=>$jumlahBulan_ini, - 'tahunini'=>$Jumlah_TahunIni, - 'acttype'=> $actype + $HariIni=0.00-$request->bayaran; + $kelmarin=$jumlah-$HariIni; + + //insert glejer untuk current date /hari ini + $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$KERAIAN, + 'descpt'=>$keterangan, + 'debit'=>$request->bayaran, + 'kredit'=>0.0, + 'hariini'=>$HariIni, + 'kelmarin'=>$kelmarin, + 'jumlah'=>$jumlah, + 'bulanini'=>$jumlahBulan_ini, + 'tahunini'=>$Jumlah_TahunIni, + 'acttype'=> $actype ]); @@ -1551,54 +1554,50 @@ class KhazanahController extends Controller ]); - - } else { - $hariini_panjar= $get_Panjar_AM[0]['hariini']; - $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; - $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; - $debit_panjar= $get_Panjar_AM[0]['debit']; - $recno_panjar= $get_Panjar_AM[0]['recno']; - $kredit_panjar= $get_Panjar_AM[0]['kredit']; + $hariini_panjar= $get_Panjar_AM[0]['hariini']; + $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; + $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; + $debit_panjar= $get_Panjar_AM[0]['debit']; + $recno_panjar= $get_Panjar_AM[0]['recno']; + $kredit_panjar= $get_Panjar_AM[0]['kredit']; - $debit_panjar=$debit_panjar+$request->bayaran; - $harini_panjar=$debit_panjar-$kredit_panjar; - $kelmarin_panjar=$jumlah_panjar-$harini_panjar; + $debit_panjar=$debit_panjar+$request->bayaran; + $harini_panjar=$debit_panjar-$kredit_panjar; + $kelmarin_panjar=$jumlah_panjar-$harini_panjar; - $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_panjar, - 'debit'=>$debit_panjar, - 'kredit'=>$kredit_panjar, - 'hariini'=>$hariini_panjar, - 'kelmarin'=>$kelmarin_panjar, + $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_panjar, + 'debit'=>$debit_panjar, + 'kredit'=>$kredit_panjar, + 'hariini'=>$hariini_panjar, + 'kelmarin'=>$kelmarin_panjar, + ]); - - ]); + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } @@ -1612,51 +1611,52 @@ class KhazanahController extends Controller $keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode $actype=$get_glCode_Details[0]['acttype']; //keterangan acctype - $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($get_Panjar_AM)==0) { - $jumlah=0.0; - $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - if(sizeof($getGLedjer_Semalam)==0) - { - $jumlah=0.0; - } - else - { + $jumlah=0.0; + $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($getGLedjer_Semalam)==0) + { + $jumlah=0.0; + } + else + { - $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; - $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; - $jumlah=$jumlah_semalam+$hariIniSemalam; - } - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { + $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; + $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; + $jumlah=$jumlah_semalam+$hariIniSemalam; + } + $jumlahBulan_ini=0.0; + $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + + if( sizeof($get_GlejerBulan_Tahun)==0) + { + $jumlahBulan_ini=0.0; + } + else + { + $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; + $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; + + }//end bulan tahun + $Jumlah_TahunIni=0.0; + $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($get_Glejer_Tahun)==0) + { + $Jumlah_TahunIni=0.0; + } + else + { + + $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; + $Jumlah_TahunIni=$jumlah-$JumTahunIni; - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } + } - $HariIni=0.0-$request->bayaran; - $kelmarin=$jumlah-$HariIni; + $HariIni=0.0-$request->bayaran; + $kelmarin=$jumlah-$HariIni; //insert glejer untuk current date /hari ini $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ @@ -1704,45 +1704,45 @@ class KhazanahController extends Controller else { - $hariini_panjar= $get_Panjar_AM[0]['hariini']; - $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; - $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; - $debit_panjar= $get_Panjar_AM[0]['debit']; - $recno_panjar= $get_Panjar_AM[0]['recno']; - $kredit_panjar= $get_Panjar_AM[0]['kredit']; - $debit_panjar=$debit_panjar+$request->bayaran; - $harini_panjar=$debit_panjar-$kredit_panjar; - $kelmarin_panjar=$jumlah_panjar-$harini_panjar; - $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_panjar, - 'debit'=>$debit_panjar, - 'kredit'=>$kredit_panjar, - 'hariini'=>$hariini_panjar, - 'kelmarin'=>$kelmarin_panjar, + $hariini_panjar= $get_Panjar_AM[0]['hariini']; + $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; + $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; + $debit_panjar= $get_Panjar_AM[0]['debit']; + $recno_panjar= $get_Panjar_AM[0]['recno']; + $kredit_panjar= $get_Panjar_AM[0]['kredit']; + $debit_panjar=$debit_panjar+$request->bayaran; + $harini_panjar=$debit_panjar-$kredit_panjar; + $kelmarin_panjar=$jumlah_panjar-$harini_panjar; + $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_panjar, + 'debit'=>$debit_panjar, + 'kredit'=>$kredit_panjar, + 'hariini'=>$hariini_panjar, + 'kelmarin'=>$kelmarin_panjar, - - ]); + + ]); - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } }//end perbelanjaan Selanggara @@ -1762,7 +1762,7 @@ class KhazanahController extends Controller { return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); }else{ - return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah UntukDisimpan.'); + return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); } return response($updateVault); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index e61b57d..fac24d0 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -914,4 +914,24 @@ class PenebusanController extends Controller return $totalnilaimarhun; } + public function PenebusanKhazanah($norujukan){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + $noic = $gadaidetail[0][0]['nokp']; + $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $marhun = $marhundetail[0]; + $nama = $customerdetail[0]['nama']; + + $gadai = $gadaidetail[0][0]; + + $nilaihargasemasa = $this->tukaranhargaemas($norujukan); + + return view('penebusan.index-khazanah',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa')); + } + } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 3738a37..69d348c 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -522,7 +522,7 @@ gadai_detail['t_matang'], 'RM '+formatter.format(gadai_detail['pinjaman']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['jbg'] + gadai_detail['tempoh'] ]).draw(); }else{ tablegadai.row.add([ @@ -545,7 +545,7 @@ gadai_detail['t_update'], 'RM '+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['jbg'] + gadai_detail['tempoh'] ]).draw(); }else if(jenistebus == "lelong"){ var urlroute = '{{ route("lelongan", ":id") }}'; diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index c70cbe4..6b9214b 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -174,7 +174,7 @@
- Pelanggan + Pelanggan
Laporan diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index 581340f..6bd0e42 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -465,7 +465,7 @@ url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'], success:function(upahsemasa){ if(jenistebus == "belum_tebus"){ - var urlroute = '{{ route("penebusan", ":id") }}'; + var urlroute = '{{ route("penebusan.khazanah", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); if(gadai_detail["bakihargajualan"] == null){ xtawarruq.row.add([ diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php index cf40376..5799299 100644 --- a/resources/views/layouts/app_operasi.blade.php +++ b/resources/views/layouts/app_operasi.blade.php @@ -131,9 +131,23 @@ $('#linkz').text(data.namateller + " Pohon Kelulusan"); $("#linkz").attr("href", "{{ url('kelulusan') }}"); - audio.play(); - audio.muted = false; - + if(window.location.pathname === '/operasi/kelulusan') + { + location.reload(); + }else{ + console.log('luar kelulusan'); + audio.play(); + audio.muted = false; + var countlagu = 1; + audio.onended = function() { + if(countlagu <= 3){ + countlagu++; + console.log(countlagu); + this.play(); + } + } + } + const Toast = Swal.mixin({ toast: true, position: 'top-end', diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 79fb0a2..9a69fbd 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -159,6 +159,23 @@ minimumFractionDigits: 2 }); + var audio = new Audio("{{ asset('sound/3.wav') }}"); + // audio.muted = true; + + if (tablekelulusan.data().any()) { + audio.play(); + audio.addEventListener('ended', function() { + this.currentTime = 0; + this.play(); + }, false); + console.log('betul'); + + }else{ + audio.loop = false; + audio.muted = true; + } + + $('#kelulusanmodal').on('show.bs.modal', function(event) { let button = $(event.relatedTarget); let norujukan = $(button).data('norujukan'); diff --git a/resources/views/penebusan/index-khazanah.blade.php b/resources/views/penebusan/index-khazanah.blade.php new file mode 100644 index 0000000..6145168 --- /dev/null +++ b/resources/views/penebusan/index-khazanah.blade.php @@ -0,0 +1,1080 @@ +@extends('layouts.app') +@section('content') +@include('modal.historybayaran') +@include('modal.wakil') + + +
+
+
+ + + +
+ +
+
+
+ NAMA +
+
+ +
+
+
+
+
+
+ NO PELANGGGAN +
+
+ +
+
+
+
+
+
+ NO RUJUKAN +
+
+ +
+
+
+
+
+
+ NO KAD PENGENALAN +
+
+ +
+
+
+
+
+
+ JENIS TEBUS +
+
+ +
+
+
+ {{--
+
+
+ NO SIRI TEBUS +
+
+ +
+
+
--}} +
+ {{--
+
+ WAKIL +
+
+ +
+
+ +
+
--}} +
+
+ +
+
+ + + + + + + + + + + + + + + @php $count = 0; @endphp + @foreach ($marhun as $index=>$m) + + @php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + @endphp + + @php + $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json(); + @endphp + + + + + + + + + @php $count++; @endphp + @endforeach + + + + + + + + + +
BilMarhunN. MarhunN. Marhun SemasaBerat/gramKaratHargaHarga Semasa
{{ $index+1 }}{{ $marhunperibadi['descpt'] }}RM {{ number_format($m['n_marhun'],2) }}@php + echo "RM " . number_format($hargaemassemasa,2); + @endphp{{ $m['berat'] }}{{ $m['karat'] }}RM {{ $m['harga'] }}RM {{ number_format(floatval($hargabaru['harga']),2) }} @php if($m['harga'] > $hargabaru['harga']) echo ''; if($m['harga'] < $hargabaru['harga']) echo ''; + if($m['harga'] === $hargabaru['harga']) echo ''; + + @endphp
JUMLAHRM {{ number_format($gadai['nilaimarhun'],2) }}RM {{ number_format($nilaihargasemasa,2) }}{{ number_format($gadai['berat'],2) }}
+
+
+ {{-- {{dd($gadai)}} --}} +
+
+ +
+ {{--
--}} +
+ +
+
+ BAKI HARGA JUALAN(RM) +
+
+ +
+
+ +
+
+ BAKI PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+ +
+
+ PEMBIAYAAN ASAL(RM) +
+
+ +
+
+
+ +
+
+
+ JUMLAH KEUNTUNGAN +
+
+ +
+
+ +
+
+ PEMBIAYAAN H. ASAL (RM) +
+ @php + $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100; + @endphp +
+ +
+ {{ number_format($percent_asal,2) }} +
+
+
+ +
+
+ TELAH DIBAYAR(RM) +
+
+ +
+
+
+
+
+
+ BAYARAN PEMBIAYAAN(RM) +
+
+ +
+
+
+
+ TAMBAH PEMBIAYAAN(RM) +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ PEMBIAYAAN BARU(RM) +
+
+ +
+ +
+
+
+
+ +
+
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
+
+ + +
+ +
+
+ PEMBIAYAAN BARU(RM) +
+ @php + $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; + @endphp +
+ +
+ {{ number_format($percent_hargaemassemasa,2) }} +
+
+
+
+
+
+
+ BAYARAN DITERIMA(RM) +
+
+ +
+
+
+ + +
+ +
+
+ +
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 579693b..c59f39d 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -298,6 +298,22 @@ +

Laporan Transaksi Gadaian

+
+ + + + + + + + + + + + +
BilJenisPenebusan(RM)
0 Rugi Lelong 0.00
+ diff --git a/resources/views/print/laporan_marhunterkumpul.blade.php b/resources/views/print/laporan_marhunterkumpul.blade.php index 19eb078..0def30c 100644 --- a/resources/views/print/laporan_marhunterkumpul.blade.php +++ b/resources/views/print/laporan_marhunterkumpul.blade.php @@ -260,7 +260,7 @@ @endif @endif - @php $counter++; $masuk = true;@endphp + @php $counter++; $masuk = true;$totalnm += floatval($item['n_marhun']);$totalberat += floatval($item['berat']); @endphp @else @if($item['norujukan'] == $marhun[$index-1]['norujukan']) {{-- masuk 1 --}} diff --git a/routes/web.php b/routes/web.php index eefb395..840d5cc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -127,6 +127,7 @@ Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahCo Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); +Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);