From c15a341f466f7544f55d1073dbe0c7e9e37a7911 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Mon, 25 Jul 2022 10:24:17 +0800
Subject: [PATCH] fix permohonan

---
 resources/js/Permohonan/SenaraiMohon.vue      |  6 +-
 resources/js/Permohonan/StatusMohon.vue       | 38 ++++++----
 .../views/permohonan/cetakanfull.blade.php    | 74 ++++++++++---------
 3 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index 361151f..24424a7 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -424,7 +424,7 @@ const formatter = new Intl.NumberFormat('en-US', {
 const toBase64 = file => new Promise((resolve, reject) => {
     const reader = new FileReader();
     reader.readAsDataURL(file);
-    reader.onload = () => resolve(reader.result);
+    reader.onload = () => resolve(reader.result.split(',')[1]);
     reader.onerror = error => reject(error);
 });
 
@@ -644,7 +644,7 @@ export default {
                                 imagetype = file.name.split('.').pop();
 
                                 if (this.userroles === "operasi") {
-                                    imagename = 'TagOperasi_' + time + file.name.split('.').pop();
+                                    imagename = 'TagOperasi_' + time + '.' + file.name.split('.').pop();
                                     this.axios.put(this.$hostname + '/admin/permohonan/updateoperasi', {
                                         kelulusan: 'Lulus',
                                         mohonid: mohonid,
@@ -676,7 +676,7 @@ export default {
                                         }
                                     });
                                 } else if (this.userroles === 'akaun') {
-                                    imagename = 'TagAkaun_' + time + file.name.split('.').pop();
+                                    imagename = 'TagAkaun_' + time + '.' + file.name.split('.').pop();
                                     this.axios.put(this.$hostname + '/admin/permohonan/updateakaun', {
                                         kelulusan: 'Lulus',
                                         mohonid: mohonid,
diff --git a/resources/js/Permohonan/StatusMohon.vue b/resources/js/Permohonan/StatusMohon.vue
index 9d629e2..56ff500 100644
--- a/resources/js/Permohonan/StatusMohon.vue
+++ b/resources/js/Permohonan/StatusMohon.vue
@@ -246,23 +246,26 @@
 
                                 <div class="ml-3">
 
-                                    <p v-if="status.statusid === 1" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_pemohon)  }}
-                                    </p>
+                                    <div v-if="status.statusid === 1" class="text-gray-900 whitespace-no-wrap flex justify-between">
+                                        <div>{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_pemohon)  }}<br></div>
+                                        <div><button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" @click.prevent="downloadpermohonan(status[0].permohonanfiles_id)">Cetak</button></div>
+                                    </div>
 
-                                    <p v-if="status.statusid === 2" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_operasi)  }}
-                                    </p>
+                                    <div v-if="status.statusid === 2" class="text-gray-900 whitespace-no-wrap flex justify-between">
+                                        <div>{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_operasi)  }}</div>
+                                        <div><button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" @click.prevent="downloadkeloperasi(status[0].operasifiles_id)">Cetak</button></div>
+                                    </div>
 
-                                    <p v-if="status.statusid === 3" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_akaun)  }}
-                                    </p>
+                                    <div v-if="status.statusid === 3" class="text-gray-900 whitespace-no-wrap flex justify-between">
+                                        <div>{{ status.description }} <br> {{ 'Nama : ' + pembesarannama(status[0].nama_akaun)  }}</div>
+                                        <div><button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded" @click.prevent="downloadkelakaun(status[0].akaunfiles_id)">Cetak</button></div>
+                                    </div>
 
-                                    <p v-if="status.statusid === 4" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br> <b> {{ 'Jumlah Diluluskan : RM ' + formatterfunction(status[0].jumlah_diluluskan)  }} </b>
+                                    <div v-if="status.statusid === 4" class="text-gray-900 whitespace-no-wrap">
+                                        <div>{{ status.description }} <br> <b> {{ 'Jumlah Diluluskan : RM ' + formatterfunction(status[0].jumlah_diluluskan)  }} </b></div>
                                         <br>
-                                        <button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadpb(status[0].pbfiles)">Muat Turun</button>
-                                    </p>
+                                        <div><button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadpb(status[0].pbfiles)">Cetak</button></div>
+                                    </div>
 
                                     <div v-if="status.statusid === 5" class="text-gray-900 whitespace-no-wrap">
                                         {{ status.description }}
