From 915ba51b223a695962e1e30623c40ef02b4c8ab4 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Tue, 6 Aug 2024 10:13:47 +0800
Subject: [PATCH] Fix error by null checks index. Organize data

---
 .../table-gldetail.blade.php                  | 34 ++++-----
 .../table-transactions-online.blade.php       | 72 +++++++++----------
 .../trail/partials/table-gldetail.blade.php   |  4 +-
 .../table-transactions-online.blade.php       | 56 +++++++--------
 4 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php
index 6cabe67..0d666bd 100644
--- a/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php
+++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php
@@ -28,23 +28,23 @@
             <x-slot name="body">
                 @foreach ($transaction as $data)
                     <tr>
-                        <x-table.data :content="$data['kodcaw']" />
-                        <x-table.data :content="$data['recno']" />
-                        <x-table.data :content="$data['tarikh']" />
-                        <x-table.data :content="$data['dtacct']" />
-                        <x-table.data :content="$data['ktacct']" />
-                        <x-table.data :content="$data['descpt']" />
-                        <x-table.data :content="$data['acttype']" />
-                        <x-table.data :content="$data['fracttype']" />
-                        <x-table.data :content="$data['amaun']" />
-                        <x-table.data :content="$data['teller']" />
-                        <x-table.data :content="$data['pelulus']" />
-                        <x-table.data :content="$data['terima']" />
-                        <x-table.data :content="$data['jenisbyr']" />
-                        <x-table.data :content="$data['bkcode']" />
-                        <x-table.data :content="$data['nocek']" />
-                        <x-table.data :content="$data['pendahuluan']" />
-                        <x-table.data :content="$data['serahan']" />
+                    <x-table.data :content="$data['kodcaw']" />
+                    <x-table.data :content="$data['recno']" />
+                    <x-table.data :content="$data['tarikh']" />
+                    <x-table.data :content="$data['dtacct']" />
+                    <x-table.data :content="$data['ktacct']" />
+                    <x-table.data :content="$data['descpt']" />
+                    <x-table.data :content="$data['acttype']" />
+                    <x-table.data :content="$data['fracttype']" />
+                    <x-table.data :content="$data['amaun']" />
+                    <x-table.data :content="$data['teller']" />
+                    <x-table.data :content="$data['pelulus']" />
+                    <x-table.data :content="$data['terima'] ?? 'Cawangan ' . $data['kodcaw'] . ' tiada column terima'" />
+                    <x-table.data :content="$data['jenisbyr']" />
+                    <x-table.data :content="$data['bkcode']" />
+                    <x-table.data :content="$data['nocek'] ?? 'Cawangan ' . $data['kodcaw'] . ' tiada column nocek'" />
+                    <x-table.data :content="$data['pendahuluan']" />
+                    <x-table.data :content="$data['serahan']" />
                     </tr>
                 @endforeach
             </x-slot>
diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php
index a4229f4..61daf6f 100644
--- a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php
+++ b/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php
@@ -7,46 +7,46 @@
 
         <x-table>
             <x-slot name="header">
-                <x-table.header content="id" />
-                <x-table.header content="nokp" />
-                <x-table.header content="customer_name" />
-                <x-table.header content="reference_no" />
-                <x-table.header content="nosiri" />
-                <x-table.header content="billplz_id" />
-                <x-table.header content="norujukan" />
-                <x-table.header content="kodcaw" />
-                <x-table.header content="total_payment" />
-                <x-table.header content="tarikh" />
-                <x-table.header content="masa" />
-                <x-table.header content="status" />
-                <x-table.header content="paid_at" />
-                <x-table.header content="update_status" />
-                <x-table.header content="update_serahan" />
-                <x-table.header content="tempohbayar" />
-                <x-table.header content="tagportal" />
-                <x-table.header content="jenisbayaran" />
+            <x-table.header content="update_status" />
+            <x-table.header content="update_serahan" />
+            <x-table.header content="billplz_id" />
+            <x-table.header content="norujukan" />
+            <x-table.header content="total_payment" />
+            <x-table.header content="nokp" />
+            <x-table.header content="customer_name" />
+            <x-table.header content="kodcaw" />
+            <x-table.header content="tagportal" />
+            <x-table.header content="masa" />
+            <x-table.header content="tarikh" />
+            <x-table.header content="id" />
+            <x-table.header content="reference_no" />
+            <x-table.header content="nosiri" />
+            <x-table.header content="status" />
+            <x-table.header content="paid_at" />
+            <x-table.header content="tempohbayar" />
+            <x-table.header content="jenisbayaran" />
             </x-slot>
             <x-slot name="body">
                 @foreach ($transaction as $data)
                     <tr>
