From 585ce66e3c0fd03c4cf2cddf8d4385ab2a0202b2 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 1 Jun 2023 23:52:18 +0800
Subject: [PATCH 1/2] xpo 03-2023

---
 .../Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
index 617691e8..8eb47681 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
@@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $bookings = Booking::where('service_id', '!=', 4)->where(function($query){
-            return $query->whereMonth('created_at', '=', 04)->whereYear('created_at', 2023);
+            return $query->whereMonth('created_at', '=', 03)->whereYear('created_at', 2023);
         })->whereDoesntHave('transactions', function($q){
                 $q->where('type', TransactionType::PURCHASE_ORDER);
                 $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);

From 4218a4e398b19617d1067c467d398642eb6068f0 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 3 Jun 2023 14:42:37 +0800
Subject: [PATCH 2/2] company name warning text

---
 .../vue/components/banks/forms/BankAccountFormComponent.vue    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
index 6e9518d9..f0c58095 100644
--- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -27,9 +27,10 @@
                             <div class="row m-b-10">
                                 <div class="col">
                                     <validation-wrapper-component :validator="$v.parameters.holder_name">
-                                        <label>Account Holder Name</label>
+                                        <label>Account Holder Name / Company Name</label>
                                         <input type="text" class="form-control" v-model="parameters.holder_name" :disabled="disabled">
                                     </validation-wrapper-component>
+                                    <span class="text-danger fs-10 m-l-5" v-if="serviceType">{{ serviceType.id != 4 ? '*Please ensure to use the appropriate company name for corporate transfers, instead of personal names.' : ''}}</span>
                                 </div>
                             </div>
                             <div class="row m-b-10">