diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index bac5657..fb2bfb2 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -87,14 +87,19 @@ class KelulusanController extends Controller public function updatePB(Request $request) { $imageName = time().'.'.$request->image->extension(); - - $request->image->move(public_path('storage\kelulusanpb'), $imageName); + $data = base64_encode($request->image->get()); + // $data = base64_encode(file_get_contents($request->file('image'))); - $updatelulus = Http::put(config('api.url') . '/admin/permohonan/updatepb',[ + // $request->image->move(public_path('storage\kelulusanpb'), $imageName); + + $updatelulus = Http::accept('application/'.$request->image->extension())->post(config('api.url') . '/admin/permohonan/updatepb',[ 'amaun_lulus' => $request->amaun_lulus, 'kelulusan' => $request->kelulusan, - 'kelulusanpbimage' => $imageName, + // 'kelulusanpbimage' => $imageName, 'komen' => '', + 'dataimage' => $data, + 'imagename' => $imageName, + 'imagetype' => $request->image->extension(), 'mohonid' => $request->mohonid ])->json(); @@ -107,6 +112,7 @@ class KelulusanController extends Controller public function download(Request $request) { + return Storage::download('public/kelulusanpb/'.$request->image); } } diff --git a/resources/js/Kelulusan/TableKelulusan.vue b/resources/js/Kelulusan/TableKelulusan.vue index c5f3889..cb63ced 100644 --- a/resources/js/Kelulusan/TableKelulusan.vue +++ b/resources/js/Kelulusan/TableKelulusan.vue @@ -116,9 +116,10 @@ export default { cancelButtonText: 'Batal', allowOutsideClick: false }) - - await this.axios.post('/mintasemulakelulusan', { + await this.axios.get('/mintasemulakelulusan', { + params: { passsemula: katalaluan + } }).then(response => { if (response.data === 0) { boolkatalaluan = 0; @@ -177,8 +178,10 @@ export default { allowOutsideClick: false }) - await this.axios.post('/mintasemulakelulusan', { + await this.axios.get('/mintasemulakelulusan', { + params: { passsemula: katalaluan + } }).then(response => { if (response.data === 0) { boolkatalaluan = 0; @@ -188,9 +191,8 @@ export default { }); if (boolkatalaluan == 1) { - const { - value: komen - } = await this.$swal({ + + await this.$swal({ title: 'Masukkan Komen', input: 'text', inputPlaceholder: 'Komen', @@ -198,18 +200,29 @@ export default { showCancelButton: true, cancelButtonText: 'Batal', allowOutsideClick: false + }).then((result) => { + + if (result.isConfirmed) { + + return this.axios.post('/api/check/kelulusan/operasi', { + norujukan: noruj, + komenkelulusan: result.value, + kodcaw: kcaw, + namaoperasi: this.$attrs['namaoperasi'], + teller: tel, + siri: sir, + pembatalan: "batal" + }).then((response) =>{ + if(response.data == 1) + { + this.getKelulusanList(1) + } + }); + + } else if (result.isDenied) { + Swal.fire('Changes are not saved', '', 'info') + } }) - - return this.axios.post('/api/check/kelulusan/operasi', { - norujukan: noruj, - komenkelulusan: komen, - kodcaw: kcaw, - namaoperasi: this.$attrs['namaoperasi'], - teller: tel, - siri: sir, - pembatalan: "batal" - }); - } }, diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue index d32e83a..7e6c414 100644 --- a/resources/js/Permohonan/SenaraiMohon.vue +++ b/resources/js/Permohonan/SenaraiMohon.vue @@ -469,7 +469,7 @@ export default { }) if (katalaluan !== undefined) - await this.axios.get('/mintasemulakelulusan', { + await this.axios.post('/mintasemulakelulusan', { params: { passsemula: katalaluan } diff --git a/resources/js/components/util/Bankmodal.vue b/resources/js/components/util/Bankmodal.vue index 6d42932..35ba1a9 100644 --- a/resources/js/components/util/Bankmodal.vue +++ b/resources/js/components/util/Bankmodal.vue @@ -32,6 +32,20 @@
Field is required
+ + + + + + +
Field is required
@@ -79,7 +93,9 @@ export default { showModal: false, mohonid: 0, selectedbank: 'Sila Pilih Bank', + selectedjeniscit: 'Sila Pilih Jenis Transfer', noresit: 0, + namacit: '', jenisbank: {} } }, @@ -101,6 +117,8 @@ export default { kelulusan: 'Lulus', jenisbank: this.selectedbank, noresit: this.noresit, + namacit: this.namacit, + jeniscit: this.selectedjeniscit, mohonid: this.mohonid }).then(response => { @@ -117,16 +135,20 @@ export default { }); } }, - validations: { - selectedbank: { - required, - minLength: minLength(4) - }, - noresit: { - required, - minLength: minLength(4) - } + validations: { + selectedbank: { + required + }, + noresit: { + required + }, + namacit: { + required + }, + selectedjeniscit: { + required } + } } diff --git a/routes/web.php b/routes/web.php index c31a70e..f4c0dfa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,7 +97,7 @@ Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'App\H Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'App\Http\Controllers\ResitController@resitautotawarruq']); //Katalaluan -Route::post('/mintasemulakelulusan','App\Http\Controllers\PermohonanController@MintaKelulusan'); +Route::get('/mintasemulakelulusan','App\Http\Controllers\PermohonanController@MintaKelulusan'); //Permohonan Wang Route::get('/permohonan',['as'=>'permohonan.index','uses'=>'App\Http\Controllers\PermohonanController@index']);