From 000c4183157ed49a08a44c93a7d4ca5435d53f6a Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 22 May 2024 21:17:11 +0800
Subject: [PATCH 1/4] make refund remarks required

---
 .../bookings/elements/RefundConfirmationComponent.vue         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
index 16930a76..845c2b43 100644
--- a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -92,7 +92,9 @@ export default {
             refundAmount: {
                 maxValue: maxValue(this.refundMaxValue)
             }, 
-            refundRemark: {}
+            refundRemark: {
+                required
+            }
         }
     },
     computed: {

From 7feb05d784462654a67423ad77d9ead5bc0e09de Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 22 May 2024 22:23:59 +0800
Subject: [PATCH 2/4] make refund remarks required

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

diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
index 845c2b43..5d27ca3f 100644
--- a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -67,7 +67,7 @@
 <script>
 import FormHandler from '../../../general/mixins/formHandler';
 import ModalFormHandler from '../../../general/mixins/modalFormHandler';
-import { maxValue } from "vuelidate/lib/validators";
+import { maxValue, required } from "vuelidate/lib/validators";
 
 export default {
     props: {

From a17812be3b74f137a061e4bbce29de4bacebe5e6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 22 May 2024 23:22:44 +0800
Subject: [PATCH 3/4] check duplicate refunds

---
 .../Constants/TransactionType.php             | 21 ++++-
 app/Http/Resources/BookingResource.php        |  3 +-
 routes/web.php                                | 79 +++++++++++++++++++
 3 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php
index e14930b0..09479729 100644
--- a/app/Classes/ValueObjects/Constants/TransactionType.php
+++ b/app/Classes/ValueObjects/Constants/TransactionType.php
@@ -38,4 +38,23 @@ final class TransactionType {
 
     public const BILL_REFUND = 16;
 
-}
+    public const ID_TO_NAME = [
+        self::PAYMENT_ATTEMPT => "PAYMENT_ATTEMPT",
+        self::PAYMENT => "PAYMENT",
+        self::INVOICE => "INVOICE",
+        self::BILL => "BILL",
+        self::PROFORMA => "PROFORMA",
+        self::TOP_UP => "TOP_UP",
+        self::REFUND => "REFUND",
+        self::PURCHASE_ORDER => "PURCHASE_ORDER",
+        self::SUPPLIER_DELIVER => "SUPPLIER_DELIVER",
+        self::CREDIT_NOTE => "CREDIT_NOTE",
+        self::DEBIT_NOTE => "DEBIT_NOTE",
+        self::WITHDRAW => "WITHDRAW",
+        self::TRANSFER_FEE => "TRANSFER_FEE",
+        self::CASH_BACK => "CASH_BACK",
+        self::SUPPLIER_PAYMENT => "SUPPLIER_PAYMENT",
+        self::SUPPLIER_REFUND => "SUPPLIER_REFUND",
+    ];
+    
+    }
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 6803eec9..2612c5b4 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -56,7 +56,8 @@ class BookingResource extends JsonResource
                         ->whereDate('expires_on', '>=', Carbon::now())
                         ->get()
                 ),
-                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                // 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::EXPIRED)->get()),
                 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
                     $query->where(function($query){
                         $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED, ApprovalStatus::REFUNDED]);
diff --git a/routes/web.php b/routes/web.php
index 6d92fce9..f0234e70 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -33,6 +33,7 @@ use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
 use App\Classes\Modules\Documents\Services\DeletesDocument;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
 
@@ -1099,3 +1100,81 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
     echo '</tbody>';
     echo '</table>';
 });
