diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c4f495f..b2676cf 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -15,6 +15,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Session; +use Illuminate\Support\Facades\Hash; use Carbon\Carbon; use PDF; @@ -320,13 +321,27 @@ class KhazanahController extends Controller unset($komen[$results]); } - array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); + array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); } return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid')); } + public function mintakatalaluansemula(Request $request) + { + + if(Hash::check($request->passsemula, Auth::user()->password)) + { + return "True"; + } + else + { + return "False"; + } + + } + public function kelulusanrekodlepas() { $auth_user = Auth::user(); diff --git a/public/js/main.js b/public/js/main.js index 7584c52..fa3168b 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -6,21 +6,6 @@ function totalamount(idwang,bilangan) var amount = 0; switch (idwang) { case 'bundle1': - // var rec1 = parseInt($('#rekodb1').val()); - // var tempbil = 0; - - // console.log(rec1); - - - // bilangan != '' ? tempbil = bilangan : tempbil = 0; - - // console.log(tempbil); - - - // total = rec1-tempbil; - - // $('#rekodb1').val(total); - amount += (bilangan * 100); break; case 'bundle20': @@ -44,6 +29,9 @@ function totalamount(idwang,bilangan) case 'sen5': amount += (bilangan * 0.05); break; + case 'sen10': + amount += (bilangan * 0.10); + break; case 'sen20': amount += (bilangan * 0.20); break; @@ -85,8 +73,20 @@ function totalkey(datakeyin) { var idkey = $(datakeyin).attr('id'); var valkey = $(datakeyin).val(); + var deno = $(datakeyin).data('deno'); var amount = 0; + if(valkey > deno) + { + $('#' + idkey).val(0); + Swal.fire({ + icon: 'error', + title: 'Amaun Kiraan lebih banyak daripada Amaun Sebenar!' + }); + + return ; + } + var validate = parseFloat($('#amt').data('amaun')); $.each(arrayambilan, function( index, arr ){ @@ -113,7 +113,7 @@ function totalkey(datakeyin) } else { - $('#amt').val(amount); + $('#amaunkiraan').val(formatter.format(amount)); } } @@ -143,7 +143,6 @@ function kiraan(datakeyin) if(amount > validate) { - // $('#' + idkey).val(''); Swal.fire({ icon: 'error', title: 'Amaran', @@ -293,13 +292,21 @@ async function openuptambahdanserah(e) cancelButtonText:'Batal', allowOutsideClick: true }) + + let bakiakhir = parseFloat($('#bakiakhir').text().substring(2).replace(/[^0-9.-]+/g,"")); + + if(amaun > bakiakhir) + { + Swal.fire('error','Amaun serahan hendaklah tidak lebih daripada baki akhir tunai!','error'); + return false; + } if (amaun) { // Swal.fire(`Entered email: ${amaun}`) if (isNaN(amaun)) { Swal.fire('error','Amaun hendaklah dalam nombor!','error'); - return false; + return false; } else { diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 21de62a..9d19086 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -57,7 +57,7 @@
-

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

+

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

Baki Akhir Tunai

