From 4c76a6c845c5f60971c68c9625e6b120a0645f7f Mon Sep 17 00:00:00 2001 From: afiq Date: Mon, 9 Aug 2021 12:09:28 +0800 Subject: [PATCH 01/20] fix admin customer --- app/Http/Controllers/KhazanahController.php | 46 +++++++++++++++++++ .../views/admin/customer_index.blade.php | 28 +---------- routes/web.php | 4 +- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c7e2df5..664ac3b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -84,6 +84,52 @@ class KhazanahController extends Controller } } + public function searchAdmin(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(); + $customer_info = Http::get(config('api.url') . '/api/admin/customers/nokp/search',[ + 'ic' => $noic + ])->json(); + + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + $search = true; + + if($customer_info){ + Session::put('customer_info_khazanah',$customer_info); + return redirect()->route('admin.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + }else{ + return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype')); + } + } + + public function infoAdmin(Request $request){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $customer_info = Http::get(config('api.url') . '/api/admin/customers/nokp/search',[ + 'ic' => Session::get('noic') + ])->json(); + + $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(); + + $negeri = Http::get(config('api.url') . '/api/negeri/')->json(); + + + + $request->session()->forget('page_reload'); + $request->session()->forget('norujukan'); + + return view('admin.customer_info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','negeri')); + } + public function info(Request $request){ $auth_user = Auth::user(); $api_url = config('api.url'); diff --git a/resources/views/admin/customer_index.blade.php b/resources/views/admin/customer_index.blade.php index 8e3c1ca..f413087 100644 --- a/resources/views/admin/customer_index.blade.php +++ b/resources/views/admin/customer_index.blade.php @@ -827,33 +827,7 @@ return false; } }else if(id_type=='passport'){ - if(nokp.length < 5){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Periksa Passport Pelanggan' - }); - event.preventDefault(); - return false; - } - if(nokp.indexOf(' ') > 0){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)' - }); - event.preventDefault(); - return false; - } - if(regex.test(nokp) == false){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Periksa Passport Pelanggan' - }); - event.preventDefault(); - return false; - } + } } diff --git a/routes/web.php b/routes/web.php index 7a192a6..34cb0d3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -279,6 +279,6 @@ Route::get('admin/kakitangan/edit',['as'=>'admin.kakitangan.edit','uses'=>'Kakit Route::post('admin/kakitangan/edit/store',['as'=>'admin.kakitangan.edit.store','uses'=>'KakitanganController@editStoreKakitangan'])->middleware('auth','admin'); Route::get('admin/kakitangan/resetcredentials',['as'=>'admin.kakitangan.resetcredentials','uses'=>'KakitanganController@resetCredentials'])->middleware('auth','admin'); Route::get('admin/pelanggan',['as'=>'admin.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','admin'); -Route::get('admin/customer_info',['as'=>'admin.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','admin'); -Route::get('admin/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','admin'); +Route::get('admin/customer_info',['as'=>'admin.customer_info','uses'=>'KhazanahController@infoAdmin'])->middleware('auth','admin'); +Route::get('admin/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@searchAdmin'])->middleware('auth','admin'); Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']); \ No newline at end of file From 90269548088b86b57d37eee07efacbac6d18329d Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 11 Aug 2021 00:24:28 +0800 Subject: [PATCH 02/20] scan --- app/Http/Controllers/KhazanahController.php | 107 -------------------- 1 file changed, 107 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 664ac3b..8599c88 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -375,91 +375,9 @@ class KhazanahController extends Controller public function barcodescannedtebus(Request $request) { - - $auth_user = Auth::user(); - - - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json(); - $gadai_detail = $gadai[0]; - $hargajual=$gadai[0]['hargajualan']; - $upah12=$gadai[0]['upah12']; - $tarikh_gadai=$gadai[0]['t_gadai']; - $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan_barcode])->json(); - //dd($tebus); - $tebus_detail = $tebus[0]; - $pinjaman=$tebus[0]['pinjaman']; - $jenis_tebus=$tebus[0]['jenistebus']; - $bakipjm=$tebus[0]['bakipjm']; - $bakiupah=$tebus[0]['bakiupah']; - $rebet=$tebus[0]['rebate']; - - - - $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json(); - - $keluar=$getTunai2['keluar']; - $baki=$getTunai2['baki']; - $masuk=$getTunai2['masuk']; - $bakiawal=$getTunai2['bakiawal']; - $pendahuluan=$getTunai2['tambah']; - $serahan=$getTunai2['kurang']; - $totalmasuk = 0; - $bakiakhir = $getTunai2['baki']; - $totalkeluar = 0; - - $jum_bayaran=Http::get(config('api.url').'/api/transaction/one/'.$request->norujukan_barcode)->json(); - $jumlah_bayaran=$jum_bayaran['duit_masuk']; $update=Http::put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json(); - - if($update == 'success'){ - if($tebus_detail['jenistebus'] == 'P') - { - $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk; - - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $tebus_detail['teller'], - 'keluar'=>$keluar, - 'masuk'=>$totalmasuk, - 'bakiakhir'=>$bakiakhir - ]); - - if(empty($updateTunai)){ - dd('x masuk aliran tunai'); - } - - }else{ - - if($tebus_detail['jenistebus'] == 'S') - { - $totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk; - - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $tebus_detail['teller'], - 'keluar'=>$keluar, - 'masuk'=>$totalmasuk, - 'bakiakhir'=>$bakiakhir - ]); - if(empty($updateTunai)){ - dd('x masuk aliran tunai'); - } - }else{ - $totalmasuk = $tebus_detail['bakipjm'] + $masuk; - - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $tebus_detail['teller'], - 'keluar'=>$keluar, - 'masuk'=>$totalmasuk, - 'bakiakhir'=>$bakiakhir - ]); - - if(empty($updateTunai)){ - dd('x masuk aliran tunai'); - } - } - } - } return redirect()->route('khazanah.tebus'); } @@ -1106,31 +1024,6 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $scan_barcode = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json(); - - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json(); - $gadai_detail = $gadai[0]; - - $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $gadai_detail['teller']])->json(); - - $keluar=$getTunai2['keluar']; - $baki=$getTunai2['baki']; - $masuk=$getTunai2['masuk']; - $bakiawal = $getTunai2['bakiawal']; - $pendahuluan=$getTunai2['tambah']; - $serahan=$getTunai2['kurang']; - $totalmasuk = 0; - $bakiakhir = $getTunai2['baki']; - $totalkeluar = 0; - $upah12=$gadai[0]['upah12']; - $totalkeluar = $gadai_detail['pinjaman'] + $keluar; - - //masuk dalam tunai aliran - $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ - 'kodlaluan' => $gadai_detail['teller'], - 'keluar' => $totalkeluar, - 'masuk' => $masuk, - 'bakiakhir' => $bakiakhir - ]); event(new NotifikasiPembayaran('TellerkepadaKhazanah')); From c637ddd31883f0769fe13dc994071f9ca26ebef7 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 12 Aug 2021 23:41:54 +0800 Subject: [PATCH 03/20] perubahan sikit --- .DS_Store | Bin 8196 -> 8196 bytes .../Controllers/AliranTunaiController.php | 3 +- app/Http/Controllers/KhazanahController.php | 7 +- app/Http/Controllers/PenebusanController.php | 19 ++- config/database.php | 1 + public/.DS_Store | Bin 8196 -> 8196 bytes .../laporan/laporanserahan.blade.php | 2 +- resources/views/customers/info.blade.php | 160 +++++++++++++++++- .../khazanah/pendahuluanserahanmain.blade.php | 2 + resources/views/lelongan/index.blade.php | 2 - resources/views/penebusan/index.blade.php | 22 ++- .../views/print/laporan_lejer_am.blade.php | 129 -------------- resources/views/print/resitansuran.blade.php | 4 +- routes/web.php | 4 +- tests/Feature/DenominasiTest.php | 23 +++ 15 files changed, 222 insertions(+), 156 deletions(-) create mode 100644 tests/Feature/DenominasiTest.php diff --git a/.DS_Store b/.DS_Store index f1757f25531791406930860c85c9fe6fcad59ff4..6bde6833edaf6deb4e461dd7a2ca9a0a00e17ab4 100644 GIT binary patch delta 308 zcmZp1XmOa}&nU4mU^hRb#AF@;O<`t+M1}%}f~4}|f~1`MBnAeCGn1o)8tSF1t91>H zO$>At3=Irwbrh-%4U8;w6f6vlYil_<#8nM#Jri;(tEy{i>*fG80RbZ;gl6D}(lBZ+ zkO8%(EVw8yCqFM8C<0Q=4z#?8p@bomp%}=@^UTRlhB{)izW^5#BiJcEP^TDD!zq)M xh1c_P0IeJmh* zH#aaWAU7~HeSHZC7bP)0NnmYxdV73*ewma06CVMZlO7bWlm8U)v%?HT1G5Jh_ynname) === 'LELONG'){ - $bakisemasa = $lelongan; + $penebusanbarcodescanned = floatval($lelongan); + $bakisemasa = floatval($lelongan) - floatval($totalserahan); }else{ $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d9dca21..01f2679 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1268,7 +1268,6 @@ class KhazanahController extends Controller ]); return redirect()->route('khazanah.serahan'); - } public function kemaskiniPendahuluan(Request $request) //Daftar Pendahuluan kepada Kaunter @@ -1430,9 +1429,6 @@ class KhazanahController extends Controller $amount = $request->amt; -// if($amount>$baki_awal){ -// return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); -// }else{ $tarikh=$request->tarikh; $kodlaluan=$request->teller; @@ -1544,8 +1540,6 @@ class KhazanahController extends Controller } - // } - $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $sumBaki=$GetLatestBakiTunai; @@ -2316,6 +2310,7 @@ class KhazanahController extends Controller public function pendahuluanserahanHQ(Request $request) { + $auth_user = Auth::user(); $gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[ diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 3ec99ce..b505a4a 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -544,8 +544,12 @@ class PenebusanController extends Controller 'marhun' => $request->marhun, 'jenisbayarantebus' => $request->jenisbayarantebus, 'teller' => $request->teller - ])->json(); + ])->successful(); + if(!$updatetebus) + { + return response('fail'); + } ////////////////////// /// MAKING NEW SAG//// @@ -566,7 +570,12 @@ class PenebusanController extends Controller 'nopelanggan' => $request->nopelanggan, 'nokp' => $request->noic, 'sirig' => $new_sirig - ]); + ])->successful(); + + if(!$gadai) + { + return response('fail'); + } ////////////////////// @@ -596,7 +605,7 @@ class PenebusanController extends Controller 'upah12' => $keuntungan12bulan, 'hargajualan' => $hargajualan, 'kuantiti_marhun' => $request->kuantiti_marhun - ])->json(); + ])->successful(); $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[ 'unit_komuditi' => round($request->pinjaman, 2), @@ -611,7 +620,7 @@ class PenebusanController extends Controller $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ 'historygadaian' => $request->norujukan - ])->json(); + ])->successful(); /////////////////////////// /// MARHUN UPDATE TABLE//// @@ -648,7 +657,7 @@ class PenebusanController extends Controller 'berat_emas' => $array1['berat'], 'harga' => $array1['harga'], 'nilai_marhun' => $array1['n_marhun'] - ])->json(); + ])->successful(); } diff --git a/config/database.php b/config/database.php index 66d8670..a159328 100644 --- a/config/database.php +++ b/config/database.php @@ -61,6 +61,7 @@ return [ 'options' => extension_loaded('pdo_mysql') ? array_filter([ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], + 'unix_socket' => env('UNIX_SOCKET', '/Applications/MAMP/tmp/mysql/mysql.sock'), ], 'pgsql' => [ diff --git a/public/.DS_Store b/public/.DS_Store index 1b9b696d948f5aa8cab12de4c3d5ea97c61c83bb..58e9ba1f9aa6b0f341ecc08368f9575ad5d3b170 100644 GIT binary patch delta 244 zcmZp1XmQxESb*`&WG=A=9qH<7T|;9N104lJ1A|%}g=#|sBMTh`3q#}DT22meRYP0P zgxt!i>YCcRIg_KY5kfs8?n dA&ilXQJdw3pR#Obm-xmqd9Ik{W@FKFOaP)>Kj;7e delta 204 zcmZp1XmQxESYR@b*xAX&g4Rqz(vvp`iVMXH@E2#~mwP7X=LHm{mSv`vPre|yt3DzV zC=i@kl^UI1l$jD-keHmAm#%F8fdLFSl^rx7ECB{(2!nw^*&*=(n9U);7?PKtmkLxB z0FhL7@P?}5V9;i8WC&)6VJKv1V3^LZm|-i!L56b-j~Tu){Ac846k}9k)MnHXU^Hbk fXLMlnWb|V6VGLvp+N>n}lw~uE#7~w@qU_87znm~9 diff --git a/resources/views/aliran_tunai/laporan/laporanserahan.blade.php b/resources/views/aliran_tunai/laporan/laporanserahan.blade.php index bf4396d..1592ef3 100644 --- a/resources/views/aliran_tunai/laporan/laporanserahan.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanserahan.blade.php @@ -520,7 +520,7 @@
CATATAN:
Serahan kepada peti besi ialah sebanyak RM - Baki Tunai Semasa sebanyak RM + Baki Tunai Semasa sebanyak RM {{ number_format($totalsemua,2) }}

\ No newline at end of file diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index e8aaece..429fb95 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -454,6 +454,12 @@ }); }); + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + // here is the new selected tab id + var selectedTabId = e.target.id; + + }); + var tablegadai = $('#myTable').DataTable({ "scrollX": true }); @@ -1494,14 +1500,154 @@ if($("input[name='options']:checked").val() == 'belum_tebus'){ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai2){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Hapus Gadai Tidak Dibenarkan' - }); - return false; + + var id = $('.tab-content .active').attr('id'); + if(id == "nav-tawarruq-tab") { + if(+harini !== +tarikhgadai2){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Hapus Gadai Tidak Dibenarkan' + }); + return false; + } } + else { + $.ajax({ + method:'get', + url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid, + success:function(data){ + console.log(data); + if(data == 1){ + + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }); + + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Khazanah', + text: "Hapus Upah Lama!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Hantar', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if(result.isConfirmed) { + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Khazanah.', + icon: 'info', + width: 600, + padding: '3em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + + let mohon = "Hapus Upah Lama"; + let id = hapusid; + + $.ajax({ + method:'post', + url: '{{ route("teller.createkelulusan") }}', + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : id, + "mohon" : mohon + }, + success:function(data){ + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + let teller = "{{ Auth::user()->name }}"; + + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + cluster: 'ap1', + encrypted: true + }); + + var channel = pusher.subscribe('notice-ubahhapus'); + channel.bind('my-ubahhapus', function(data) { + + if(data.norujukan == id && data.teller == teller) + { + if(data.kelulusan == 'lulus') + { + + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan' + }).then(function(){ + + $.ajax({ + method:'post', + url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id, + success:function(data){ + + if(data == 1) + { + swalWithBootstrapButtons.fire( + 'Hapus!', + 'Maklumat upah lama telah dihapuskan.', + 'success' + ).then(function(){ + location.reload(); + }); + }else{ + swalWithBootstrapButtons.fire( + 'Hapus!', + 'Maklumat Upah lama tidak berjaya untuk dihapuskan.', + 'error' + ).then(function(){ + location.reload(); + }); + } + + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + return true; + }); + } + } + }); + } + }); + + + return false; + } + else{ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Hapus Upah Tidak Dibenarkan' + }); + return false; + } + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } + + + return false; + }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index 77aa83f..7995ee2 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -345,6 +345,8 @@ }); } + },error: function(jqXHR, textStatus, errorThrown) { + console.log(textStatus, errorThrown); } }); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 1a98a03..b976010 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -328,8 +328,6 @@ cluster: 'ap1', encrypted: true }); - - //let teller = "{{ Auth::user()->name }}"; var channel = pusher.subscribe('notice-ubahhapus'); channel.bind('my-ubahhapus', function(data) { diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index ee5e4a0..6533ed5 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -2428,6 +2428,17 @@ function wakilfunction(e) { let wakil = $('#wakiltxt').val(); + console.log(wakil); + if(wakil === null || wakil === '') + { + Swal.fire( + 'Amaran!', + 'Sila masukkan nilai di dalam kotak wakil!', + 'error' + ) + + return false; + } var patternregex = /\s+|[-,\/]/g; @@ -2499,7 +2510,16 @@ let nota = $('#notawakil').val(); let nokp = $('#nokpwakil').val(); - + if(nowakil === null || nowakil === '') + { + Swal.fire( + 'Amaran!', + 'Sila tunggu no wakil untuk proses dahulu sebelum tekan terima!', + 'error' + ) + return false; + } + $.ajax({ method:'POST', url: "{{ route('wakil.create') }}", diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 1eb2fd6..34c6f05 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -313,135 +313,6 @@

