From f749d568a2975493f9b312f2b41fcb915255a864 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 24 Jun 2026 20:14:31 +0800 Subject: [PATCH] Sin Yee requested for this business logic to be removed --> refund service charges if booking is not E2E --- .../CreateBookingRefundLogic.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index f8a1e8cf..95efc7c5 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -146,14 +146,19 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $service_charges_to_refund = $isFullyRefund ? $quotationBeforeCurrentRefund->getServiceCharge() : $quotationBeforeCurrentRefund->getServiceCharge() - $quotationAfterRefund->getServiceCharge(); } - // 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; - } + // refund service charges if booking is not E2E - starts + // if ($booking->service_id !== 5) { + // $refundTotal = $refundTotal + $service_charges_to_refund + $transaction->tax; + // } else { + // $service_charges_to_refund = 0; + // } + // refund service charges if booking is not E2E - ends + + //Reinstate refund service charges to all services, no checking if it is E2E or otherwise + $refundTotal = $refundTotal + $service_charges_to_refund + $transaction->tax; $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, 1, PaymentMethodType::CASH,