diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index fb2bfb2..6a0059d 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -112,7 +112,13 @@ class KelulusanController extends Controller public function download(Request $request) { - - return Storage::download('public/kelulusanpb/'.$request->image); + $download = Http::get(config('api.url').'/admin/permohonan/viewfiles',[ + 'files_id' => $request->files_id + ])->json(); + + return response(base64_decode($download['data']), 200, [ + 'Content-type' => 'application/' . $download['type'], + 'Content-Disposition' => 'inline; filename='.$download['filename'] + ]); } } diff --git a/resources/js/Permohonan/StatusMohon.vue b/resources/js/Permohonan/StatusMohon.vue index 75d449a..66c0ace 100644 --- a/resources/js/Permohonan/StatusMohon.vue +++ b/resources/js/Permohonan/StatusMohon.vue @@ -267,11 +267,23 @@

{{ status.description }}
{{ 'JUMLAH DILULUSKAN : RM ' + formatterfunction(status[0].jumlah_diluluskan) }} +
+

-

- {{ status.description }}
{{ 'JENIS BANK : ' + status[0].jenisbank }}
{{ 'NO RESIT :' + status[0].noresit }} -

+
+ {{ status.description }} +
+
+ {{ 'JENIS BANK : ' + status[0].jenisbank }} + {{ 'JENIS CIT : ' + status[0].jeniscit }} +
+
+
+ {{ 'NO RESIT :' + status[0].noresit }} + {{ 'NAMA SYARIKAT :' + status[0].namasyarikat }} +
+

{{ status.description }}
{{ 'NAMA PENERIMA : ' + status[0].nama_penerima }} @@ -282,7 +294,10 @@

- {{ status.description }}
{{ 'JENIS BANK : ' + status[0].jenisbank }} + {{ status.description }}
{{ 'JENIS BANK : ' + status[0].jenisbank }} +
+ +

@@ -457,6 +472,15 @@ export default { formatterfunction(value) { return formatter.format(value) }, + downloadresit(resitid) { + window.open('/api/check/muatturun?files_id=' + resitid, '_blank'); + }, + downloadinvoice(invoiceid) { + window.open('/api/check/muatturun?files_id=' + invoiceid, '_blank'); + }, + downloadpb(pbid) { + window.open('/api/check/muatturun?files_id=' + pbid, '_blank'); + } } } diff --git a/routes/web.php b/routes/web.php index 14b3e0b..c9e1b01 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,14 +16,6 @@ use Illuminate\Support\Facades\Http; Route::get('/iframe', function () { - $cawangan=Http::get(config('api.url').'/admin/permohonan/viewfiles',[ - 'files_id' => 1 - ])->json(); - - return response(base64_decode($cawangan['data']), 200, [ - 'Content-type' => 'application/' . $cawangan['type'], - 'Content-Disposition' => 'inline; filename='.$cawangan['filename'] - ]); });