- - -
LEJER AM
-
- - - - - - - - - -
TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
- -
- - - - - - @foreach($data as $index=>$var) - - - - - @if($var['totalharini'] >0 ) - - @else - - - @endif - - - @endforeach - - - - - - - - - - - - - - - - -
KOD GL KETERANGAN DEBIT KREDITJUMLAH
{{ $var['glcode']}}{{$var['descpt']}} {{$var['total_debit']}} {{$var['total_kredit']}} {{ - - $var['totalharini'] - }} - - - - - - - ( {{ number_format(abs($var['totalharini']),2)}} ) - - - -
JUMLAH: @foreach($debit as $db=>$vr) {{ number_format($vr['totalDebit'],2)}} @endforeach - - @foreach($kredit as $db=>$vr) {{ number_format($vr['totalKredit'],2)}} @endforeach - - - @foreach($kredit as $db=>$vr) - @foreach($debit as $db2=>$vr2) - - {{ number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2) }} - @endforeach - @endforeach - - - - - - - - - - - - - - - - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
DISEMAK DISAHKAN
-
-
-
LEJER AM
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php index 6bda936..a1d4c9e 100644 --- a/resources/views/print/resitansuran.blade.php +++ b/resources/views/print/resitansuran.blade.php @@ -394,11 +394,11 @@ hr.new5 { - Nama Wakil : + Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp - No K/P Wakil : + No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
diff --git a/routes/web.php b/routes/web.php index c597df3..38c387e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -68,7 +68,7 @@ Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@ind Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth','teller'); Route::get('/lelongan/{norujukan}',['as'=>'lelongan','uses' => 'LelongController@index'])->middleware('auth','teller'); Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller'); -Route::get('/aliran_tunai/laporanserahan}',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller'); +Route::get('/aliran_tunai/laporanserahan',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller'); Route::put('/aliran_tunai/Gadaian',['as'=>'alirantunai.gadai','uses' => 'AliranTunaiController@alirantunaiGadai'])->middleware('auth','teller'); Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranTunaiController@alirantunaiTebus'])->middleware('auth','teller'); Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller'); @@ -126,7 +126,7 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC 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::get('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->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'); diff --git a/tests/Feature/DenominasiTest.php b/tests/Feature/DenominasiTest.php new file mode 100644 index 0000000..6e93fe6 --- /dev/null +++ b/tests/Feature/DenominasiTest.php @@ -0,0 +1,23 @@ +actingAs($user); + $response = $this->get('/'); + + $response->assertStatus(200); + } +} From 50895f580ba385811c97513b04cac0b2b958bd44 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 12 Aug 2021 23:46:24 +0800 Subject: [PATCH 04/20] fix new-pipi --- .../Controllers/AliranTunaiController.php | 3 +- app/Http/Controllers/LelongController.php | 263 ------ public/img/loader.gif | Bin 0 -> 55167 bytes resources/views/lelongan/index.blade.php | 2 + .../views/print/laporan_imbanduga.blade.php | 796 +++++++++--------- 5 files changed, 395 insertions(+), 669 deletions(-) create mode 100644 public/img/loader.gif diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 15451aa..b11525c 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -446,7 +446,8 @@ class AliranTunaiController extends Controller $gadaian = floatval($totalgadai); if(strtoupper(Auth::user()->name) === 'LELONG'){ - $bakisemasa = $lelongan; + $penebusanbarcodescanned = floatval($lelongan); + $bakisemasa = floatval($lelongan) - floatval($totalserahan); }else{ $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 47f0aa5..dc0b1f1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -145,279 +145,16 @@ class LelongController extends Controller $serahan = $getTunai2['kurang']; $bakiakhir = $baki; - $jumlah_byr=$request->jumlah; if($request->jenis == 'T') { $bakiakhir -= $request->jumlah; - - - $KOD_TUNAI='1000/010'; - $BAKI_LELONG='7000/090'; - - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $kredit_Tunai=$kredit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - $gl_cdetails_bl= $get_KOD_BL[0]; - $keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode - $actype_bl= $get_KOD_BL[0]['acttype']; - - - $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Baki_Lelong)==0) - { - $jumlah_bl=0.0; - - $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if(sizeof($getGLedjer_bl_Semalam)==0) - { - $jumlah_bl=0.0; - } - else - { - - $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah']; - - $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini']; - $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl; - - } - $jumlahBulan_ini_bl=0.0; - $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_bl)==0) - { - $jumlahBulan_ini_bl=0.0; - } - else - { - - $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah']; - $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl; - - } - - - $Jumlah_TahunIni_bl=0.0; - $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_bl)==0) - { - $Jumlah_TahunIni_bl=0.0; - } - else - { - $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah']; - $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl; - - } - - - $HariIni_bl=0.0; - $kelmarin_bl=$jumlah_bl-$HariIni_bl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$BAKI_LELONG, - 'descpt'=>$keterangan_bl, - 'debit'=>$jumlah_byr, - 'kredit'=>0.0, - 'hariini'=>$HariIni_bl, - 'kelmarin'=>$kelmarin_bl, - 'jumlah'=>$jumlah_bl, - 'bulanini'=>$jumlahBulan_ini_bl, - 'tahunini'=>$Jumlah_TahunIni_bl, - 'acttype'=> $actype_bl - - ]); - - - } - else - { - - $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini']; - $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin']; - $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah']; - $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit']; - $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit']; - $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno']; - - $debit_BL=$debit_BL+$jumlah_byr; - $hariIni_Tunai=$debit_BL-$kredit_BL; - $kelmarin_BL=$jumlah_BL-$hariIni_BL; - - $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_BL, - 'debit'=>$debit_BL, - 'kredit'=>$kredit_BL, - 'hariini'=>$hariIni_BL, - 'kelmarin' =>$kelmarin_BL, - - ]); - - } - - - } else { $bakiakhir += -($request->jumlah); - - $KOD_TUNAI='1000/010'; - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $debit_Tunai=$debit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - - $RUGI_LELONG='3000/020'; - - $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - $gl_cdetails_rl= $get_KOD_RL[0]; - $keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode - $actype_rl= $get_KOD_RL[0]['acttype']; - - - $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Rugi_Lelong)==0) - { - $jumlah_rl=0.0; - - $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if(sizeof($getGLedjer_rl_Semalam)==0) - { - $jumlah_rl=0.0; - } - else - { - - $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah']; - - $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini']; - $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl; - - } - $jumlahBulan_ini_rl=0.0; - $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_rl)==0) - { - $jumlahBulan_ini_rl=0.0; - } - else - { - - $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah']; - $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl; - - } - - - $Jumlah_TahunIni_rl=0.0; - $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_rl)==0) - { - $Jumlah_TahunIni_rl=0.0; - } - else - { - $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah']; - $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl; - - } - - - $HariIni_rl=0.0; - $kelmarin_rl=$jumlah_rl-$HariIni_rl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$RUGI_LELONG, - 'descpt'=>$keterangan_rl, - 'debit'=>0.0, - 'kredit'=>$jumlah_byr, - 'hariini'=>$HariIni_rl, - 'kelmarin'=>$kelmarin_rl, - 'jumlah'=>$jumlah_rl, - 'bulanini'=>$jumlahBulan_ini_rl, - 'tahunini'=>$Jumlah_TahunIni_rl, - 'acttype'=> $actype_rl - - ]); - - - } - else - { - - $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini']; - $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin']; - $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah']; - $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit']; - $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit']; - $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno']; - - $kredit_RL=$kredit_RL+$jumlah_byr; - $hariIni_Tunai=$debit_RL-$kredit_RL; - $kelmarin_BL=$jumlah_RL-$hariIni_RL; - - $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_RL, - 'debit'=>$debit_RL, - 'kredit'=>$kredit_RL, - 'hariini'=>$hariIni_RL, - 'kelmarin' =>$kelmarin_RL, - - ]); - - } - - - } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/public/img/loader.gif b/public/img/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..c73bac146b077c307f03de983b7cc29eac3ea730 GIT binary patch literal 55167 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 literal 0 HcmV?d00001 diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 1a98a03..35452a2 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -252,6 +252,8 @@ alert(xhr.responseText); } }); + + return false; const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 8bfdfbb..1cae6a0 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -1,416 +1,394 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ Loading... +
@@ -528,5 +506,13 @@
-
+ + + + \ No newline at end of file From 4dd09f729126bef4b6924e5aa1b572aebec44a74 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 15 Aug 2021 07:36:06 +0800 Subject: [PATCH 05/20] fix wakil and imbangduga --- .../khazanah/laporan/imbangduga.blade.php | 46 ++-- resources/views/modal/wakil.blade.php | 6 + resources/views/penebusan/index.blade.php | 250 +++++++++++++----- 3 files changed, 223 insertions(+), 79 deletions(-) diff --git a/resources/views/khazanah/laporan/imbangduga.blade.php b/resources/views/khazanah/laporan/imbangduga.blade.php index e105bc6..d0d8185 100644 --- a/resources/views/khazanah/laporan/imbangduga.blade.php +++ b/resources/views/khazanah/laporan/imbangduga.blade.php @@ -16,30 +16,24 @@
-
-
-
-
-
+
+
+
+
+
+
+ @csrf +
+
Tarikh
+
-
- - @csrf -
-
Tarikh
-
-

