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 @@
The recipient can expect to receive the transfer within 3-5 working days. Explore our BANK TRANSFER (SAVER) option for a better rate!
Enjoy a better rate with this option! The recipient will receive the transfer after 5-7 working days.
You can request Pay-on-Behalf via Alipay for platforms like Taobao, 1688, Pinduoduo, or any Alipay-supported platform.
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.
Please ensure is a PERSONAL bank account details. Company bank account details only allow to use as E2E service.
+Please ensure is a PERSONAL bank account details. Company bank account details only allow to use as E2E service.
Cancellation of E2E service are strictly NO refund on the 2% transfer fee charge.
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 @@