diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 4484bd6..1db2f7c 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -256,7 +256,7 @@ class KhazanahController extends Controller if(sizeof($kelulusan) > 0) { - $kelulusan = $kelulusan[0]['pelulus']; + $kelulusan = $kelulusan[0]['masalulus']; } else { @@ -292,13 +292,14 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan, [ - 'komen' => "dsaa", + $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/khazanah', [ + 'komen' => "Pembiayaan Melebihi Margin 70%", 'dategadai' => "2020-12-12", 'bilgadai' => 1, 'jumpinjam' => 1020, 'jenistebus' => "G", - 'teller' => "dsaas" + 'teller' => "dsaas", + 'pelulus' => "khazanah" // 'komen' => $request->komen, // 'dategadai' => $dategadai, // 'bilgadai' => $bilgadai, diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php new file mode 100644 index 0000000..a522c32 --- /dev/null +++ b/app/Http/Controllers/OperasiController.php @@ -0,0 +1,77 @@ +middleware('auth'); + } + + public function kelulusan(Request $request){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); + + return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan')); + } + + public function updatekelulusan(Request $request) + { + $auth_user = Auth::user(); + + $api_url = config('api.url'); + + $norujukan = $request->norujukan; + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan, [ + 'peloperasi' => $auth_user['name'] + ])->json(); + + return response()->json($updatelulus,200); + } + + public function createkelulusan(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $norujukan = $request->norujukan; + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/operasi', [ + 'komen' => "Pembiayaan Melebihi Margin 75%", + 'dategadai' => "2020-12-12", + 'bilgadai' => 1, + 'jumpinjam' => 1020, + 'jenistebus' => "G", + 'teller' => "dsaas", + 'peloperasi' => "operasi" + // 'komen' => $request->komen, + // 'dategadai' => $dategadai, + // 'bilgadai' => $bilgadai, + // 'jumpinjam' => $request->jumpinjam, + // 'jenistebus' => "G", + // 'teller' => $request->teller + ])->json(); + + event(new StatusLiked('Penghantaran kepada Operasi!')); + + return response()->json($createlulus,201); + } +} diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 2a392f5..c08b46d 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -557,13 +557,124 @@ } else{ if(pinjaman > Number(pembiyaan_max_pelulus)+10){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Pembiayaan Memerlukan Kelulusan Operasi' + // Swal.fire({ + // icon: 'error', + // title: 'Amaran!', + // text: 'Pembiayaan Memerlukan Kelulusan Operasi' + // }); + // event.preventDefault(); + // return false; + + const swalWithBootstrapButtons = Swal.mixin + ({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }) + + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Daripada Operasi?', + text: "Tetapan margin melebihi 75% untuk Operasi!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Setuju!', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { + + let norujukan = $('#norujukan').val(); + + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Operasi.', + icon: 'info', + width: 600, + padding: '3em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + + $.ajax({ + method:'post', + url: "{{ route('operasi.createkelulusan') }}", + data: { + "_token": "{{ csrf_token() }}", + "norujukan" : norujukan + // "teller" : teller, + // "dategadai" : dategadai, + // "bilgadai" : noic, + // "jumpinjam" : jumpinjam, + // "teller" : teller + + }, + success:function(data){ + + console.log(data); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + //TIME INTERVAL + let timerInterval; + + timerInterval = setInterval(function() + { + $.ajax({ + method:'get', + url: "{{ route('khazanah.getkelulusan') }}", + data: { + "norujukan" : norujukan + }, + success:function(data){ + + if(data != '') + { + clearInterval(timerInterval); + Swal.fire({ + icon: 'success', + title: 'Anda Berjaya Menerima Pengesahan' + }).then(function(){ + + $(func).attr("onSubmit","return true;"); + $(func).submit(); + return true; + + }); + } + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + }, 3000); + + + } else if ( + /* Read more about handling dismissals below */ + result.dismiss === Swal.DismissReason.cancel + ) { + swalWithBootstrapButtons.fire( + 'Cancelled', + 'Your imaginary file is safe :)', + 'error' + ) + } }); - event.preventDefault(); - return false; + + event.preventDefault(); + return false; + }else if(pinjaman > Number(pembiayaan_max_teller)+10){ diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php index f3c0289..c5c1eb8 100644 --- a/resources/views/homepage/operasi/home.blade.php +++ b/resources/views/homepage/operasi/home.blade.php @@ -8,7 +8,7 @@
{{ __('Dashboard') }}
- Operasi + Kelulusan
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php new file mode 100644 index 0000000..9b83df5 --- /dev/null +++ b/resources/views/operasi/kelulusan.blade.php @@ -0,0 +1,94 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+ +
+ +
+
+ +
+
+

Kelulusan

+
+
+
. +
+ + + + + + + + + + + + + @foreach($kelulusan as $index=>$k) + + + + + + + + + + @endforeach + +
No RujukanTARIKHCawanganKomenTindakan
{{ $k['NORUJUKAN'] }}{{ $k['TARIKH'] }}{{ $cawangan_info['details_caw'] }}{{ $k['KOMEN'] }}
+ +
+ + Kemaskini + Rekod Telah Lulus + +
+ +
+
+
+
+
+ +@endsection diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 74397b6..9905113 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -135,7 +135,7 @@
{{--
--}} -
+
@@ -201,8 +201,8 @@
-
-
+
+
PEMBIAYAAN BARU(RM)
@@ -212,8 +212,8 @@
-
-
+
+
PERLU DIBAYAR(RM)
@@ -223,9 +223,9 @@
-
+
-
+
PINJAMAN BARU(RM)
@@ -237,8 +237,8 @@
-
-
+
+
BAYARAN DITERIMA(RM)
@@ -331,7 +331,6 @@ function tebusan() dataType: 'json', success:function(data){ $('#perludibayar').val(data); - alert(data); } }); @@ -393,7 +392,7 @@ function tebusan() if(tarikhgadai >= tarikhtawarruq) { - alert('separuh bayar tawarruq'); + //Separuh Bayar Tawarruq $(document).on('click', '#checkmarhun', function(e) { @@ -447,7 +446,7 @@ if(tarikhgadai >= tarikhtawarruq) }); }); - //checked box + //checked box var checkboxes = document.querySelectorAll('input[type="checkbox"]'); var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked); @@ -544,7 +543,10 @@ $("#sltjenistebus").change(function(){ case "T": $('input[type="checkbox"]').hide(); $('span.spannar').show(); + $("#bayaran").prop("disabled", true); + $("#bayaran").val(0); + $('#divtambahpinjaman').hide(); $('#divpinjamanbaru').hide(); $('#divbayaranditerima').hide(); @@ -560,7 +562,10 @@ $("#sltjenistebus").change(function(){ case "A": $('input[type="checkbox"]').hide(); $('span.spannar').show(); + $("#bayaran").prop("disabled", false); + $("#bayaran").val(0); + $('#divtambahpinjaman').hide(); $('#divpinjamanbaru').hide(); $('#divbayaranditerima').hide(); @@ -577,7 +582,10 @@ $("#sltjenistebus").change(function(){ case "S": $('input[type="checkbox"]').show(); $('span.spannar').hide(); + $("#bayaran").prop("disabled", false); + $("#bayaran").val(0); + $('#divtambahpinjaman').hide(); $('#divpinjamanbaru').hide(); $('#divbayaranditerima').hide(); @@ -605,6 +613,7 @@ $("#sltjenistebus").change(function(){ $("#bayaran").prop("disabled", false); + $("#bayaran").val(0); break; } diff --git a/routes/web.php b/routes/web.php index c6a43cd..bdd3799 100644 --- a/routes/web.php +++ b/routes/web.php @@ -75,10 +75,11 @@ Route::post('/createwakil',['as'=>'wakil.create','uses'=>'PenebusanController@cr Route::get('/firstwakil',['as'=>'wakil.first','uses'=>'PenebusanController@getfirstWakil'])->middleware('auth','teller'); Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history'])->middleware('auth','teller'); + //MAINTENANCE Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller'); Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); -// Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); +Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); //Penilai Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai'); @@ -146,3 +147,9 @@ Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporan Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit'])->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'); +Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi');