diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2eb6c2c..ac78a64 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2333,4 +2333,21 @@ class KhazanahController extends Controller } + + public function RequestPembatalan(Request $request) + { + $kodcaw = $request->kodcaw; + $nombor = $request->no; + $kodlaluan = $request->kodlaluan; + + $updatebatal=Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[ + 'no'=>$nombor, + 'kodlaluan'=>$kodlaluan + ]); + + event(new PendahuluanSerahan("Batal")); + + return response('Berjaya'); + } + } \ No newline at end of file diff --git a/public/js/main.js b/public/js/main.js index 4ded3c4..558d766 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -336,15 +336,26 @@ async function openuptambahdanserah(e) var channel = pusher.subscribe('pendahuluanserahan-notice'); channel.bind('penserahan-event', function(data) { - // let message = JSON.stringify(data); - Swal.fire({ - icon: 'success', - title: 'Tambah Pendahuluan', - text: 'Tambah Pendahuluan berjaya dipohon!' - }).then(function(){ - location.reload(); - }); + if(data == 'Lulus') + { + Swal.fire({ + icon: 'success', + title: 'Tambah Pendahuluan', + text: 'Tambah Pendahuluan berjaya dipohon!' + }).then(function(){ + location.reload(); + }); + }else{ + Swal.fire({ + icon: 'error', + title: 'Tambah Pendahuluan', + text: 'Tambah Pendahuluan tidak diluluskan!' + }).then(function(){ + location.reload(); + }); + } + }); @@ -486,14 +497,26 @@ function tambahdanserahanfunc(e) var channel = pusher.subscribe('pendahuluanserahan-notice'); channel.bind('penserahan-event', function(data) { // let message = JSON.stringify(data); - - Swal.fire({ - icon: 'success', - title: 'Serahan Modal', - text: 'Serahan modal berjaya dipohon!' - }).then(function(){ - location.reload(); - }); + + if(data == 'Lulus') + { + Swal.fire({ + icon: 'success', + title: 'Serahan Modal', + text: 'Serahan modal berjaya dipohon!' + }).then(function(){ + location.reload(); + }); + }else{ + Swal.fire({ + icon: 'error', + title: 'Serahan Modal', + text: 'Serahan modal tidak diluluskan!' + }).then(function(){ + location.reload(); + }); + } + }); diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 0f79a2f..c9bf508 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -242,62 +242,62 @@ $.each(data, function(key,val) { - $('#bundle1').val(val.bd1); - $('#totalb1').val(val.b1); + $('#bundle1').val(parseFloat(val.bd1).toFixed(2)); + $('#totalb1').val(parseFloat(val.b1).toFixed(2)); - $('#bundle20').val(val.bd20); - $('#totalb20').val(val.b20); + $('#bundle20').val(parseFloat(val.bd20).toFixed(2)); + $('#totalb20').val(parseFloat(val.b20).toFixed(2)); - $('#bundle5').val(val.bd5); - $('#totalb5').val(val.b5); + $('#bundle5').val(parseFloat(val.bd5).toFixed(2)); + $('#totalb5').val(parseFloat(val.b5).toFixed(2)); - $('#bundle50').val(val.bd50); - $('#totalb50').val(val.b50); + $('#bundle50').val(parseFloat(val.bd50).toFixed(2)); + $('#totalb50').val(parseFloat(val.b50).toFixed(2)); - $('#bundle10').val(val.bd10); - $('#totalb10').val(val.b10); + $('#bundle10').val(parseFloat(val.bd10).toFixed(2)); + $('#totalb10').val(parseFloat(val.b10).toFixed(2)); - $('#bundle100').val(val.bd100); - $('#totalb100').val(val.b100); + $('#bundle100').val(parseFloat(val.bd100).toFixed(2)); + $('#totalb100').val(parseFloat(val.b100).toFixed(2)); - $('#sen1').val(val.txtsen1); - $('#totalsen1').val(val.k01); + $('#sen1').val(parseFloat(val.txtsen1).toFixed(2)); + $('#totalsen1').val(parseFloat(val.k01).toFixed(2)); - $('#sen5').val(val.txtsen5); - $('#totalsen5').val(val.k05); + $('#sen5').val(parseFloat(val.txtsen5).toFixed(2)); + $('#totalsen5').val(parseFloat(val.k05).toFixed(2)); - $('#sen10').val(val.txtsen10); - $('#totalsen10').val(val.k010); + $('#sen10').val(parseFloat(val.txtsen10).toFixed(2)); + $('#totalsen10').val(parseFloat(val.k010).toFixed(2)); - $('#sen20').val(val.txtsen20); - $('#totalsen20').val(val.k020); + $('#sen20').val(parseFloat(val.txtsen20).toFixed(2)); + $('#totalsen20').val(parseFloat(val.k020).toFixed(2)); - $('#sen50').val(val.txtsen50); - $('#totalsen50').val(val.k050); + $('#sen50').val(parseFloat(val.txtsen50).toFixed(2)); + $('#totalsen50').val(parseFloat(val.k050).toFixed(2)); - $('#ringgit1').val(val.txtring1); - $('#totalring1').val(val.k1); + $('#ringgit1').val(parseFloat(val.txtring1).toFixed(2)); + $('#totalring1').val(parseFloat(val.k1).toFixed(2)); - $('#ringgit5').val(val.txtring5); - $('#totalring5').val(val.k5); + $('#ringgit5').val(parseFloat(val.txtring5).toFixed(2)); + $('#totalring5').val(parseFloat(val.k5).toFixed(2)); - $('#ringgit10').val(val.txtring10); - $('#totalring10').val(val.k10); + $('#ringgit10').val(parseFloat(val.txtring10).toFixed(2)); + $('#totalring10').val(parseFloat(val.k10).toFixed(2)); - $('#ringgit20').val(val.txtring20); - $('#totalring20').val(val.k20); + $('#ringgit20').val(parseFloat(val.txtring20).toFixed(2)); + $('#totalring20').val(parseFloat(val.k20).toFixed(2)); - $('#ringgit50').val(val.txtring50); - $('#totalring50').val(val.k50); + $('#ringgit50').val(parseFloat(val.txtring50).toFixed(2)); + $('#totalring50').val(parseFloat(val.k50).toFixed(2)); - $('#ringgit100').val(val.txtring100); - $('#totalring100').val(val.k100); + $('#ringgit100').val(parseFloat(val.txtring100).toFixed(2)); + $('#totalring100').val(parseFloat(val.k100).toFixed(2)); - $('#amaunkeping').val(val.jumlahkeping); - $('#amaunbundle').val(val.jumlahbundle); - $('#amaunkeseluruhan').val(val.txtjumlah); + $('#amaunkeping').val(parseFloat(val.jumlahkeping).toFixed(2)); + $('#amaunbundle').val(parseFloat(val.jumlahbundle).toFixed(2)); + $('#amaunkeseluruhan').val(parseFloat(val.txtjumlah).toFixed(2)); diff --git a/resources/views/khazanah/pendahuluan.blade.php b/resources/views/khazanah/pendahuluan.blade.php index 2d3613e..37ed8f9 100644 --- a/resources/views/khazanah/pendahuluan.blade.php +++ b/resources/views/khazanah/pendahuluan.blade.php @@ -39,9 +39,9 @@ -
+ {{--
-
+
--}} @@ -144,10 +144,6 @@ }); } getData(); - // setInterval(function () { - // getData(); - // }, 10000); - }); var tablependahuluan = $('#table-pendahuluan').DataTable({ @@ -158,6 +154,74 @@ minimumFractionDigits: 2 }); + $('#tarikhmula').change(function(){ + + var input_date = this.value; + var split_date = input_date.split('-'); + var tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + let tarikhhingga = $('#tarikhhingga').val(); + + if(tarikhhingga == '') + { + var current = new Date(); + var current_date = current.getDate(); + var current_month = current.getMonth()+1; + var current_year = current.getFullYear(); + var today_date = current_year + '-' +current_month+'-'+current_date; + + tarikhhingga = today_date; + + }else{ + var input_hingga = tarikhhingga; + var split_date = input_hingga.split('-'); + tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + } + + $.ajax({ + method:'get', + url: api_url + '/api/requestTeller/get/' + kodcaw + '/date', + data: { + 'mula' : tarikhmula, + 'hingga' : tarikhhingga + }, + success: function(data){ + gettable(data); + } + }); + }); + + $('#tarikhhingga').change(function(){ + + var input_date = this.value; + var split_date = input_date.split('-'); + var tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + let tarikhmula = $('#tarikhmula').val(); + + if(tarikhmula == '') + { + tarikhmula = '2018-01-01'; + }else{ + var input_mula = tarikhmula; + var split_date = input_mula.split('-'); + tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + } + + $.ajax({ + method:'get', + url: api_url + '/api/requestTeller/get/' + kodcaw + '/date', + data: { + 'mula' : tarikhmula, + 'hingga' : tarikhhingga + }, + success: function(data){ + gettable(data); + } + }); + }); + + function gettable(datala) { var counter = 1; @@ -178,7 +242,7 @@ 'RM ' + formatter.format(arr['modal']), 'RM ' + formatter.format(arr['serahan']), arr['tarikh'], - arr['tarikh'], + arr['masa'], '' ]).draw(); counter = counter + 1; diff --git a/resources/views/khazanah/pendahuluanserah.blade.php b/resources/views/khazanah/pendahuluanserah.blade.php index 2e3f9ef..173cd81 100644 --- a/resources/views/khazanah/pendahuluanserah.blade.php +++ b/resources/views/khazanah/pendahuluanserah.blade.php @@ -20,7 +20,7 @@
Teller ID
- +
Amaun (RM)
@@ -36,17 +36,17 @@
- Batal + Batal

