From e8cb4b8f5ac9b5c8fa2eda92df0a9ef3ef3ca765 Mon Sep 17 00:00:00 2001
From: Jia Sheng <jiasheng@etctech.com.my>
Date: Fri, 5 Jul 2024 20:46:48 +0800
Subject: [PATCH 1/3] update pdf top header

---
 resources/views/pages/pdfs/credit_note.blade.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/views/pages/pdfs/credit_note.blade.php b/resources/views/pages/pdfs/credit_note.blade.php
index 1ad18dc6..d2b13eb8 100644
--- a/resources/views/pages/pdfs/credit_note.blade.php
+++ b/resources/views/pages/pdfs/credit_note.blade.php
@@ -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>

From 369054c81d8c46ce75336a42bae7c6fa7a64d27c Mon Sep 17 00:00:00 2001
From: Jia Sheng <jiasheng@etctech.com.my>
Date: Mon, 8 Jul 2024 12:09:33 +0800
Subject: [PATCH 2/3] -add note under booking payment history -add additional
 note when creating booking

---
 .../components/bookings/forms/BookingFormComponent.vue   | 2 ++
 .../bookings/sections/BookingDetailsSectionComponent.vue | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
index 5e15867d..74641ebd 100644
--- a/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingFormComponent.vue
@@ -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">
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index a2762ce7..fb227333 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -448,6 +448,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">

From 7f16b9ead1d793f7862e21d18f39edb66b8ea63b Mon Sep 17 00:00:00 2001
From: Jia Sheng <jiasheng@etctech.com.my>
Date: Mon, 8 Jul 2024 12:30:34 +0800
Subject: [PATCH 3/3] update refund logic where E2E do not refund service
 charge

---
 .../ControllersLogic/CreateBookingRefundLogic.php      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 058e4bc7..8c492eb1 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -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,