From ffd95ee1ccc6409eafc2258730104db352f6a1d3 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Fri, 8 Mar 2024 23:31:37 +0800
Subject: [PATCH] Fix missing group payment info on order page

---
 app/Http/Resources/GroupForOrderV2Resource.php              | 4 +++-
 app/Http/Resources/TransactionResource.php                  | 2 +-
 app/Http/Resources/TransactionWithStorageResource.php       | 2 +-
 ...SingleGroupPaymentHistoryTransactionDetailsComponent.vue | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Resources/GroupForOrderV2Resource.php b/app/Http/Resources/GroupForOrderV2Resource.php
index 4c4c8c33..c1f1d981 100644
--- a/app/Http/Resources/GroupForOrderV2Resource.php
+++ b/app/Http/Resources/GroupForOrderV2Resource.php
@@ -40,7 +40,9 @@ class GroupForOrderV2Resource extends JsonResource
             'payment_transaction' => $payment_transaction ? [
                 'id' => $payment_transaction->id,
                 'status' => $payment_transaction->status,
-                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status]
+                'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status],
+                'bill_no' => $payment_transaction->bill_no,
+                'updated_at' => Carbon::parse($payment_transaction->updated_at)->format('d-m-Y h:i:s A'),
             ] : []
         ];
     }
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 40984608..d8697f8a 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -78,7 +78,7 @@ class TransactionResource extends JsonResource
                     ->get()
             ),
             'remarks' => RemarkResource::collection($this->remarks),
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];
diff --git a/app/Http/Resources/TransactionWithStorageResource.php b/app/Http/Resources/TransactionWithStorageResource.php
index d072913a..dd307ad8 100644
--- a/app/Http/Resources/TransactionWithStorageResource.php
+++ b/app/Http/Resources/TransactionWithStorageResource.php
@@ -121,7 +121,7 @@ class TransactionWithStorageResource extends JsonResource
             'remarks' => RemarkResource::collection($this->remarks),
             'storages' => $this->storages ? $this->storages : null, //from middleware
             'is_waived' => (int) $this->is_waived,
-            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
+            'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
         ];
diff --git a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
index 7a95322e..2b176920 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue
@@ -19,16 +19,16 @@
                                         {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
-                                <div class="col-auto p-l-0">
+                                <div class="col-auto p-l-0" v-if="$store.getters.isAdmin">
                                     <div class="font-heading fs-8 muted all-caps">Bill Number</div>
                                     <div class="font-heading fs-10 bold">
-                                        {{ item.bill_no }}
+                                        {{ item.payment_transaction.bill_no }}
                                     </div>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.payment_transaction.status === 4}, {'text-primary': item.payment_transaction.status !== 4}]">{{ item.payment_transaction.status === 2 ? 'Received' : item.payment_transaction.status === 4 ? 'Rejected' : 'Submitted'}} On: {{item.updated_at}}</div>
+                                    <div class="font-heading fs-8 all-caps" :class="[{'text-danger': item.payment_transaction.status === 4}, {'text-primary': item.payment_transaction.status !== 4}]">{{ item.payment_transaction.status === 2 ? 'Received' : item.payment_transaction.status === 4 ? 'Rejected' : 'Submitted'}} On: {{item.payment_transaction.updated_at}}</div>
                                 </div>
                             </div>
                         </div>