diff --git a/.DS_Store b/.DS_Store index f1757f2..6bde683 100644 Binary files a/.DS_Store and b/.DS_Store differ 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/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 8216fa4..b1780d2 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1224,7 +1224,6 @@ class KhazanahController extends Controller ]); return redirect()->route('khazanah.serahan'); - } public function kemaskiniPendahuluan(Request $request) //Daftar Pendahuluan kepada Kaunter @@ -1386,9 +1385,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; @@ -1500,8 +1496,6 @@ class KhazanahController extends Controller } - // } - $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $sumBaki=$GetLatestBakiTunai; @@ -2272,6 +2266,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/public/.DS_Store b/public/.DS_Store index 1b9b696..58e9ba1 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ diff --git a/public/img/loader.gif b/public/img/loader.gif new file mode 100644 index 0000000..c73bac1 Binary files /dev/null and b/public/img/loader.gif differ diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index b1eb289..1db168c 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -295,6 +295,15 @@ function serahankemaskini(data) { + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); + $.ajax({ type: 'get', url: "{{ route('periksa.alirantunai') }}", @@ -323,6 +332,15 @@ closeOnClickOutside: false }).then(function() { location.reload(); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); }); }else{ @@ -333,6 +351,15 @@ closeOnClickOutside: false }).then(function() { location.reload(); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); }); } } @@ -345,6 +372,15 @@ function periksaalirantunai() { + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); + $.ajax({ type: 'get', url: "{{ route('periksa.alirantunai') }}", @@ -357,6 +393,15 @@ text: 'Aliran tunai selari dengan sistem!' }).then(function() { location.reload(); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); }); }else{ @@ -371,6 +416,7 @@ "penebusan" : balasbalik['penebusan'] }, success: function(balas){ + if(balas == 'berjaya') { Swal.fire({ @@ -380,6 +426,15 @@ closeOnClickOutside: false }).then(function() { location.reload(); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); }); }else{ @@ -390,6 +445,15 @@ closeOnClickOutside: false }).then(function() { location.reload(); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); }); } 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 b150a4e..c55494e 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 }); @@ -487,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..' + }); } } - }); - - + }); } @@ -801,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(); @@ -846,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); - } - }); } } } @@ -1494,14 +1551,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/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 44da7f9..26e754b 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -272,6 +272,13 @@ 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 34cb0d3..91d4a77 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');