@@ -475,6 +478,15 @@ export default {
         downloadpb(pbid) {
             window.open('/api/check/muatturun?files_id=' + pbid, '_blank');
         },
+        downloadpermohonan(perid) {
+            window.open('/api/check/muatturun?files_id=' + perid, '_blank');
+        },
+        downloadkeloperasi(kelopid) {
+            window.open('/api/check/muatturun?files_id=' + kelopid, '_blank');
+        },
+        downloadkelakaun(kelakid) {
+            window.open('/api/check/muatturun?files_id=' + kelakid, '_blank');
+        },
         pembesarannama(value) {
             const str = value.toLowerCase().replace(/\b[a-z]/g, function (response) {
                 return response.toUpperCase();
diff --git a/resources/views/permohonan/cetakanfull.blade.php b/resources/views/permohonan/cetakanfull.blade.php
index a81ded6..5dc7dd1 100644
--- a/resources/views/permohonan/cetakanfull.blade.php
+++ b/resources/views/permohonan/cetakanfull.blade.php
@@ -27,7 +27,7 @@
 </head>
 <body class="p-2">
 
-    <div class="mb-10">
+    <div class="mb-2">
         <div class="w-full flex flex-col justify-end items-end text-right">
             
             <div class="ml-2">
@@ -36,13 +36,15 @@
                 <p class="text-xs">{{ $cawangan_detail['alamat1'] }}</p>
                 <p class="text-xs">{{ $cawangan_detail['alamat2'] }}</p>
             
-                <p class="text-xs">No Tel : {{ $cawangan_detail['notel'] }}</p>
+                <div class="flex justify-end">
+                <p class="text-xs mr-2">No Tel : {{ $cawangan_detail['notel'] }}</p>
                 <p class="text-xs">No Faks : {{ $cawangan_detail['nofaks'] }}</p>
+                </div>
             </div>
         </div>
 
     </div>
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
             <b class="text-xs border border-black pl-1">Kepada</b>
             <p class="text-xs">
@@ -63,7 +65,7 @@
         </div>
     </div>
 
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
             <b class="text-xs border border-black pl-1">Daripada</b>
             <p class="text-xs">{{ ($permohonan['jawatan_pemohon'] == 'pc') ? 'Pengurus Cawangan' : 'Pen. Peng. Cawangan' }} {{ $cawangan_detail['namacaw'] }}</p>
@@ -78,7 +80,7 @@
         </div>
     </div>
 
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-full flex flex-col">
             <b class="text-xs border border-black pl-1 text-center bg-gray-300 font-bold"> PENYEDIA PERMOHONAN</b>
         </div>
@@ -88,10 +90,10 @@
     <div class="flex mb-2">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
             <b class="text-xs border border-black pl-1">Disediakan oleh</b>
-            <p class="h-14"></p>
+            <p class="h-8"></p>
             <div class="flex">
                 {{-- <div class="w-2/3"></div> --}}
-                <p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p>
+                {{-- <p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p> --}}
             </div>
             <div class="flex">
                 <div class="w-2/3"></div>
@@ -116,13 +118,13 @@
 
     </div>
 
-    <div class="flex mb-3">
+    <div class="flex mb-2">
         <div class="ml-2 w-full flex flex-col">
             <b class="text-xs border border-black pl-1 text-center bg-gray-300 font-bold">PERMOHONAN PENDAHULUAN / SERAHAN WANG PETI BESI</b>
         </div>
     </div>
 
-    <div class="flex mb-2">
+    <div class="flex mb-1">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
             <b class="text-xs border border-black pl-1">PERMOHONAN PENDAHULUAN WANG PETI BESI</b>
             @if($permohonan['jenismohon'] === 'permohonanwang')
@@ -180,13 +182,13 @@
                     </p>
                 </div>
 
-                <div class="mt-2 flex mb-3">
+                <div class="mt-2 flex mb-2">
                 <div class="w-full flex flex-col justify-end">
-                    <b class="text-xs border border-black pl-1">Disediakan oleh</b>
-                    <p class="h-14"></p>
+                    <b class="text-xs border border-black pl-1">Disahkan oleh</b>
+                    <p class="h-8"></p>
                     <div class="flex">
                         {{-- <div class="w-2/3"></div> --}}
-                        <p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p>
+                        {{-- <p class="text-xs w-full text-right italic text-black">{{ $permohonan['nama_pemohon'] }}</p> --}}
                     </div>
                     <div class="flex">
                         <div class="w-2/3"></div>
@@ -246,20 +248,20 @@
                 </div>
 
                 <div>
-                    <div>
-                        <label class="inline-flex items-center">
+                    <div class="mb--1">
+                        <label class="flex items-center">
                           <input type="checkbox" class="form-checkbox h-4 w-4">
                           <span class="text-xs ml-1">Terminal</span>
                         </label>
                     </div>
-                    <div>
-                        <label class="inline-flex items-center">
+                    <div class="mb--1">
+                        <label class="flex items-center">
                           <input type="checkbox" class="form-checkbox h-4 w-4">
                           <span class="text-xs ml-1">Bank In</span>
                         </label>
                     </div>
-                    <div>
-                        <label class="inline-flex items-center">
+                    <div class="mb--1">
+                        <label class="flex items-center">
                           <input type="checkbox" class="form-checkbox h-4 w-4">
                           <span class="text-xs ml-1">Cash In Transit (CIT)</span>
                         </label>
@@ -288,7 +290,7 @@
         </div>
     </div>
 
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-full flex flex-col">
             <b class="text-xs border border-black pl-1 text-center bg-gray-300 font-bold">PENGESAHAN BAHAGIAN OPERASI AR-RAHN</b>
         </div>
@@ -302,9 +304,9 @@
         <div class="ml-2 w-1/2 flex flex-col">
             <b class="text-xs border border-black pl-1">Disahkan oleh</b>
             
-            <p class="h-14"></p>
+            <p class="h-8"></p>
             <div class="flex">
-                <p class="text-xs w-full text-right italic">{{ $permohonan['nama_operasi'] }}</p>
+                {{-- <p class="text-xs w-full text-right italic">{{ $permohonan['nama_operasi'] }}</p> --}}
             </div>
             <div class="flex">
                 <div class="w-2/3"></div>
@@ -341,17 +343,17 @@
     </div>
 
     <div class="flex">
-        <p class="text-xs mt-5 w-2/4">Diluluskan pengeluaran wang kepada Ar-Rahn sebanyak RM</p>
-        <p class="text-xs mt-5 w-1/3">{{ ($permohonan['jumlah_diluluskan'] !== null) ? number_format($permohonan['jumlah_diluluskan'],2) : ''  }} </p>
+        <p class="text-xs mt-2 w-2/4">Diluluskan pengeluaran wang kepada Ar-Rahn sebanyak RM</p>
+        <p class="text-xs mt-2 w-1/3">{{ ($permohonan['jumlah_diluluskan'] !== null) ? number_format($permohonan['jumlah_diluluskan'],2) : ''  }} </p>
     </div>
 
     <div class="flex">
         <p class="text-xs w-2/3">{{ ($ringgittext !== '') ? '(Ringgit Malaysia:' . $ringgittext . ' Sahaja)' : '' }}</p>
     </div>
 
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
-            <p class="h-20"></p>
+            <p class="h-8"></p>
             <div class="flex">
                 <div class="w-2/3"></div>
             <div class="text-right border-t border-gray-300 w-1/3"></div>
@@ -372,17 +374,17 @@
             </div>
 
             <div class="block">
-                <span class="text-gray-700 font-bold">Kaedah Penghantaran:</span>
-                <div>
-                  <div>
-                    <label class="inline-flex items-center">
-                      <input type="checkbox" class="form-checkbox" checked>
+                <span class="text-black font-bold text-xs">Kaedah Penghantaran:</span>
+                <div class="flex ">
+                  <div class="mb--1 flex">
+                    <label class="flex items-center">
+                      <input type="checkbox" class="form-checkbox h-4 w-4" checked>
                       <span class="text-xs ml-2">Cash In Transit (CIT)</span>
                     </label>
                   </div>
-                  <div>
-                    <label class="inline-flex items-center">
-                      <input type="checkbox" class="form-checkbox">
+                  <div class="mb--1">
+                    <label class="flex items-center">
+                      <input type="checkbox" class="form-checkbox h-4 w-4">
                       <span class="text-xs ml-2">Telegrafic Transfer (TT)</span>
                     </label>
                   </div>
@@ -393,7 +395,7 @@
 
         <div class="ml-2 w-1/2 flex flex-col">
             
-            <p class="h-20"></p>
+            <p class="h-8"></p>
             <div class="flex">
                 <div class="w-2/3"></div>
             <div class="text-right border-t border-gray-300 w-1/3"></div>
@@ -427,7 +429,7 @@
         </div>
     </div>
 
-    <div class="flex mb-6">
+    <div class="flex mb-2">
         <div class="ml-2 w-1/2 flex flex-col justify-end">
             <b class="text-xs border border-black pl-1 text-center">PENERIMA WANG</b>
             <b class="text-xs border border-black pl-1 text-center">Wakil Ar-Rahn</b>