- -
-
-
+
+
- - -
- + +
@@ -60,6 +54,18 @@ }); + function loadingmodal() + { + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading() + } + }); + } + @endsection diff --git a/resources/views/modal/wakil.blade.php b/resources/views/modal/wakil.blade.php index 5b80b00..5438627 100644 --- a/resources/views/modal/wakil.blade.php +++ b/resources/views/modal/wakil.blade.php @@ -16,6 +16,7 @@
+
@@ -28,6 +29,7 @@
+
@@ -37,6 +39,7 @@
+
@@ -47,6 +50,7 @@
+
@@ -56,6 +60,7 @@
+
@@ -65,6 +70,7 @@
+
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 6533ed5..773e3c3 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -2428,7 +2428,7 @@ function wakilfunction(e) { let wakil = $('#wakiltxt').val(); - console.log(wakil); + if(wakil === null || wakil === '') { Swal.fire( @@ -2460,7 +2460,7 @@ allowOutsideClick: false, allowEscapeKey: false, allowEnterKey: false, - confirmButtonText: ' Daftar Dulu Boss!', + confirmButtonText: 'Daftar', icon: 'info', title: 'Maklumat anda tiada dalam senarai wakil! Tekan button okay untuk mendaftar!' }).then(function(){ @@ -2510,74 +2510,194 @@ let nota = $('#notawakil').val(); let nokp = $('#nokpwakil').val(); + let boolnowakil = false;let boolnama = false;let boolalamat = false;let booltelefon = false;let boolnota = false;let boolnokp = false; + if(nowakil === null || nowakil === '') { - Swal.fire( - 'Amaran!', - 'Sila tunggu no wakil untuk proses dahulu sebelum tekan terima!', - 'error' - ) + $("[name='errornowakil']").show(); + $("[name='errornowakil']").text("*No wakil tidak dijana lagi!"); + $("[name='nowakil']").addClass('is-invalid'); + + boolnowakil = true; + }else{ + $("[name='errornowakil']").hide(); + $("[name='nowakil']").removeClass('is-invalid'); + + boolnowakil = false; + } + + if(nama === null || nama === '') + { + $("[name='errornamawakil']").show(); + $("[name='errornamawakil']").text("*Isikan nama dalam kotak!"); + $("[name='namawakil']").addClass('is-invalid'); + + boolnama = true; + }else{ + $("[name='errornamawakil']").hide(); + $("[name='namawakil']").removeClass('is-invalid'); + + boolnama = false; + } + + if(alamat === null || alamat === '') + { + $("[name='erroralamatwakil']").show(); + $("[name='erroralamatwakil']").text("*Isikan alamat dalam kotak!"); + $("[name='alamatwakil']").addClass('is-invalid'); + + boolalamat = true; + }else{ + $("[name='erroralamatwakil']").hide(); + $("[name='alamatwakil']").removeClass('is-invalid'); + + boolalamat = false; + } + + if(telefon === null || telefon === '') + { + $("[name='errornotelwakil']").show(); + $("[name='errornotelwakil']").text("*Isikan telefon dalam kotak!"); + $("[name='notelwakil']").addClass('is-invalid'); + + booltelefon = true; + }else{ + $("[name='errornotelwakil']").hide(); + $("[name='notelwakil']").removeClass('is-invalid'); + + booltelefon = false; + } + + if(nota === null || nota === '') + { + $("[name='errornotawakil']").show(); + $("[name='errornotawakil']").text("*Isikan nota dalam kotak!"); + $("[name='notawakil']").addClass('is-invalid'); + + boolnota = true; + }else{ + $("[name='errornotawakil']").hide(); + $("[name='notawakil']").removeClass('is-invalid'); + + boolnota = false; + } + + if(nokp === null || nokp === '') + { + $("[name='errornokpwakil']").show(); + $("[name='errornokpwakil']").text("*Isikan nokp dalam kotak!"); + $("[name='nokpwakil']").addClass('is-invalid'); + + boolnokp = true; + }else{ + $("[name='errornokpwakil']").hide(); + $("[name='nokpwakil']").removeClass('is-invalid'); + + boolnokp = false; + } + + + if(boolnowakil == false && boolnama == false && boolalamat == false && booltelefon == false && boolnota == false && boolnokp == false) + { + $.ajax({ + method:'POST', + url: "{{ route('wakil.create') }}", + data:{ + "_token": "{{ csrf_token() }}", + "nopelanggan" : nopelanggan, + "nowakil" : nowakil, + "nama" : nama, + "hubungan" : hubungan, + "alamat" : alamat, + "telefon" : telefon, + "nota" : nota, + "icno" : nokp + }, + success:function(data){ + + if(data == 1) + { + $('#WakilModal').hide(); + $('#WakilModal').modal('hide'); + nw = nowakil; + Swal.fire({ + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false, + confirmButtonText: ' Baik Boss!', + icon: 'success', + title: 'Berjaya Mendaftar Wakil Pelanggan!' + }).then(function(){ + $('#wakiltxt').prop( "disabled", true ); + $('#caribtn').html("Ubah"); + $('#caribtn').attr("onclick","ubahwakil(this)"); + + + }); + } + + },error: function (request, status, error) { + console.log(request.responseText); + } + }); + + return true; + + }else{ return false; } - $.ajax({ - method:'POST', - url: "{{ route('wakil.create') }}", - data:{ - "_token": "{{ csrf_token() }}", - "nopelanggan" : nopelanggan, - "nowakil" : nowakil, - "nama" : nama, - "hubungan" : hubungan, - "alamat" : alamat, - "telefon" : telefon, - "nota" : nota, - "icno" : nokp - }, - success:function(data){ - if(data == 1) - { - $('#WakilModal').hide(); - $('#WakilModal').modal('hide'); - nw = nowakil; - Swal.fire({ - allowOutsideClick: false, - allowEscapeKey: false, - allowEnterKey: false, - confirmButtonText: ' Baik Boss!', - icon: 'success', - title: 'Berjaya Mendaftar Wakil Pelanggan!' - }).then(function(){ - $('#wakiltxt').prop( "disabled", true ); - $('#caribtn').html("Ubah"); - $('#caribtn').attr("onclick","ubahwakil(this)"); - - - }); - } - - },error: function (request, status, error) { - console.log(request.responseText); - } - }); } + $('#WakilModal').on('hidden.bs.modal', function (e) { + + $("[name='errornowakil']").hide(); + $("[name='nowakil']").removeClass('is-invalid'); + + $("[name='errornamawakil']").hide(); + $("[name='namawakil']").removeClass('is-invalid'); + + $("[name='erroralamatwakil']").hide(); + $("[name='alamatwakil']").removeClass('is-invalid'); + + $("[name='errornotelwakil']").hide(); + $("[name='notelwakil']").removeClass('is-invalid'); + + $("[name='errornotawakil']").hide(); + $("[name='notawakil']").removeClass('is-invalid'); + + $("[name='errornokpwakil']").hide(); + $("[name='nokpwakil']").removeClass('is-invalid'); + + $(this).find(".invalid-feedback").hide(); + + }); + + function daftarfunction(id) { $('#nokpwakil').val(id); - $.ajax({ + + $.ajax({ method:'GET', url: "{{ route('wakil.caricustomer') }}", data:{ "icno" : id }, success:function(data){ - $('#WakilModal').modal(); $('#namawakil').val(''); $('#alamatwakil').val(data['']); $('#notelwakil').val(data['']); + if(data != 'no-data') + { + $('#namawakil').val(data['nama']); + $('#alamatwakil').val(data['alamat1']); + $('#notelwakil').val(data['telefon']); + $('#nopelangganwakil').val(data['nopelanggan']); + } + //get first wakil $.ajax({ method:'GET', @@ -2587,22 +2707,34 @@ let firstwakil = parseInt(getfirstwakil); $('#nowakil').val(firstwakil+1); - } - }); - if(data != 'no-data') - { - $('#namawakil').val(data['nama']); - $('#alamatwakil').val(data['alamat1']); - $('#notelwakil').val(data['telefon']); - $('#nopelangganwakil').val(data['nopelanggan']); - } - + Swal.close(); + $('#WakilModal').modal(); + + },error: function (request, status, error) { + console.log(request.responseText); + Swal.close(); + + Swal.fire({ + title: 'Punyai Ralat dalam API wakil...', + icon: 'error' + }); + + } + }) },error: function (request, status, error) { console.log(request.responseText); } + }); + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading() + } }); } From c50ccb09e545bf5531856b0dece5fe3a289416fa Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 16 Aug 2021 17:01:19 +0800 Subject: [PATCH 06/20] fix skit2 --- app/Http/Controllers/GadaianController.php | 10 +- app/Http/Controllers/KhazanahController.php | 4 +- resources/views/customers/info.blade.php | 347 +++++++++++--------- 3 files changed, 194 insertions(+), 167 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index beb0518..7feb8bb 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -334,7 +334,7 @@ class GadaianController extends Controller public function resitansurans($id) { - + $auth_user = Auth::user(); $totaltransaction = 0; $transaction = Http::get(config('api.url') . '/api/transaction/one/'. $id)->json(); @@ -349,8 +349,14 @@ class GadaianController extends Controller // if(sizeof($customers_info) != 0) // $customers_info = $customers_info[0]; + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); - return view('print.resitansuran',compact('transaction','gadai','customers_info')); + // dd($wakil); + if(sizeof($wakil) != 0) + $wakil = $wakil[0]; + + + return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); } public function resitbelumansurans($id) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 01f2679..3e51ed9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -670,7 +670,7 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "operasi", 'siri' => $request->siri, - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); }else{ @@ -679,7 +679,7 @@ class KhazanahController extends Controller "pengesahan" => "operasi", 'siri' => $request->siri, "pembatalan" => "batal", - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller)); diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 429fb95..f35f38c 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -493,188 +493,209 @@ $.ajax({ method:'get', - url: api_url + '/api/polis/get/', + url: api_url + '/api/check/serah/lelong', datatype:'json', data:{ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'norujukan': norujukan }, success:function(data){ + if(data == 0){ + - var count = Object.keys(data).length; - - if(count > 0) - { - if(data[0].tebus === 0) - { - const swalWithBootstrapButtons = Swal.mixin({ - customClass: { - confirmButton: 'btn btn-success', - cancelButton: 'btn btn-danger mr-1' - }, - buttonsStyling: false - }); - - swalWithBootstrapButtons.fire({ - title: 'Dapatkan Pengesahan Khazanah', - text: "Surat Akuan Gadaian Hilang!", - icon: 'info', - showCancelButton: true, - confirmButtonText: 'Hantar', - cancelButtonText: 'Batal', - reverseButtons: true - }).then((result) => { - if (result.isConfirmed) { - - let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' + "|" + '-' + "| Tambah Pinjaman"; - let teller = "{{ Auth::user()->name }}"; - - Swal.fire({ - title: 'Tunggu Pengesahan Daripada Khazanah.', - icon: 'info', - width: 600, - padding: '3em', - background: '#fffff', - showCancelButton: false, - showConfirmButton: false, - allowOutsideClick: false, - allowEscapeKey: false, - allowEnterKey: false - }) - let siricreated = 0; - $.ajax({ - method:'post', - url: "{{ route('khazanah.createkelulusan') }}", - data: { - "_token": "{{ csrf_token() }}", - "norujukan" : norujukan, - "komen" : komen, - "jumpinjam" : '0.00', - "teller" : teller - }, - success:function(data){ - siricreated = data; - }, - error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - - var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { - cluster: 'ap1', - encrypted: true - }); - - var channel = pusher.subscribe('notice-kelulusan'); - channel.bind('my-kelulusan', function(data) { - - - if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller) - { - if(data.kelulusan == 'lulus') - { - Swal.fire({ - icon: 'success', - title: 'Telah Disahkan' - }).then(function(){ - $.ajax({ - method:'put', - url: api_url + '/api/polis/put/', - data: { - 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", - 'norujukan': norujukan, - 'tebus' : 1 - }, - success:function(data){ - location.reload(); - - }, - error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - }); - - } - else if(data.kelulusan == 'batal') - { - Swal.fire({ - icon: 'warning', - title: 'Telah Dibatalkan', - text: `Komen : ${data.komen}` - }).then(function(){ - return false; - }); - } - } - - }); - - - } - else if (result.dismiss === Swal.DismissReason.cancel) { - swalWithBootstrapButtons.fire( - 'Gagal', - 'Gagal mendapatkan kelulusan khazanah', - 'error' - ) - } - }); - } - else - { - $.ajax({ - method:'get', - url: api_url + '/api/check/serah/gadai', - datatype:'json', - data:{ - 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", - 'norujukan': norujukan - }, - success:function(data){ - if(data == 'true'){ - window.location = urlpenebusan; - }else if(data == 'false'){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Gadaian Belum Scan Barcode' - }); - } - } - }); - } - - - - }else{ $.ajax({ method:'get', - url: api_url + '/api/check/serah/gadai', + url: api_url + '/api/polis/get/', datatype:'json', data:{ 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", 'norujukan': norujukan }, success:function(data){ - if(data == 'true'){ - window.location = urlpenebusan; - }else if(data == 'false'){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Gadaian Belum Scan Barcode' - }); + + var count = Object.keys(data).length; + + if(count > 0) + { + if(data[0].tebus === 0) + { + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger mr-1' + }, + buttonsStyling: false + }); + + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Khazanah', + text: "Surat Akuan Gadaian Hilang!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Hantar', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { + + let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' + "|" + '-' + "| Tambah Pinjaman"; + let teller = "{{ Auth::user()->name }}"; + + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Khazanah.', + icon: 'info', + width: 600, + padding: '3em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + let siricreated = 0; + $.ajax({ + method:'post', + url: "{{ route('khazanah.createkelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "komen" : komen, + "jumpinjam" : '0.00', + "teller" : teller + }, + success:function(data){ + siricreated = data; + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", { + cluster: 'ap1', + encrypted: true + }); + + var channel = pusher.subscribe('notice-kelulusan'); + channel.bind('my-kelulusan', function(data) { + + + if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller) + { + if(data.kelulusan == 'lulus') + { + Swal.fire({ + icon: 'success', + title: 'Telah Disahkan' + }).then(function(){ + $.ajax({ + method:'put', + url: api_url + '/api/polis/put/', + data: { + 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", + 'norujukan': norujukan, + 'tebus' : 1 + }, + success:function(data){ + location.reload(); + + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + }); + + } + else if(data.kelulusan == 'batal') + { + Swal.fire({ + icon: 'warning', + title: 'Telah Dibatalkan', + text: `Komen : ${data.komen}` + }).then(function(){ + return false; + }); + } + } + + }); + + + } + else if (result.dismiss === Swal.DismissReason.cancel) { + swalWithBootstrapButtons.fire( + 'Gagal', + 'Gagal mendapatkan kelulusan khazanah', + 'error' + ) + } + }); + } + else + { + $.ajax({ + method:'get', + url: api_url + '/api/check/serah/gadai', + datatype:'json', + data:{ + 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", + 'norujukan': norujukan + }, + success:function(data){ + if(data == 'true'){ + window.location = urlpenebusan; + }else if(data == 'false'){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Gadaian Belum Scan Barcode' + }); + } + } + }); + } + + + + }else{ + $.ajax({ + method:'get', + url: api_url + '/api/check/serah/gadai', + datatype:'json', + data:{ + 'kodcaw': "{{ $cawangan_info['kodcaw'] }}", + 'norujukan': norujukan + }, + success:function(data){ + if(data == 'true'){ + window.location = urlpenebusan; + }else if(data == 'false'){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Gadaian Belum Scan Barcode' + }); + } + } + }); } } - }); + }); + + + }else if(data == 1){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Gadaian Sedang Dilelong..' + }); } } - }); - - + }); } From 2e25e0d91882cb50ecdea53b12024d1148f37f3b Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 17 Aug 2021 18:28:57 +0800 Subject: [PATCH 07/20] fix skit2 la --- resources/views/customers/info.blade.php | 118 +++++++++++------- .../views/khazanah/alirantunai.blade.php | 46 +++++++ resources/views/khazanah/dashboard.blade.php | 2 +- .../views/print/laporan_penebusan.blade.php | 14 ++- 4 files changed, 132 insertions(+), 48 deletions(-) diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index f35f38c..b08b0ea 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -828,40 +828,56 @@ text: 'Sila pilih salah satu SAG' }); }else{ + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading() + } + }); + $.ajax({ method:'get', url:'{{ route("gadai.history") }}', data:{ "norujukan" : histid}, success:function(data) { - $('#historytebusModal').modal(); + historytebustable(data); + $.ajax({ + method: 'get', + url: api_url + '/api/transaction/' + histid, + success: function(data){ + historybayarantable(data); + + $.ajax({ + method:'get', + url: api_url + '/api/gadai/norujukan/'+histid, + success:function(gadai){ + rekodasal(gadai); + + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + + Swal.close(); + $('#historytebusModal').modal(); + } + }); + } + }); + + } + }); },error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); } }); - $.ajax({ - method: 'get', - url: api_url + '/api/transaction/' + histid, - success: function(data){ - historybayarantable(data); - } - }); - $.ajax({ - method:'get', - url: api_url + '/api/gadai/norujukan/'+histid, - success:function(gadai){ - rekodasal(gadai); - } - }); - $.ajax({ - method:'get', - url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, - success:function(ansuran){ - rekodansuran(ansuran); - } - }); } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let histid = $('input[name="sudahtebus"]:checked').val(); @@ -873,39 +889,53 @@ text: 'Sila pilih salah satu SAG' }); }else{ + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading() + } + }); + $.ajax({ method:'get', url:'{{ route("gadai.history") }}', data:{ "norujukan" : histid}, success:function(data){ - $('#historytebusModal').modal(); historytebustable(data); + + $.ajax({ + method: 'get', + url: api_url + '/api/transaction/' + histid, + success: function(data){ + historybayarantable(data); + } + }); + $.ajax({ + method:'get', + url:api_url + '/api/gadai/norujukan/'+histid, + success:function(gadai){ + rekodasal(gadai); + } + }); + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + } + }); + + $('#historytebusModal').modal(); + Swal.close(); + },error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); } }); - $.ajax({ - method: 'get', - url: api_url + '/api/transaction/' + histid, - success: function(data){ - historybayarantable(data); - } - }); - $.ajax({ - method:'get', - url:api_url + '/api/gadai/norujukan/'+histid, - success:function(gadai){ - rekodasal(gadai); - } - }); - $.ajax({ - method:'get', - url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, - success:function(ansuran){ - rekodansuran(ansuran); - } - }); } } } diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 44da7f9..09f54bf 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -272,6 +272,13 @@ @@ -116,15 +114,14 @@ function gadaitable(data){ var counter = 1; - var total_pinjaman = 0; - var total_upah12 = 0; - var total_nm = 0; - var total_berat = 0; + var totaljumlah = 0; + var totalcajlelong = 0; tabletuntutbaki.clear().draw(); $.each(data,function(index,tb){ - + totaljumlah += tb['jumlah']; + totalcajlelong += tb['cajlelong']; $.ajax({ method:'get', url: api_url + '/api/gadai/norujukan/' + tb['norujukan'], @@ -136,14 +133,16 @@ tabletuntutbaki.row.add([ counter, - customer[0]['nama'], + customer['nama'], gadai[0][0]['nokp'], tb['norujukan'], tb['teller'], tb['cajlelong'], tb['jumlah'] ]).draw(); - + counter = counter + 1; + $('#totalcajlelong').text(formatter.format(totalcajlelong)); + $('#totaljumlah').text(formatter.format(totaljumlah)); } }); } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 773e3c3..21a7b93 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -2677,20 +2677,24 @@ function daftarfunction(id) { + let kodcaw = "{{ Auth::user()->cawangan }}"; + $('#nokpwakil').val(id); - $.ajax({ method:'GET', - url: "{{ route('wakil.caricustomer') }}", - data:{ "icno" : id }, + // url: "{{ route('wakil.caricustomer') }}", + url: api + '/api/customers/' + id, + // data:{ "icno" : id }, success:function(data){ $('#namawakil').val(''); - $('#alamatwakil').val(data['']); - $('#notelwakil').val(data['']); + $('#alamatwakil').val(''); + $('#notelwakil').val(''); - if(data != 'no-data') + var size = Object.keys(data).length; + + if(size > 0) { $('#namawakil').val(data['nama']); $('#alamatwakil').val(data['alamat1']); @@ -2701,7 +2705,8 @@ //get first wakil $.ajax({ method:'GET', - url: "{{ route('wakil.first') }}", + // url: "{{ route('wakil.first') }}", + url: api + '/api/firstwakil/' + kodcaw, success:function(getfirstwakil) { let firstwakil = parseInt(getfirstwakil); diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index 01b23c6..959667b 100644 --- a/resources/views/print/laporan_ringkasanharian.blade.php +++ b/resources/views/print/laporan_ringkasanharian.blade.php @@ -114,7 +114,7 @@
{{ 'RM '. number_format($laporan['panjar_harian'],2) }}
2. BULANAN
{{ 'RM '. number_format($laporan['panjar_bulanan'],2) }}
-
3. TERKUMPUL
+
3. TERKUMPUL (TAHUNAN)
{{ 'RM '. number_format($laporan['panjar_tahunan'],2) }}
diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php index d034fc5..cfc1e65 100644 --- a/resources/views/print/laporan_tuntutbaki.blade.php +++ b/resources/views/print/laporan_tuntutbaki.blade.php @@ -233,7 +233,7 @@ $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp {{$gadaidetail[0][0]['nokp']}} From dae3d7e0e981f3e334e23196847aafc802bee378 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Fri, 20 Aug 2021 03:39:14 +0800 Subject: [PATCH 09/20] server --- app/Http/Controllers/KhazanahController.php | 4 +- app/Http/Controllers/LelongController.php | 265 ------------------ resources/views/customers/info.blade.php | 8 +- .../views/khazanah/laporan/index.blade.php | 6 +- .../khazanah/laporan/tuntutbaki.blade.php | 22 +- resources/views/lelongan/index.blade.php | 3 + resources/views/modal/wakil.blade.php | 1 + .../views/print/laporan_tuntutbaki.blade.php | 2 +- 8 files changed, 26 insertions(+), 285 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8599c88..8216fa4 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -651,7 +651,7 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "operasi", 'siri' => $request->siri, - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); }else{ @@ -660,7 +660,7 @@ class KhazanahController extends Controller "pengesahan" => "operasi", 'siri' => $request->siri, "pembatalan" => "batal", - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller)); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 47f0aa5..0031a46 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -145,279 +145,14 @@ class LelongController extends Controller $serahan = $getTunai2['kurang']; $bakiakhir = $baki; - $jumlah_byr=$request->jumlah; if($request->jenis == 'T') { $bakiakhir -= $request->jumlah; - - - - $KOD_TUNAI='1000/010'; - $BAKI_LELONG='7000/090'; - - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $kredit_Tunai=$kredit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - $gl_cdetails_bl= $get_KOD_BL[0]; - $keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode - $actype_bl= $get_KOD_BL[0]['acttype']; - - - $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Baki_Lelong)==0) - { - $jumlah_bl=0.0; - - $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if(sizeof($getGLedjer_bl_Semalam)==0) - { - $jumlah_bl=0.0; - } - else - { - - $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah']; - - $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini']; - $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl; - - } - $jumlahBulan_ini_bl=0.0; - $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_bl)==0) - { - $jumlahBulan_ini_bl=0.0; - } - else - { - - $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah']; - $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl; - - } - - - $Jumlah_TahunIni_bl=0.0; - $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_bl)==0) - { - $Jumlah_TahunIni_bl=0.0; - } - else - { - $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah']; - $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl; - - } - - - $HariIni_bl=0.0; - $kelmarin_bl=$jumlah_bl-$HariIni_bl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$BAKI_LELONG, - 'descpt'=>$keterangan_bl, - 'debit'=>$jumlah_byr, - 'kredit'=>0.0, - 'hariini'=>$HariIni_bl, - 'kelmarin'=>$kelmarin_bl, - 'jumlah'=>$jumlah_bl, - 'bulanini'=>$jumlahBulan_ini_bl, - 'tahunini'=>$Jumlah_TahunIni_bl, - 'acttype'=> $actype_bl - - ]); - - - } - else - { - - $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini']; - $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin']; - $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah']; - $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit']; - $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit']; - $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno']; - - $debit_BL=$debit_BL+$jumlah_byr; - $hariIni_Tunai=$debit_BL-$kredit_BL; - $kelmarin_BL=$jumlah_BL-$hariIni_BL; - - $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_BL, - 'debit'=>$debit_BL, - 'kredit'=>$kredit_BL, - 'hariini'=>$hariIni_BL, - 'kelmarin' =>$kelmarin_BL, - - ]); - - } - - - } else { $bakiakhir += -($request->jumlah); - - - $KOD_TUNAI='1000/010'; - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $debit_Tunai=$debit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - - $RUGI_LELONG='3000/020'; - - $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - $gl_cdetails_rl= $get_KOD_RL[0]; - $keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode - $actype_rl= $get_KOD_RL[0]['acttype']; - - - $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Rugi_Lelong)==0) - { - $jumlah_rl=0.0; - - $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if(sizeof($getGLedjer_rl_Semalam)==0) - { - $jumlah_rl=0.0; - } - else - { - - $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah']; - - $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini']; - $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl; - - } - $jumlahBulan_ini_rl=0.0; - $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_rl)==0) - { - $jumlahBulan_ini_rl=0.0; - } - else - { - - $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah']; - $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl; - - } - - - $Jumlah_TahunIni_rl=0.0; - $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_rl)==0) - { - $Jumlah_TahunIni_rl=0.0; - } - else - { - $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah']; - $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl; - - } - - - $HariIni_rl=0.0; - $kelmarin_rl=$jumlah_rl-$HariIni_rl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$RUGI_LELONG, - 'descpt'=>$keterangan_rl, - 'debit'=>0.0, - 'kredit'=>$jumlah_byr, - 'hariini'=>$HariIni_rl, - 'kelmarin'=>$kelmarin_rl, - 'jumlah'=>$jumlah_rl, - 'bulanini'=>$jumlahBulan_ini_rl, - 'tahunini'=>$Jumlah_TahunIni_rl, - 'acttype'=> $actype_rl - - ]); - - - } - else - { - - $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini']; - $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin']; - $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah']; - $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit']; - $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit']; - $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno']; - - $kredit_RL=$kredit_RL+$jumlah_byr; - $hariIni_Tunai=$debit_RL-$kredit_RL; - $kelmarin_BL=$jumlah_RL-$hariIni_RL; - - $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_RL, - 'debit'=>$debit_RL, - 'kredit'=>$kredit_RL, - 'hariini'=>$hariIni_RL, - 'kelmarin' =>$kelmarin_RL, - - ]); - - } - - - } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index e8aaece..b150a4e 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -1237,10 +1237,10 @@ return 'Masukkan No Kad Pengenalan yang betul!'; } - if(isNaN(value)) - { - return 'Kad Pengenalan hendaklah dalam bentuk nombor!' - } + // if(isNaN(value)) + // { + // return 'Kad Pengenalan hendaklah dalam bentuk nombor!' + // } } }); diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index dc83920..0a403f2 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -86,9 +86,9 @@
Aging Kawalan Stok
-
- Imbang Duga -
+ {{--
+ // Imbang Duga +
--}}
Peti Besi
diff --git a/resources/views/khazanah/laporan/tuntutbaki.blade.php b/resources/views/khazanah/laporan/tuntutbaki.blade.php index fae7641..08255b7 100644 --- a/resources/views/khazanah/laporan/tuntutbaki.blade.php +++ b/resources/views/khazanah/laporan/tuntutbaki.blade.php @@ -49,11 +49,9 @@ - TOTAL - - - - + TOTAL + + @@ -116,15 +114,16 @@ function gadaitable(data){ var counter = 1; - var total_pinjaman = 0; - var total_upah12 = 0; - var total_nm = 0; - var total_berat = 0; + var totaljumlah = 0; + var totalcajlelong = 0; tabletuntutbaki.clear().draw(); $.each(data,function(index,tb){ + totaljumlah += tb['jumlah']; + totalcajlelong += tb['cajlelong']; + $.ajax({ method:'get', url: api_url + '/api/gadai/norujukan/' + tb['norujukan'], @@ -136,7 +135,7 @@ tabletuntutbaki.row.add([ counter, - customer[0]['nama'], + customer['nama'], gadai[0][0]['nokp'], tb['norujukan'], tb['teller'], @@ -144,6 +143,9 @@ tb['jumlah'] ]).draw(); + counter = counter + 1; + $('#totalcajlelong').text(formatter.format(totalcajlelong)); + $('#totaljumlah').text(formatter.format(totaljumlah)); } }); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 1a98a03..1955d43 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -252,6 +252,9 @@ alert(xhr.responseText); } }); + + return false; + const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', diff --git a/resources/views/modal/wakil.blade.php b/resources/views/modal/wakil.blade.php index 5b80b00..229b7ae 100644 --- a/resources/views/modal/wakil.blade.php +++ b/resources/views/modal/wakil.blade.php @@ -88,6 +88,7 @@ + diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php index d034fc5..cfc1e65 100644 --- a/resources/views/print/laporan_tuntutbaki.blade.php +++ b/resources/views/print/laporan_tuntutbaki.blade.php @@ -233,7 +233,7 @@ $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp {{$gadaidetail[0][0]['nokp']}} From 6a86fbd830d5c2f1b533f382247a1f76d54399d7 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Fri, 20 Aug 2021 03:45:36 +0800 Subject: [PATCH 10/20] fix json --- app/Http/Controllers/PenebusanController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 5e16f3c..c4362d5 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -596,7 +596,7 @@ class PenebusanController extends Controller 'upah12' => $keuntungan12bulan, 'hargajualan' => $hargajualan, 'kuantiti_marhun' => $request->kuantiti_marhun - ])->$request->acceptsJson()(); + ])->json(); $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[ 'unit_komuditi' => round($request->pinjaman, 2), From c05eb2d755e8c3fceb8ca8908be21cb48585501e Mon Sep 17 00:00:00 2001 From: fifi97 Date: Fri, 20 Aug 2021 03:52:01 +0800 Subject: [PATCH 11/20] fix skit2 --- app/Http/Controllers/PenebusanController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index c4362d5..3ec99ce 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -566,7 +566,7 @@ class PenebusanController extends Controller 'nopelanggan' => $request->nopelanggan, 'nokp' => $request->noic, 'sirig' => $new_sirig - ])->json(); + ]); ////////////////////// From de8ec2cddeb1e806c0d751cade9220789f6b9e05 Mon Sep 17 00:00:00 2001 From: afiq Date: Fri, 20 Aug 2021 04:23:00 +0800 Subject: [PATCH 12/20] blacklist --- app/Http/Controllers/CustomersController.php | 24 +++++++++++++---- resources/views/customers/index.blade.php | 28 ++++++++++++++------ 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 97abe7f..afc3d84 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -37,7 +37,8 @@ class CustomersController extends Controller $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('customers.index',compact('search','cawangan_info','bank','api_url','idtype')); + $blacklist_search = false; + return view('customers.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype')); } public function info(Request $request){ @@ -70,6 +71,9 @@ class CustomersController extends Controller $bank = Http::get(config('api.url') . '/api/bank')->json(); $customer_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + $blacklist = Http::get(config('api.url') . '/api/customer/blacklist',[ + 'nokp' => $noic + ])->json(); // if($customers_info){ // $customer_info = $customers_info[0]; // }else{ @@ -77,13 +81,23 @@ class CustomersController extends Controller // } $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); - + $blacklist_search = false; $search = true; if($customer_info){ - Session::put('customer_info',$customer_info); - return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + if($blacklist){ + $blacklist_search = true; + return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + }else{ + Session::put('customer_info',$customer_info); + return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + } }else{ - return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + if($blacklist){ + $blacklist_search = true; + return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + }else{ + return view('customers.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + } } } diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php index b4cb26e..c023533 100644 --- a/resources/views/customers/index.blade.php +++ b/resources/views/customers/index.blade.php @@ -41,7 +41,7 @@ - @if($search == true ) + @if($search == true && $blacklist_search == false)
- +
@@ -264,7 +264,7 @@ No Telefon 1
- +
@@ -273,7 +273,7 @@ No Telefon 2
- +
@@ -1926,6 +1926,36 @@ } } + + + $('#poskod').change(function(){ + var poskod = this.value; + console.log(poskod); + $.ajax({ + method:'GET', + url:api_url+'/api/poskod/'+poskod, + success:function(poskod_detail){ + var koddaerah = poskod_detail['koddaerah']; + var kodnegeri = poskod_detail['kodnegeri']; + $.ajax({ + url:api_url+'/api/negeri/'+kodnegeri, + method:'GET', + success:function(negeri){ + console.log(negeri); + $('#kodnegeri').val(negeri['negeri']); + } + }); + $.ajax({ + url:api_url+'/api/daerah/'+koddaerah, + method:'GET', + success:function(daerah){ + $('#koddaerah').val(daerah['namadaerah']); + } + }); + } + }); + }); + function kemaskinifunc() { $('#btnkemaskini').addClass('btn-danger'); @@ -1940,6 +1970,8 @@ $('#kodbank').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); + $('#alamat').attr('readonly', false); + $('#poskod').attr('readonly', false); } @@ -1959,6 +1991,8 @@ $('#kodbank').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); + $('#alamat').attr('readonly', true); + $('#poskod').attr('readonly', true); } $("#kemaskiniform").submit(function(event) { @@ -1970,6 +2004,8 @@ var kodbank = $('#kodbank').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); + var alamat = $('#alamat').val(); + var poskod = $('#poskod').val(); $.ajax({ method:"put", @@ -1979,7 +2015,9 @@ "telefon2": telefon2, "kodbank":kodbank, "noakaun":noakaun, - 'nota':nota + 'nota':nota, + 'alamat':alamat, + 'poskod':poskod }, success: function(success){ $('#btnsave').css('display','none'); @@ -2044,6 +2082,8 @@ $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); $('#nota').attr('readonly', true); + $('#alamat').attr('readonly', true); + $('#poskod').attr('readonly', true); $('#kemaskiniform').trigger('submit'); } diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 0b39319..46706ee 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -264,7 +264,9 @@ setTimeout("location.reload(true);",timeoutPeriod); } - window.onload = timedRefresh(100000); + // window.onload = timedRefresh(100000); + //Pusher + var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({ "ordering": true }); diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index d855799..a34a646 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -567,7 +567,7 @@ let tarikhtuntut = $(e).data('tarikhtuntut'); let norujukan = $(e).data('norujukan'); - var urlroute = '{{ route("lelongan", ":id") }}'; + var urlroute = '{{ route("lelongan.khazanah", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); if (tarikhtuntut == null) diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 0a403f2..08e70fe 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -31,13 +31,12 @@
Aging Bulan
-
+ {{--
Aging Pemodal +
--}} +
+ Tuntut Baki
-
- {{-- Stok Audit Bersih --}} - Stok Audit Bersih -
{{-- Stok Audit Details --}} Stok Audit Details @@ -65,10 +64,7 @@
Lejer Am
-
- Tuntut Baki - -
+
diff --git a/resources/views/lelongan/index-khazanah.blade.php b/resources/views/lelongan/index-khazanah.blade.php new file mode 100644 index 0000000..3a63cbe --- /dev/null +++ b/resources/views/lelongan/index-khazanah.blade.php @@ -0,0 +1,744 @@ +@extends('layouts.app') + +@section('content') +@include('modal.wakil') + +
+
+
+