-                        <x-table.data :content="$data['id']" />
-                        <x-table.data :content="$data['nokp']" />
-                        <x-table.data :content="$data['customer_name']" />
-                        <x-table.data :content="$data['reference_no']" />
-                        <x-table.data :content="$data['nosiri']" />
-                        <x-table.data :content="$data['billplz_id']" />
-                        <x-table.data :content="$data['norujukan']" />
-                        <x-table.data :content="$data['kodcaw']" />
-                        <x-table.data :content="$data['total_payment']" />
-                        <x-table.data :content="$data['tarikh']" />
-                        <x-table.data :content="$data['masa']" />
-                        <x-table.data :content="$data['status']" />
-                        <x-table.data :content="$data['paid_at']" />
-                        <x-table.data :content="$data['update_status']" />
-                        <x-table.data :content="$data['update_serahan']" />
-                        <x-table.data :content="$data['tempohbayar']" />
-                        <x-table.data :content="$data['tagportal']" />
-                        <x-table.data :content="$data['jenisbayaran']" />
+                    <x-table.data :content="$data['update_status']" />
+                    <x-table.data :content="$data['update_serahan']" />
+                    <x-table.data :content="$data['billplz_id']" />
+                    <x-table.data :content="$data['norujukan']" />
+                    <x-table.data :content="$data['total_payment']" />
+                    <x-table.data :content="$data['nokp']" />
+                    <x-table.data :content="$data['customer_name']" />
+                    <x-table.data :content="$data['kodcaw']" />
+                    <x-table.data :content="$data['tagportal']" />
+                    <x-table.data :content="$data['masa']" />
+                    <x-table.data :content="$data['tarikh']" />
+                    <x-table.data :content="$data['reference_no']" />
+                    <x-table.data :content="$data['id']" />
+                    <x-table.data :content="$data['nosiri']" />
+                    <x-table.data :content="$data['status']" />
+                    <x-table.data :content="$data['paid_at']" />
+                    <x-table.data :content="$data['tempohbayar']" />
+                    <x-table.data :content="$data['jenisbayaran']" />
                     </tr>
                 @endforeach
             </x-slot>
diff --git a/resources/views/online/trail/partials/table-gldetail.blade.php b/resources/views/online/trail/partials/table-gldetail.blade.php
index 54d7b00..18ffc7f 100644
--- a/resources/views/online/trail/partials/table-gldetail.blade.php
+++ b/resources/views/online/trail/partials/table-gldetail.blade.php
@@ -34,10 +34,10 @@
                     <x-table.data :content="$data['amaun']" />
                     <x-table.data :content="$data['teller']" />
                     <x-table.data :content="$data['pelulus']" />
-                    <x-table.data :content="$data['terima']" />
+                    <x-table.data :content="$data['terima'] ?? 'Cawangan ' . $data['kodcaw'] . ' tiada column terima'" />
                     <x-table.data :content="$data['jenisbyr']" />
                     <x-table.data :content="$data['bkcode']" />
-                    <x-table.data :content="$data['nocek']" />
+                    <x-table.data :content="$data['nocek'] ?? 'Cawangan ' . $data['kodcaw'] . ' tiada column nocek'" />
                     <x-table.data :content="$data['pendahuluan']" />
                     <x-table.data :content="$data['serahan']" />
                 </tr>
