cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
edmondlang
2024-07-08 19:07:29 +08:00
parent 8d11f54b01 a77481084c
commit 91ce365c62
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+8 -2
View File
@@ -132,8 +132,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
$service_charges_to_refund = $isFullyRefund ? $quotationBeforeCurrentRefund->getServiceCharge() : $quotationBeforeCurrentRefund->getServiceCharge() - $quotationAfterRefund->getServiceCharge();
// refund service charges if is fully refund
$refundTotal = $refundAmount + $service_charges_to_refund + $transaction->tax;
// refund service charges if booking is not E2E
$refundTotal = $refundAmount;
if ($booking->service_id !== 5) {
$refundTotal = $refundTotal + $service_charges_to_refund + $transaction->tax;
} else {
$service_charges_to_refund = 0;
}
$object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id,
1, PaymentMethodType::CASH,
resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
+2
View File
@@ -95,6 +95,8 @@
<div class="col">
<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 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="serviceType.id === 5">Cancellation of E2E service are strictly NO refund on the 2% transfer fee charge.</p>
</div>
</div>
<div class="row">
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+9
View File
@@ -453,6 +453,15 @@
</div>
</div>
</div>
<div class="col" v-if="booking.payment_history.length">
<div class="alert alert-danger padding-15" role="alert">
<div class="row">
<div class="col">
<div class="font-heading fs-10">Please contact CIEF if the supplier hasn’t received the funds within 14 working days; otherwise, the dispute request may no longer be traceable.</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row m-t-5" v-if="$store.getters.isAdmin">
resources/views/pages/pdfs/credit_note.blade.php
+5 -4
View File
@@ -3,7 +3,11 @@
<br>
<htmlpageheader name="page-header">
<br><br>
<div class="separator"><strong><i>{{ $transaction->bill_no }}</i></strong></div>
@php
$credit_title = \Carbon\Carbon::parse($transaction->created_at)->greaterThanOrEqualTo('2024-04-02') ? 'Refund' : 'Credit';
$bill_no = $credit_title === 'Refund' ? str_replace('CREDIT', 'REFUND', $transaction->bill_no) : $transaction->bill_no;
@endphp
<div class="separator"><strong><i>{{ $bill_no }}</i></strong></div>
</htmlpageheader>
<table>
<tr>
@@ -24,9 +28,6 @@
</td>
<td class="header-details">
<div class="title">
@php
$credit_title = \Carbon\Carbon::parse($transaction->created_at)->greaterThanOrEqualTo('2024-04-02') ? 'Refund' : 'Credit'
@endphp
<strong>
{{ $transaction->type == 9 ? $credit_title : 'Debit' }} Note
</strong>