From 265ac073e30a1ab156db161eb7d45439b581480a Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Wed, 1 Jun 2022 11:01:37 +0800
Subject: [PATCH] fix

---
 resources/js/Permohonan/RekodMohon.vue   |  2 +-
 resources/js/Permohonan/SenaraiMohon.vue | 28 ++++++++++++++++--
 resources/js/Permohonan/StatusMohon.vue  | 36 ++++++++++++++----------
 resources/js/app.js                      |  6 ++--
 resources/js/components/Cawangan.vue     |  4 +--
 5 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/resources/js/Permohonan/RekodMohon.vue b/resources/js/Permohonan/RekodMohon.vue
index e3a3f9d..7288fac 100644
--- a/resources/js/Permohonan/RekodMohon.vue
+++ b/resources/js/Permohonan/RekodMohon.vue
@@ -5,7 +5,7 @@
     <bankmodal ref="bankmodal" @clickEvent_="getSenaraiMohon"></bankmodal>
 
     <router-link to="/permohonan">
-        <i class="fas fa-backspace text-yellow-500"></i>
+        <i class="fas fa-backspace fa-3x text-yellow-500"></i>
     </router-link>
 
     <div class="mx-auto flex justify-between mb-4">
diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue
index 1d3ad97..c7fa3c2 100644
--- a/resources/js/Permohonan/SenaraiMohon.vue
+++ b/resources/js/Permohonan/SenaraiMohon.vue
@@ -28,7 +28,13 @@
 
                 <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
 
-                    PetiBesi (RM)
+                    Baki Peti Besi (RM)
+
+                </th>
+
+                <th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
+
+                    Outstanding (RM)
 
                 </th>
 
@@ -115,6 +121,22 @@
 
                 </td>
 
+                <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
+
+                    <div class="flex items-center">
+
+                        <div class="ml-3">
+
+                            <p class="text-gray-900 whitespace-no-wrap" v-text="formatterfunction(mohon.outstanding)">
+
+                            </p>
+
+                        </div>
+
+                    </div>
+
+                </td>
+
                 <td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
 
                     <div class="flex items-center">
@@ -271,7 +293,7 @@
 
                             <p class="text-white whitespace-no-wrap p-2 rounded bg-green-500">
 
-                                Telah Lulus
+                                Telah disahkan
 
                             </p>
 
@@ -283,7 +305,7 @@
 
                         <div v-if="mohon.tagoperasi === 0">
                             <p class="text-white whitespace-no-wrap p-2 rounded bg-blue-500">
-                                DALAM PROCESS
+                                DALAM PROSES
                             </p>
                         </div>
 
diff --git a/resources/js/Permohonan/StatusMohon.vue b/resources/js/Permohonan/StatusMohon.vue
index 9f18c5d..3a155b3 100644
--- a/resources/js/Permohonan/StatusMohon.vue
+++ b/resources/js/Permohonan/StatusMohon.vue
@@ -2,7 +2,7 @@
     <div class="container px-1 px-md-4 py-5 mx-auto">
     
     <router-link to="/permohonan">
-        <i class="fas fa-backspace text-yellow-500"></i>
+        <i class="fas fa-backspace fa-3x text-yellow-500"></i>
     </router-link>
 
         <div v-if="this.loadstatus == true" class="card">
@@ -13,7 +13,7 @@
                     <h5>JUMLAH MOHON : <span class="text-primary font-weight-bold">RM {{ formatterfunction(this.permohonan.amaun_mohon) }}</span></h5>
                 </div>
                 <div>
-                    <span class="text-white rounded font-weight-bold bg-green-500 p-3">{{ this.permohonan.jenismohon }}</span>
+                    <span class="text-black rounded font-extrabold">{{ (this.permohonan.jenismohon == 'permohonanwang') ? 'Permohonan Wang' : 'Bayaran Balik'  }}</span>
                 </div>                
             </div>
 
@@ -254,47 +254,46 @@
                                 <div class="ml-3">
     
                                     <p v-if="status.statusid === 1" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'NAMA PEMOHON : ' + status[0].nama_pemohon  }}
+                                        {{ status.description }} <br>  {{ 'Nama : ' + pembesarannama(status[0].nama_pemohon)  }}
                                     </p>
 
                                     <p v-if="status.statusid === 2" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'NAMA OPERASI : ' + status[0].nama_operasi  }}
+                                        {{ status.description }} <br>  {{ 'Nama : ' + pembesarannama(status[0].nama_operasi)  }}
                                     </p>
 
                                     <p v-if="status.statusid === 3" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'NAMA AKAUN : ' + status[0].nama_akaun  }}
+                                        {{ status.description }} <br>  {{ 'Nama : ' + pembesarannama(status[0].nama_akaun)  }}
                                     </p>
 
                                     <p v-if="status.statusid === 4" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'JUMLAH DILULUSKAN : RM ' + formatterfunction(status[0].jumlah_diluluskan)  }}
