From 929423794af2b1e306021fa8ec61cd1ec9cefd7c Mon Sep 17 00:00:00 2001
From: Edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 16 Apr 2025 22:55:16 +0800
Subject: [PATCH] ks request : Hi @addmondz this error need your help to change
 it, bank transfer (express) - USD this part also should remove if user choose
 Bank Transfer (express) - USD For CNY, may need you help to change all RMB to
 CNY. Thanks!

---
 .../Modules/Bookings/Services/GeneratesBookingQuotation.php   | 4 ++++
 .../vue/components/bookings/forms/BookingFormComponent.vue    | 2 +-
 .../components/bookings/forms/CurrencyConverterComponent.vue  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
index 5c1ecdd9..dcc4b8d8 100644
--- a/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
+++ b/app/Classes/Modules/Bookings/Services/GeneratesBookingQuotation.php
@@ -7,6 +7,7 @@ use App\Classes\Modules\Bookings\DataTransferObjects\CalculationObject;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
 use App\Http\Resources\BankResource;
 use App\Models\Bank;
+use App\Models\Currency;
 use Carbon\Carbon;
 use Carbon\CarbonInterval;
 
@@ -44,6 +45,8 @@ class GeneratesBookingQuotation
                 ->format('4:00 \P\M, jS M, Y \G\M\T T');
         }
 
+        $foreign_currency = Currency::find($calculationObject->getConversionObject()->getCurrencyId());
+        $foreign_currency_short_code = $foreign_currency->short_code ?? 'CNY';
 
         return [
             'bank' => new BankResource(Bank::find($calculationObject->getConfigurations()->getBankId())),
@@ -61,6 +64,7 @@ class GeneratesBookingQuotation
             'payment_attempt_limit' => CarbonInterval::days($days)->hours($hours)->minutes($minutes)->forHumans(),
             'voucher_discount_amount' => $calculationObject->getVoucherDiscountAmount(),
             'voucher_code' => $calculationObject->getVoucherCode(),
+            'foreign_currency' => $foreign_currency_short_code,
         ];
     }
 }
diff --git a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
index 46ae77b5..36432a62 100644
--- a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
@@ -96,7 +96,7 @@
                                                     <p class="no-margin" v-if="serviceType.id === 1">The recipient can expect to receive the transfer within <span class="text-success bold">3-5 working days</span>. Explore our BANK TRANSFER (SAVER) option for a better rate!</p>
                                                     <p class="no-margin" v-if="serviceType.id === 3">Enjoy a <span class="bold text-underline">better rate</span> with this option! The recipient will receive the transfer after <span class="text-success bold">5-7 working days</span>.</p>
                                                     <p class="no-margin" v-if="serviceType.id === 12">You can request Pay-on-Behalf via Alipay for platforms like Taobao, 1688, Pinduoduo, or any Alipay-supported platform. <br><span class="text-danger">Please use Alipay account "2766384544@QQ.com" to apply for Daifu. This account may change, so always confirm the latest Alipay account before placing an order.</span></p>
-                                                    <p class="no-margin text-danger" v-if="[1, 3].includes(serviceType.id)">Please ensure is a PERSONAL bank account details. Company bank account details only allow to use as E2E service.</p>
+                                                    <p class="no-margin text-danger" v-if="[1, 3].includes(serviceType.id) && serviceType.selectedCurrency.id !== 3">Please ensure is a PERSONAL bank account details. Company bank account details only allow to use as E2E service.</p>
                                                     <p class="no-margin text-danger" v-if="serviceType.id === 5">Cancellation of E2E service are strictly NO refund on the 2% transfer fee charge.</p>
                                                 </div>
                                             </div>
diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
index 59291ed1..8df81f86 100644
--- a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
@@ -99,7 +99,7 @@
                                 <div class="col-1 p-r-25" >
                                     <i class="fa fa-exchange bg-white text-complete fs-16 p-t-5 p-b-5" style="margin-left: -4px;"></i>
                                 </div>
-                                <div class="col p-l-0 fs-14 bold lh-20 text-complete">1 MYR = {{(Math.round((this.calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5)}} RMB</div>
+                                <div class="col p-l-0 fs-14 bold lh-20 text-complete">1 MYR = {{(Math.round((this.calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5)}} {{ this.calculation.foreign_currency }}</div>
                             </div>
                         </div>
                     </div>