From df7f9531e82ca8fcc3750318716cbd4d7f816cf1 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 7 Mar 2024 11:38:03 +0800
Subject: [PATCH 1/4] fix payment history display transfer status

---
 .../elements/PaymentHistoryComponent.vue        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 877ec248..90270fee 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -8,8 +8,17 @@
                             <div class="row m-b-5">
                                 <div class="col-auto">
                                     <div class="font-heading fs-8 muted all-caps">Status</div>
-                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4 && item.status !== 7}, {'text-danger': item.status == 7}]">
-                                        {{ item.status === 7 ? 'Refunded' : (item.status === 1 ? 'Processing Payment' : 'Transferred')}}
+                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
+                                    </div>
+                                    <div class="font-heading fs-10 bold" v-if="item.type === 6" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
+                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
+                                    </div>
+                                </div>
+                                <div class="col-auto">
+                                    <div class="font-heading fs-8 muted all-caps">Status</div>
+                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4 && item.status !== 7}, {'text-danger': item.status === 7}]">
+                                        {{ item.status === 7 ? 'Refunded' : (item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Payment Approved')}}
                                     </div>
                                     <div class="font-heading fs-10 bold" v-if="item.type === 6" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
                                         {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
@@ -18,7 +27,7 @@
                                 <div class="col-auto p-l-0">
                                     <div class="font-heading fs-8 muted all-caps">Payment Amount</div>
                                     <div class="font-heading fs-10 bold">
-                                        {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                                        {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                                     </div>
                                 </div>
                                 <div class="col-auto p-l-0" v-if="totalRefunds !== 0">
@@ -61,7 +70,7 @@
                             <div class="row m-b-5">
                                 <div class="col-auto">
                                     <div class="font-heading fs-8 muted all-caps">Status</div>
-                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.transaction_bill.status === 1 || item.transaction_bill.status === 4}, {'text-success': item.transaction_bill.status !== 1 && item.transaction_bill.status !== 4}]">
+                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.transaction_bill.status === 4}, {'text-success': item.transaction_bill.status !== 1 && item.transaction_bill.status !== 4}]">
                                         {{ item.transaction_bill.status === 1 ? 'Processing Payment' : 'Transferred'}}
                                     </div>
                                 </div>

From 32224f6803cc36185e53387794063098b12bde8e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 7 Mar 2024 11:43:19 +0800
Subject: [PATCH 2/4] fix payment history display transfer status

---
 .../bookings/elements/PaymentHistoryComponent.vue        | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 90270fee..1db22609 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -6,15 +6,6 @@
                     <div class="row">
                         <div class="col p-t-10 p-b-10 p-r-0 pointer" @click="clickExpand()" :class="[{'bg-master-lighter': item.status === 1 && item.type !== 6}, {'bg-white': item.status !== 1 && item.status !== 4}, {'bg-warning-lighter': item.status === 7}, {'bg-warning-lighter': item.type === 6}]">
                             <div class="row m-b-5">
-                                <div class="col-auto">
-                                    <div class="font-heading fs-8 muted all-caps">Status</div>
-                                    <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
-                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
-                                    </div>
-                                    <div class="font-heading fs-10 bold" v-if="item.type === 6" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4}]">
-                                        {{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
-                                    </div>
-                                </div>
                                 <div class="col-auto">
                                     <div class="font-heading fs-8 muted all-caps">Status</div>
                                     <div class="font-heading fs-10 bold" v-if="item.type === 1" :class="[{'text-danger': item.status === 1 || item.status === 4}, {'text-success': item.status !== 1 && item.status !== 4 && item.status !== 7}, {'text-danger': item.status === 7}]">

From 70300412467eeeb9b0877c6afb34877c8def563b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 7 Mar 2024 11:46:46 +0800
Subject: [PATCH 3/4] fix payment history display transfer status

---
 .../components/bookings/elements/PaymentHistoryComponent.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 1db22609..a6556cd2 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -61,7 +61,7 @@
                             <div class="row m-b-5">
                                 <div class="col-auto">
                                     <div class="font-heading fs-8 muted all-caps">Status</div>
-                                    <div class="font-heading fs-10 bold" :class="[{'text-danger': item.transaction_bill.status === 4}, {'text-success': item.transaction_bill.status !== 1 && item.transaction_bill.status !== 4}]">
+                                    <div class="font-heading fs-10 bold" :class="[{'text-success': item.transaction_bill.status !== 4}, {'text-success': item.transaction_bill.status !== 1 && item.transaction_bill.status !== 4}]">
                                         {{ item.transaction_bill.status === 1 ? 'Processing Payment' : 'Transferred'}}
                                     </div>
                                 </div>

From b0e3467fbe40bf1590a041509511eb5e7fc60412 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Thu, 7 Mar 2024 15:41:21 +0800
Subject: [PATCH 4/4] export pending order should not export order with refund
 in progress

---
 routes/web.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index a6590c17..9016724c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -386,7 +386,11 @@ Route::get('/segments', function (Request $request) {
 })->name('segments');
 
 Route::get('/pending_orders', function(){
-    $payments = Transaction::where('type', TransactionType::PAYMENT)->where('owner_type', Booking::class)->whereIn('status', [ApprovalStatus::APPROVED])->get();
+    $payments = Transaction::where('type', TransactionType::PAYMENT)->where('owner_type', Booking::class)->whereIn('status', [ApprovalStatus::APPROVED])
+        ->whereDoesntHave('transactions', function ($query) {
+            return $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION]);
+        })
+        ->get();
 
     echo '<table>';
     $i = 0;