+                                        {{ status.description }} <br> <b> {{ 'Jumlah Diluluskan : RM ' + formatterfunction(status[0].jumlah_diluluskan)  }} </b>
                                         <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 v-if="status.statusid === 5" class="text-gray-900 whitespace-no-wrap">
+                                    <div v-if="status.statusid === 5" class="text-gray-900 whitespace-no-wrap w-full">
                                         {{ status.description }} 
                                         <br>
                                         <div class="w-full">
-                                        <span class="w-1/2">{{ 'JENIS BANK : ' + status[0].jenisbank  }}</span>
-                                        <span class="w-1/2">{{ 'JENIS CIT : ' + status[0].jeniscit  }}</span>
+                                            <span class="w-1/2">{{ 'Nama Bank : ' + status[0].jenisbank  }}</span>
+                                            <span class="w-1/2">{{ 'Kaedah Penghantaran : ' + status[0].jeniscit  }}</span>
                                         </div>
-                                        <br> 
                                         <div class="w-full">
-                                        <span class="w-1/2">{{ 'NO RESIT :' + status[0].noresit }}</span>
-                                        <span class="w-1/2">{{ 'NAMA SYARIKAT :' + status[0].namasyarikat }}</span>
+                                            <span class="w-1/2">{{ 'No Rujukan :' + status[0].noresit }}</span>
+                                            <span class="w-1/2">{{ 'Nota :' + status[0].namasyarikat }}</span>
                                         </div>
                                     </div>
 
                                     <p v-if="status.statusid === 6" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'NAMA PENERIMA : ' + status[0].nama_penerima  }}
+                                        {{ status.description }} <br>  {{ 'Nama : ' + pembesarannama(status[0].nama_penerima)  }}
                                     </p>
 
                                     <p v-if="status.statusid === 7" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'KOMEN : ' + status[0].komen  }}
+                                        {{ status.description }} <br>  {{ 'Komen : ' + status[0].komen  }}
                                     </p>
 
                                      <p v-if="status.statusid === 8" class="text-gray-900 whitespace-no-wrap">
-                                        {{ status.description }} <br>  {{ 'JENIS BANK : ' + status[0].jenisbank  }} 
+                                        {{ status.description }} <br>  {{ 'Nama Bank : ' + status[0].jenisbank  }} 
                                         <br>
                                          <button class="text-white p-2 bg-blue-500 rounded mr-1 mt-2" @click.prevent="downloadresit(status[0].resitfiles)">Muat Turun Resit</button>
                                          <button class="text-white p-2 bg-blue-500 rounded mt-2" @click.prevent="downloadinvoice(status[0].invoicefiles)">Muat Turun Invoice</button>
@@ -480,6 +479,13 @@ export default {
         },
         downloadpb(pbid) {
             window.open('/api/check/muatturun?files_id=' + pbid, '_blank');
+        },
+        pembesarannama(value){
+            const str = value.toLowerCase().replace(/\b[a-z]/g, function(response) {
+                return response.toUpperCase();
+            });
+
+            return str;
         }
     }
 }
diff --git a/resources/js/app.js b/resources/js/app.js
index 5e87610..39b04f7 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -119,18 +119,18 @@ Vue.use(require('vue-pusher'), {
     }
 });
 
-Vue.prototype.$api1 = 'http://api.arrahn'
+Vue.prototype.$api1 = 'http://localhost:8000'
 Vue.prototype.$username = document.querySelector("meta[name='user_name']").getAttribute('content');
 Vue.prototype.$userroles = document.querySelector("meta[name='user_roles']").getAttribute('content');
 
 
 let initial = 'KB2';
-let initialhostname = 'http://api.arrahn';
+let initialhostname = 'http://localhost:8000';
 
 const store = new Vuex.Store({
     state: { 
         $kodcaw: 'KB2',
-        $hostname: 'http://api.arrahn' 
+        $hostname: 'http://localhost:8000' 
     },
     plugins: [createPersistedState()],
     mutations: { 
diff --git a/resources/js/components/Cawangan.vue b/resources/js/components/Cawangan.vue
index 2f4c63a..30ff797 100644
--- a/resources/js/components/Cawangan.vue
+++ b/resources/js/components/Cawangan.vue
@@ -84,7 +84,7 @@
                     case 'JLI':
                     case 'ARP':
                     case '020303':{
-                        this.sethostname('http://api.arrahn')
+                        this.sethostname('http://localhost:8000')
                         break;
                     }
                     case '010621':
@@ -114,7 +114,7 @@
                         this.sethostname('http://api3.arrahn')
                         break;
                     }
-                    default: this.sethostname('http://api.arrahn')
+                    default: this.sethostname('http://localhost:8000')
                              break;
                 }
             }