From 76b2edf3424caf56b51347b8a9afffa614ac7f8c Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 1 Mar 2023 09:25:27 +0800
Subject: [PATCH] update status WTD dan tukar ayat

---
 resources/js/WTD/Rekod.vue             | 18 +++++++++++++-----
 resources/js/WTD/SenaraiBakiLelong.vue |  4 ++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/js/WTD/Rekod.vue b/resources/js/WTD/Rekod.vue
index 257fb07..ae43e3a 100644
--- a/resources/js/WTD/Rekod.vue
+++ b/resources/js/WTD/Rekod.vue
@@ -15,9 +15,9 @@
                         <div class="w-1/3">Jumlah WTD</div>
                         <div>:</div>
                         <div class="ml-2 w-1/3"><b>RM {{ formattext(sb.baki) }} </b></div>
-                    </div>
+                    </div>                    
                     <div class="flex flex-row font-normal text-gray-700 dark:text-gray-400">
-                        <div class="w-1/3">Tarikh WTD
+                        <div class="w-1/3">Tarikh Proses WTD
                         </div>
                         <div>:</div>
                         <div class="ml-2 w-1/3"><b> {{ (sb.t_jual) ? sb.t_jual : 'Tiada' }} </b></div>
@@ -26,12 +26,15 @@
                         <div class="w-1/3">Status
                         </div>
                         <div>:</div>
-                        <div class="w-1/3 ml-2">
-                            <span :class="getClass(sb.aktif)" class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded uppercase last:mr-0 mr-1">{{ sb.aktif ? 'Selesai' : 'Belum' }} </span>
+                        <div v-if="sb.batchno === 0">
+                            <span :class="getNoBatch(sb.aktif)" class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded uppercase last:mr-0 mr-1">{{sb.aktif ? 'Dalam Proses WTD' : 'Dalam Proses WTD'  }} </span>
                         </div>
+                        <div v-else>
+                            <span :class="getClass(sb.aktif)" class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded uppercase last:mr-0 mr-1">{{ sb.aktif ? 'Selesai' : 'Dalam Proses WTD' }} </span>
+                        </div>      
                     </div>
                 </a>
-            </router-link>
+            </router-link>        
         </div>
     </div>
     <pagination :data="serahbakiarray" @clickEvent_="getRekod"></pagination>
@@ -79,6 +82,11 @@ export default {
                 'text-pink-600 bg-pink-200 ': !property
             }
         },
+        getNoBatch(property) {
+            return {
+                'text-pink-600 bg-pink-200 ': property,
+            }
+        },
         getRekod(pageNumber) {
             this.axios.get(this.$hostname + '/admin/wtd/rekod/', {
                 params: {
diff --git a/resources/js/WTD/SenaraiBakiLelong.vue b/resources/js/WTD/SenaraiBakiLelong.vue
index 4d61f12..85cc540 100644
--- a/resources/js/WTD/SenaraiBakiLelong.vue
+++ b/resources/js/WTD/SenaraiBakiLelong.vue
@@ -198,8 +198,8 @@ export default {
             if (this.selectedNorujukan.length > 0) {
                 await this.$swal({
                     icon: 'info',
-                    title: '<strong>Block WTD</strong>',
-                    html: "Sila tekan <b>Ya</b> untuk block SAG, Sila tekan Tidak untuk membatal urusan!",
+                    title: '<strong>Sekatan WTD</strong>',
+                    html: "Sila tekan <b>Ya</b> untuk sekat SAG, Sila tekan Tidak untuk membatal urusan!",
                     // html:"<button onclick='console.log(`haha`);cetaksenarai();' class='px-4 py-2 bg-yellow-500 text-white rounded-xl'>PDF</button><button class='ml-2 px-4 py-2 bg-yellow-500 text-white rounded-xl'>Excel</button>",
                     showCloseButton: true,
                     showCancelButton: true,