+
+Route::get('check-duplicate-refunds', function () {
+    $results = Transaction::select('payment_reference', 'owner_id', 'owner_type', 'type', 'status', 'amount', DB::raw('COUNT(*) as count'))
+    ->whereNotNull('payment_reference')
+    ->where('payment_reference', '<>', '')
+    ->where('payment_reference', '<>', 'Withdraw')
+    ->where('payment_reference', '<>', 'Refund for Ref. 77315')
+    ->whereNull('deleted_at')
+    ->groupBy('payment_reference', 'owner_id', 'owner_type', 'type', 'status', 'amount')
+    ->having(DB::raw('COUNT(*)'), '>', 1)
+    ->get();
+
+    $transactionType = TransactionType::ID_TO_NAME;
+    $approvalStatus = ApprovalStatus::APPROVAL_STATUS_ID;
+
+    echo '<table style="border-collapse: collapse; width: 100%;">';
+    echo '<thead>';
+    echo '<tr>';
+    echo '<th style="border: 1px solid black;">Owner Type</th>';
+    echo '<th style="border: 1px solid black;">Owner ID</th>';
+    echo '<th style="border: 1px solid black;">Payment Reference</th>';
+    echo '<th style="border: 1px solid black;">Type</th>';
+    echo '<th style="border: 1px solid black;">Status</th>';
+    echo '<th style="border: 1px solid black;">Count</th>';
+    echo '<th style="border: 1px solid black;">Amount</th>';
+    echo '<th style="border: 1px solid black;">Wallet Details</th>';
+    echo '<th style="border: 1px solid black;">Booking Ref</th>';
+    echo '<th style="border: 1px solid black;">Payment ID</th>';
+    echo '<th style="border: 1px solid black;">Payment Status</th>';
+    echo '<th style="border: 1px solid black;">Refund ID</th>';
+    echo '</tr>';
+    echo '</thead>';
+    echo '<tbody>';
+
+    foreach ($results as $result) {
+        $booking_ref_arr = explode(' ', $result->payment_reference);
+        $booking_ref = end($booking_ref_arr);
+        
+        echo '<tr>';
+        echo "<td style='border: 1px solid black;'>$result->owner_type</td>";
+        echo "<td style='border: 1px solid black;'>$result->owner_id</td>";
+        echo "<td style='border: 1px solid black;'>$result->payment_reference</td>";
+        $status = $transactionType[$result->type];
+        echo "<td style='border: 1px solid black;'>$status</td>";
+        $approvalsName = $approvalStatus[$result->status];
+        echo "<td style='border: 1px solid black;'>$approvalsName</td>";
+        echo "<td style='border: 1px solid black;'>$result->count</td>";
+        echo "<td style='border: 1px solid black;'>$result->amount</td>";
+
+        $click = null;
+        if ($result->owner_type == 'App\Models\Wallet') {
+            $click = '<a href="'.route('wallet.details', $result->owner->owner->reference).'" target="_blank">'.$result->owner->owner->reference.'</a>';
+        }
+        echo "<td style='border: 1px solid black;'>". $click ."</td>";
+
+        $booking_ref_click = null;
+        $payment = null;
+        $refund = null;
+        if ($booking_ref) {
+            $booking_ref_click = '<a href="'.route('booking.details', $booking_ref).'" target="_blank">'.$booking_ref.'</a>';
+
+            $booking = Booking::where('marking', $booking_ref)->first();
+            $payment = $booking->transactions()->where('type', TransactionType::PAYMENT)->first();
+            $refund = $payment->transactions()->where('type', TransactionType::REFUND)->get()->pluck('id')->toArray();
+            $refund = implode(',', $refund);
+        }
+        echo "<td style='border: 1px solid black;'>$booking_ref_click</td>";
+        echo "<td style='border: 1px solid black;'>" . ($payment ? $payment->id : '') . "</td>";
+        echo "<td style='border: 1px solid black;'>" . ($payment ? $approvalStatus[$payment->status] : '') . "</td>";
+        echo "<td style='border: 1px solid black;'>" . ($refund ? $refund : '') . "</td>";
+        echo '</tr>';
+
+        
+    }
+    echo '</tbody>';
+    echo '</table>';
+});
+

From 40d20dc42e9b6dcaae406552485016e4a3cec3e4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 22 May 2024 23:26:54 +0800
Subject: [PATCH 4/4] update check duplicate refunds

---
 routes/web.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index f0234e70..fae63d9b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1162,9 +1162,11 @@ Route::get('check-duplicate-refunds', function () {
             $booking_ref_click = '<a href="'.route('booking.details', $booking_ref).'" target="_blank">'.$booking_ref.'</a>';
 
             $booking = Booking::where('marking', $booking_ref)->first();
-            $payment = $booking->transactions()->where('type', TransactionType::PAYMENT)->first();
-            $refund = $payment->transactions()->where('type', TransactionType::REFUND)->get()->pluck('id')->toArray();
-            $refund = implode(',', $refund);
+            if ($booking) {
+                $payment = $booking->transactions()->where('type', TransactionType::PAYMENT)->first();
+                $refund = $payment->transactions()->where('type', TransactionType::REFUND)->get()->pluck('id')->toArray();
+                $refund = implode(',', $refund);
+            }
         }
         echo "<td style='border: 1px solid black;'>$booking_ref_click</td>";
         echo "<td style='border: 1px solid black;'>" . ($payment ? $payment->id : '') . "</td>";