LELONGAN

+
+ +
+
+
+ NAMA +
+
+ +
+
+
+
+
+
+ NO PELANGGGAN +
+
+ +
+
+
+
+
+
+ NO RUJUKAN +
+
+ +
+
+
+
+
+
+ NO KAD PENGENALAN +
+
+ +
+
+
+
+
+
+ JENIS LELONG +
+
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+ WAKIL +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ TARIKH +
+
+ +
+
+ +
+
+ NO SIRI +
+
+ +
+
+ +
+
+ HARGA JUAL (RM) +
+
+ +
+
+ +
+
+ PEMBIAYAAN (RM) +
+
+ +
+
+ +
+ +
+ +
+
+ BATCH LELONG +
+
+ +
+
+ +
+
+ KEUNTUNGAN (RM) +
+
+ +
+
+ +
+
+ CAJ LELONG (RM) +
+
+ +
+
+ +
+
+ JUMLAH (RM) +
+
+ +
+
+ + + +
+ +
+ + +
+ +
+ +
+
+ + + +
+
+
+ + +@endsection diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 10445e8..bebb41e 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -1,6 +1,8 @@ @extends('layouts.app') @section('content') +@include('modal.wakil') +
@@ -54,11 +56,11 @@
- +
- +
@@ -185,6 +187,7 @@ diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php new file mode 100644 index 0000000..3684a9a --- /dev/null +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -0,0 +1,210 @@ + + + + + + +
SULIT DAN PERSENDIRIAN
+ + + + + + + + + + + + + + + + + + + + +
PENYATA ALIRAN TUNAI : {{ $teller }}
+ +
+
+