-
+

Wang Bundle Dari Peti Besi

@@ -74,31 +74,31 @@ - + - + - + - + - + - +
RM1 RM20
RM5 RM50
RM10 RM100
@@ -116,7 +116,7 @@
-
+

Wang Keping Dari Peti Besi

@@ -311,6 +311,7 @@ let teller = $('#teller').val(); let kodcaw = "{{ Auth::user()->cawangan }}"; let notasebenar = ''; + $.ajax({ method: 'get', @@ -347,6 +348,27 @@ $('#form-pendahuluan').trigger('submit'); } + function triggerbatal() + { + let nom = $('#no').val(); + let teller = $('#teller').val(); + let kodcaw = "{{ Auth::user()->cawangan }}"; + + + $.ajax({ + method: 'get', + url: "{{ route('request.pembatalan') }}", + data:{ + 'kodcaw' : kodcaw, + 'no' : nom, + 'kodlaluan' : teller + }, + success:function(data){ + window.location.href = "{{ route('khazanah.pendahulu') }}"; + } + }); +} + function validateamaun() { diff --git a/resources/views/khazanah/serahan.blade.php b/resources/views/khazanah/serahan.blade.php index e119364..bcdb7fd 100644 --- a/resources/views/khazanah/serahan.blade.php +++ b/resources/views/khazanah/serahan.blade.php @@ -20,6 +20,31 @@ +
+
+
+
+ Tarikh Mula +
+ +
+
+ +
+
+
+ Tarikh Hingga +
+ +
+
+ + {{--
+ +
--}} + +
+
@@ -105,6 +130,14 @@ var kodcaw = "{{ Auth::user()->cawangan }}"; $(document).ready(function(){ + + $('#tarikhmula').datepicker({ + format: 'dd-mm-yyyy' + }); + $('#tarikhhingga').datepicker({ + format: 'dd-mm-yyyy' + }); + function getData(){ $.ajax({ type: 'get', @@ -115,9 +148,9 @@ }); } getData(); - setInterval(function () { - getData(); - }, 10000); + // setInterval(function () { + // getData(); + // }, 10000); }); @@ -125,6 +158,73 @@ var tableserahan = $('#table-serahan').DataTable({ "scrollX": true }); + $('#tarikhmula').change(function(){ + + var input_date = this.value; + var split_date = input_date.split('-'); + var tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + let tarikhhingga = $('#tarikhhingga').val(); + + if(tarikhhingga == '') + { + var current = new Date(); + var current_date = current.getDate(); + var current_month = current.getMonth()+1; + var current_year = current.getFullYear(); + var today_date = current_year + '-' +current_month+'-'+current_date; + + tarikhhingga = today_date; + + }else{ + var input_hingga = tarikhhingga; + var split_date = input_hingga.split('-'); + tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + } + + $.ajax({ + method:'get', + url: api_url + '/api/requestTeller/get/' + kodcaw + '/date', + data: { + 'mula' : tarikhmula, + 'hingga' : tarikhhingga + }, + success: function(data){ + gettable(data); + } + }); + }); + +$('#tarikhhingga').change(function(){ + + var input_date = this.value; + var split_date = input_date.split('-'); + var tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + + let tarikhmula = $('#tarikhmula').val(); + + if(tarikhmula == '') + { + tarikhmula = '2018-01-01'; + }else{ + var input_mula = tarikhmula; + var split_date = input_mula.split('-'); + tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; + } + + $.ajax({ + method:'get', + url: api_url + '/api/requestTeller/get/' + kodcaw + '/date', + data: { + 'mula' : tarikhmula, + 'hingga' : tarikhhingga + }, + success: function(data){ + gettable(data); + } + }); +}); + function gettable(datala) { var counter = 1; @@ -145,6 +245,7 @@ function gettable(datala) 'RM ' + arr['modal'], 'RM ' + arr['serahan'], arr['tarikh'], + arr['masa'], '' ]).draw(); counter = counter + 1; diff --git a/routes/web.php b/routes/web.php index 4e802a5..def71f8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -122,6 +122,9 @@ Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahan Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']); +//Request Teller Batal Route +Route::get('/requestbatal',['as'=>'request.pembatalan','uses'=>'KhazanahController@RequestPembatalan'])->middleware('auth','khazanah'); + //Added Yang Baru Route::post('/barcodescannedtebus',['as'=>'barcodetebus.scanned','uses'=>'KhazanahController@barcodescannedtebus'])->middleware('auth','khazanah'); Route::get('/pendahuluanserah/{id}',['as'=>'pendahuluan.serah','uses'=>'KhazanahController@pendahuluanserah'])->middleware('auth','khazanah');