From 90a83062cc4eec685e2106df7f127456bc4a4688 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 17 Apr 2023 13:28:54 +0530 Subject: [PATCH] fix room total price in refund request when order is not paid --- classes/order/OrderReturn.php | 46 +++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 99315f167..f9dc27eca 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -203,36 +203,40 @@ class OrderReturnCore extends ObjectModel $bookingRow['extra_service_total_paid_amount'] = 0; $bookingRow['extra_service_total_price_tax_incl'] = 0; $bookingRow['room_paid_amount'] = 0; - if ($objOrder->total_paid_real > 0) { - if ($bookingRow['total_price_tax_incl'] > 0) { + if ($bookingRow['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { $bookingRow['room_paid_amount'] = ($objOrder->total_paid_real*$bookingRow['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; } - $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( - $idOrder, - $bookingRow['id_product'], - $bookingRow['id_room'], - $bookingRow['date_from'], - $bookingRow['date_to'], - 0 - ); - if (count($roomSelectedDemands)) { - foreach ($roomSelectedDemands as $demand) { - if ($demand['total_price_tax_incl'] > 0) { + } + $roomSelectedDemands = $objBookingDemands->getRoomTypeBookingExtraDemands( + $idOrder, + $bookingRow['id_product'], + $bookingRow['id_room'], + $bookingRow['date_from'], + $bookingRow['date_to'], + 0 + ); + if (count($roomSelectedDemands)) { + foreach ($roomSelectedDemands as $demand) { + if ($demand['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$demand['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; } + $bookingRow['extra_service_total_price_tax_incl'] += $demand['total_price_tax_incl']; } } + } - if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( - $bookingRow['id_htl_booking'] - )) { - if (count($roomSelectedServices['additional_services'])) { - foreach ($roomSelectedServices['additional_services'] as $service) { - if ($service['total_price_tax_incl'] > 0) { + if ($roomSelectedServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( + $bookingRow['id_htl_booking'] + )) { + if (count($roomSelectedServices['additional_services'])) { + foreach ($roomSelectedServices['additional_services'] as $service) { + if ($service['total_price_tax_incl'] > 0) { + if ($objOrder->total_paid_real > 0) { $bookingRow['extra_service_total_paid_amount'] += ($objOrder->total_paid_real*$service['total_price_tax_incl'])/$objOrder->total_paid_tax_incl; - $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; } + $bookingRow['extra_service_total_price_tax_incl'] += $service['total_price_tax_incl']; } } }