diff --git a/resources/views/online/trail/partials/table-transactions-online.blade.php b/resources/views/online/trail/partials/table-transactions-online.blade.php
index b3a1239..1dcb284 100644
--- a/resources/views/online/trail/partials/table-transactions-online.blade.php
+++ b/resources/views/online/trail/partials/table-transactions-online.blade.php
@@ -2,45 +2,45 @@
     <x-table.horizontal-scroller scrollDirection="left" tabContent="transactions-online" />
     <x-table>
         <x-slot name="header">
-            <x-table.header content="id" />
-            <x-table.header content="nokp" />
-            <x-table.header content="customer_name" />
-            <x-table.header content="reference_no" />
-            <x-table.header content="nosiri" />
-            <x-table.header content="billplz_id" />
-            <x-table.header content="norujukan" />
-            <x-table.header content="kodcaw" />
-            <x-table.header content="total_payment" />
-            <x-table.header content="tarikh" />
-            <x-table.header content="masa" />
-            <x-table.header content="status" />
-            <x-table.header content="paid_at" />
             <x-table.header content="update_status" />
             <x-table.header content="update_serahan" />
-            <x-table.header content="tempohbayar" />
+            <x-table.header content="billplz_id" />
+            <x-table.header content="norujukan" />
+            <x-table.header content="total_payment" />
+            <x-table.header content="nokp" />
+            <x-table.header content="customer_name" />
+            <x-table.header content="kodcaw" />
             <x-table.header content="tagportal" />
+            <x-table.header content="masa" />
+            <x-table.header content="tarikh" />
+            <x-table.header content="id" />
+            <x-table.header content="reference_no" />
+            <x-table.header content="nosiri" />
+            <x-table.header content="status" />
+            <x-table.header content="paid_at" />
+            <x-table.header content="tempohbayar" />
             <x-table.header content="jenisbayaran" />
         </x-slot>
         <x-slot name="body">
             @forelse ($transactionTrail['transactionsOnline'] as $data)
                 <tr>
-                    <x-table.data :content="$data['id']" />
-                    <x-table.data :content="$data['nokp']" />
-                    <x-table.data :content="$data['customer_name']" />
-                    <x-table.data :content="$data['reference_no']" />
-                    <x-table.data :content="$data['nosiri']" />
-                    <x-table.data :content="$data['billplz_id']" />
-                    <x-table.data :content="$data['norujukan']" />
-                    <x-table.data :content="$data['kodcaw']" />
-                    <x-table.data :content="$data['total_payment']" />
-                    <x-table.data :content="$data['tarikh']" />
-                    <x-table.data :content="$data['masa']" />
-                    <x-table.data :content="$data['status']" />
-                    <x-table.data :content="$data['paid_at']" />
                     <x-table.data :content="$data['update_status']" />
                     <x-table.data :content="$data['update_serahan']" />
-                    <x-table.data :content="$data['tempohbayar']" />
+                    <x-table.data :content="$data['billplz_id']" />
+                    <x-table.data :content="$data['norujukan']" />
+                    <x-table.data :content="$data['total_payment']" />
+                    <x-table.data :content="$data['nokp']" />
+                    <x-table.data :content="$data['customer_name']" />
+                    <x-table.data :content="$data['kodcaw']" />
                     <x-table.data :content="$data['tagportal']" />
+                    <x-table.data :content="$data['masa']" />
+                    <x-table.data :content="$data['tarikh']" />
+                    <x-table.data :content="$data['reference_no']" />
+                    <x-table.data :content="$data['id']" />
+                    <x-table.data :content="$data['nosiri']" />
+                    <x-table.data :content="$data['status']" />
+                    <x-table.data :content="$data['paid_at']" />
+                    <x-table.data :content="$data['tempohbayar']" />
                     <x-table.data :content="$data['jenisbayaran']" />
                 </tr>
             @empty