Baki Awal

+ RM {{ number_format($alirantunai['bakiawal'],2) }} +
+ +
+

Pendahuluan

+ RM {{ number_format($alirantunai['tambah'],2) }} +
+ +
+

Penebusan

+ RM {{ number_format($alirantunai['masuk'],2) }} +
+
+ +
+
+

Baki Tunai Semasa

+ RM {{ number_format($alirantunai['baki'],2) }} +
+ +
+

Serahan

+ RM {{ number_format($alirantunai['kurang'],2) }} +
+ +
+

Gadaian

+ RM {{ number_format($alirantunai['keluar'],2) }} +
+
+ +
KEMASUKAN TUNAI
+
+ + + + + + + + + @php $totaltambah = 0; $totalkurang = 0; @endphp + @foreach($addtunai as $index=>$ad) + @php $totaltambah += $ad['tambah']; $totalkurang += $ad['kurang']; @endphp + + + + + + + @endforeach + + + + + + +
TARIKHDEBIT (RM)KREDIT (RM)NOTA
{{ $ad['tarikh'] }}{{ number_format($ad['tambah'],2) }}{{ number_format($ad['kurang'],2) }}{{ $ad['nota'] }}
JUMLAH{{ number_format($totaltambah,2) }}{{ number_format($totalkurang,2) }}
+ + +
+ + +
+ + + + + \ No newline at end of file diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index c53edab..47ef3eb 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -143,7 +143,7 @@ Ar-Rahn
-
+