@@ -94,6 +94,7 @@
+
@@ -171,7 +172,8 @@ var tableaddtunai = $('#tableaddtunai').DataTable({ counter = counter + 1; }); -} +} + @endsection \ No newline at end of file diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 549414f..cde1383 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -335,7 +335,7 @@ counter, marhun_detail['recno'], marhun_detail['marhun'], - 'RM ' + formatter.format(marhun_detail['n_marhun']), + formatter.format(marhun_detail['n_marhun']), marhun_detail['karat'], formatter.format(marhun_detail['berat']), marhun_detail['nota'], @@ -402,6 +402,38 @@ minimumFractionDigits: 2 }); + $('#daftar_marhun').on('show.bs.modal', function(event) { + let teller = "{{ Auth::user()->name }}"; + let bakiakhir = 0; + var kodcaw = $('#kodcaw').val(); + + $.ajax({ + method: 'get', + url: api_url + '/api/GetCurrentTunai/' + kodcaw, + async: false, + dataType:'json', + data:{ + 'kodlaluan': teller + }, + success:function(data){ + bakiakhir = data.baki; + } + }); + + + if(bakiakhir <= total_nilai_marhun) + { + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Baki Akhir Tunai Lebih Rendah Daripada Nilai Marhun Yang Ingin Digadaikan. Sila Tambah Pendahuluan di Laman Aliran Tunai Segera. ' + }); + + return false; + } + + }); + $('#terima_marhun').click(function(){ var kodcaw = $('#kodcaw').val(); var norujukan = $('#norujukan').val(); @@ -413,6 +445,7 @@ var bilangan_marhun_daftar = Number($('#bilangan_marhun').val()); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); + if(nota_array != null){ var nota = nota_array.toString(); }else{ diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 18e3213..62d8b7f 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -24,6 +24,7 @@ No Rujukan + Teller Komen Nilai Pembiayaan Nilai Marhun @@ -36,19 +37,21 @@ @foreach($arraykelulusan as $index=>$k) {{ $k['norujukan'] }} + {{ $k['namateller'] }} {{ $k['komen'] }} {{ number_format($k['pinjaman'],2) }} {{ $k['nilaimarhun'] }} {{ $k['berat'] }} {{ $k['margin'] }} - + @endforeach @foreach($kelulusanmohonid as $index=>$km) {{ $km['norujukan'] }} + {{ $km['teller'] }} {{ $km['mohon'] }} {{ $km['tarikh'] }} {{ $cawangan_info['details_caw'] }} @@ -78,7 +81,73 @@ "scrollX": true }); - function updatelulus(e) + async function updatelulus(e) + { + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('khazanah.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + let norujukan = $(e).data('norujukan'); + let pelulus = $(e).data('pelulus'); + + $.ajax({ + method:'put', + url: "{{ route('khazanah.updatekelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan, + "pelulus" : pelulus + }, + success:function(data){ + console.log(data); + Swal.fire({ + icon: 'success', + title: 'Pengesahan Berjaya' + }).then(function(){ + location.reload(); + + }); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } + + function updatebatal(e) { let norujukan = $(e).data('norujukan'); let pelulus = $(e).data('pelulus'); @@ -107,8 +176,47 @@ }); } - function updatelulusmohon(e) + + async function updatelulusmohon(e) { + + const { value: katalaluan } = await Swal.fire({ + title: 'Masukkan Katalaluan Semula', + input: 'password', + inputPlaceholder: 'Katalaluan', + confirmButtonText: 'Hantar', + showCancelButton:true, + cancelButtonText:'Batal', + allowOutsideClick: true + }) + + let dataminta = ''; + + $.ajax({ + method:'get', + url: "{{ route('khazanah.getmintasemulakelulusan') }}", + async:false, + data:{ passsemula : katalaluan }, + success:function(data) + { + if(data == "False") + { + dataminta = data; + } + } + }); + + if(dataminta == 'False') + { + Swal.fire({ + icon: 'error', + title: 'Pengesahan Katalaluan Tidak Berjaya' + }) + event.preventDefault(); + return false; + } + + let norujukan = $(e).data('norujukan'); let namakhazanah = "{{ $auth_user = Auth::user()->name }}"; $.ajax({ diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php index e19402b..98d6229 100644 --- a/resources/views/khazanah/khazanahserahan.blade.php +++ b/resources/views/khazanah/khazanahserahan.blade.php @@ -58,12 +58,12 @@ - - + + - - + + @@ -117,12 +117,12 @@
RekodAmbilanPeti BesiTeller Total RekodAmbilanPeti BesiTeller Total (RM)
- - + + - - + + diff --git a/resources/views/khazanah/pendahuluanserah.blade.php b/resources/views/khazanah/pendahuluanserah.blade.php index c95fe04..dc2166c 100644 --- a/resources/views/khazanah/pendahuluanserah.blade.php +++ b/resources/views/khazanah/pendahuluanserah.blade.php @@ -25,8 +25,8 @@
Amaun (RM)
-
Nota
-
+
Nota
+

@@ -48,6 +48,12 @@
  • Keping
    • +
    +
    + + +
    +
    {{-- {{ dd($denominasi)}} --}} @@ -58,42 +64,42 @@
    RekodAmbilanPeti BesiTeller Total RekodAmbilanPeti BesiTeller Total (RM)
    - - - + + + - - + + - + - + - + - + - + - +
    RekodAmbilanTotalPeti BesiTellerTotal (RM) RekodAmbilanPeti BesiTeller Total (RM)
    RM1 RM20
    RM5 RM50
    RM10 RM100
    @@ -117,63 +123,63 @@ - - + + - - + + - + - + - + - + - + - + - + - + - + - + @@ -183,7 +189,7 @@ - +
    RekodAmbilanPeti BesiTeller Total RekodAmbilanPeti BesiTeller Total (RM)
    RM0.01 RM1
    RM0.05 RM5
    RM0.10 RM10
    RM0.20 RM20
    RM0.50 RM50
    RM100
    diff --git a/routes/web.php b/routes/web.php index 88b5b65..e4d4a83 100644 --- a/routes/web.php +++ b/routes/web.php @@ -131,6 +131,7 @@ Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller'); Route::post('/createkelulusan',['as'=>'khazanah.createkelulusan','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller'); Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'KhazanahController@updatekelulusan'])->middleware('auth','khazanah'); +Route::get('/mintasemulakelulusan',['as'=>'khazanah.getmintasemulakelulusan','uses'=>'KhazanahController@mintakatalaluansemula'])->middleware('auth','khazanah'); Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah'); Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller'); Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller'); @@ -172,10 +173,8 @@ Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'GadaianController@r Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller'); Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller'); - Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah'); - //Operasi Route::get('/operasi/kelulusan','OperasiController@kelulusan')->name('operasi.kelulusan')->middleware('auth','operasi'); Route::post('/operasi/createkelulusan',['as'=>'operasi.createkelulusan','uses'=>'OperasiController@createkelulusan'])->middleware('auth','teller');