From 700559461c4b4370620314129d24ead4b6c694db Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 12:57:17 +0530 Subject: [PATCH 1/5] Add cancellation policy section on admin order view page --- .../controllers/orders/helpers/view/view.tpl | 24 +++++++++++++ controllers/admin/AdminOrdersController.php | 4 +++ .../classes/HotelOrderRefundRules.php | 34 +++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 8a2b5b313..26a716bbd 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1114,6 +1114,30 @@ {/if} +
+
+ {l s='Cancellation Policies'} +
+ {if is_array($applicable_refund_policies) && count($applicable_refund_policies)} + + {else} +

+ + {l s='No cancellation policies applicable.'} +

+ {/if} +
{hook h="displayAdminOrderRight" id_order=$order->id} diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index df4af2e8d..1518fe160 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -1661,9 +1661,13 @@ class AdminOrdersControllerCore extends AdminController // hotel booking statuses $htlOrderStatus = HotelBookingDetail::getAllHotelOrderStatus(); + + // applicable refund policies + $applicableRefundPolicies = HotelOrderRefundRules::getApplicableRefundRules($order->id); $this->tpl_view_vars = array( // refund info 'refund_allowed' => (int) $order->isReturnable(), + 'applicable_refund_policies' => $applicableRefundPolicies, 'returns' => OrderReturn::getOrdersReturn($order->id_customer, $order->id), 'refundReqBookings' => $refundReqBookings, 'hasCompletelyRefunded' => $order->hasCompletelyRefunded(), diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php index d49354299..1a8b021d9 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php @@ -222,4 +222,38 @@ class HotelOrderRefundRules extends ObjectModel return $totalCancelationCharges; } + + public static function getApplicableRefundRules($idOrder) + { + $idLang = Context::getContext()->language->id; + + $minDate = Db::getInstance()->getValue( + 'SELECT MIN(DATE(hbd.`date_from`)) + FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + WHERE hbd.`id_order` = '.(int) $idOrder + ); + + if (!$minDate) { + return array(); + } + + $dateToday = date('Y-m-d'); + + if (strtotime($minDate) < strtotime($dateToday)) { // same day cancellation rules are allowed + $minDate = $dateToday; + } + + $days = HotelBookingDetail::getDays($dateToday, $minDate); + + $sql = 'SELECT * + FROM `'._DB_PREFIX_.'htl_branch_refund_rules` hrr + LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules` orr + ON (orr.`id_refund_rule` = hrr.`id_refund_rule`) + LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules_lang` orrl + ON (orrl.`id_refund_rule` = orr.`id_refund_rule` AND orrl.`id_lang` = '.(int) $idLang.') + WHERE orr.`days` <= '.(int) $days.' + ORDER BY orr.`days` DESC'; + + return Db::getInstance()->executeS($sql); + } } From 12c0f7ef093fd2cd0742e5bf63c562365201e3e3 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 13:22:46 +0530 Subject: [PATCH 2/5] Update Refunds section on admin order view page --- .../template/controllers/orders/helpers/view/view.tpl | 8 ++++++++ classes/order/OrderReturn.php | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 26a716bbd..f7b698329 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -1065,7 +1065,9 @@ {l s='Refund ID'} + {l s='Total Rooms'} {l s='Status'} + {l s='Requested Date'} @@ -1074,6 +1076,9 @@ #{$return_info.id_order_return} + + {$return_info.total_rooms|escape:'html':'UTF-8'} + {capture name=refund_status} {if isset($return_info.payment_mode) && $return_info.payment_mode != ''}{l s='Payment Mode: '}{$return_info.payment_mode}
{/if} @@ -1108,6 +1113,9 @@ {$return_info.state_name} {/if} + + {$return_info.date_add} + {/foreach} diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 41623a56e..8a4cf796c 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -260,7 +260,12 @@ class OrderReturnCore extends ObjectModel if (!$context) { $context = Context::getContext(); } - $sql = 'SELECT * + $sql = 'SELECT *, orr.`date_add`, orr.`date_upd`, + ( + SELECT COUNT(ord.`id_order_return_detail`) + FROM `'._DB_PREFIX_.'order_return_detail` ord + WHERE ord.`id_order_return` = orr.`id_order_return` + ) AS total_rooms FROM `'._DB_PREFIX_.'order_return` orr LEFT JOIN `'._DB_PREFIX_.'order_slip` ors ON (ors.`id_order_slip` = orr.`id_return_type` AND orr.`return_type` = '.(int) self::RETURN_TYPE_ORDER_SLIP.') From 4a24510a04f977b503c0e8334671fac264446a3f Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 10 Mar 2023 14:36:16 +0530 Subject: [PATCH 3/5] updated getOrdersReturn function query --- classes/order/OrderReturn.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 8a4cf796c..c452f7cd8 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -260,20 +260,20 @@ class OrderReturnCore extends ObjectModel if (!$context) { $context = Context::getContext(); } - $sql = 'SELECT *, orr.`date_add`, orr.`date_upd`, - ( - SELECT COUNT(ord.`id_order_return_detail`) - FROM `'._DB_PREFIX_.'order_return_detail` ord - WHERE ord.`id_order_return` = orr.`id_order_return` - ) AS total_rooms - FROM `'._DB_PREFIX_.'order_return` orr - LEFT JOIN `'._DB_PREFIX_.'order_slip` ors - ON (ors.`id_order_slip` = orr.`id_return_type` AND orr.`return_type` = '.(int) self::RETURN_TYPE_ORDER_SLIP.') - WHERE orr.`id_customer` = '.(int)$customer_id. - ($only_customer ? ' AND orr.`by_admin` = 0' : ''). - ($order_id ? ' AND orr.`id_order` = '.(int)$order_id : ''). - ($no_denied ? ' AND orr.`state` != 4' : '').' - ORDER BY orr.`date_add` DESC'; + $sql = 'SELECT orr.`id_order`, orr.`state`, orr.`id_order_return`, orr.`payment_mode`, orr.`id_transaction`, + orr.`id_return_type`, orr.`return_type`, ors.`id_cart_rule`, orr.`date_add`, orr.`date_upd`, + COUNT(ord.`id_order_return_detail`) AS total_rooms + FROM `'._DB_PREFIX_.'order_return` orr + LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord + ON (ord.`id_order_return` = orr.`id_order_return`) + LEFT JOIN `'._DB_PREFIX_.'order_slip` ors + ON (ors.`id_order_slip` = orr.`id_return_type` AND orr.`return_type` = '.(int) self::RETURN_TYPE_ORDER_SLIP.') + WHERE orr.`id_customer` = '.(int)$customer_id. + ($only_customer ? ' AND orr.`by_admin` = 0' : ''). + ($order_id ? ' AND orr.`id_order` = '.(int)$order_id : ''). + ($no_denied ? ' AND orr.`state` != 4' : '').' + GROUP BY orr.`id_order_return` + ORDER BY orr.`date_add` DESC'; $data = Db::getInstance()->executeS($sql); foreach ($data as $k => $or) { $state = new OrderReturnState($or['state']); From cf8ebe79b2da12736acfa65b15c34892e4399f09 Mon Sep 17 00:00:00 2001 From: abhishek-webkul <84142535+abhishek-webkul@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:51:53 +0530 Subject: [PATCH 4/5] Update HotelOrderRefundRules.php --- .../classes/HotelOrderRefundRules.php | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php index 1a8b021d9..e0efe08d8 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php @@ -227,32 +227,35 @@ class HotelOrderRefundRules extends ObjectModel { $idLang = Context::getContext()->language->id; - $minDate = Db::getInstance()->getValue( - 'SELECT MIN(DATE(hbd.`date_from`)) + $maxDate = Db::getInstance()->getValue( + 'SELECT MAX(DATE(hbd.`date_from`)) FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = '.(int) $idOrder ); - if (!$minDate) { + if (!$maxDate) { return array(); } $dateToday = date('Y-m-d'); - if (strtotime($minDate) < strtotime($dateToday)) { // same day cancellation rules are allowed - $minDate = $dateToday; + if (strtotime($maxDate) < strtotime($dateToday)) { // same day cancellation rules are allowed + $maxDate = $dateToday; } - $days = HotelBookingDetail::getDays($dateToday, $minDate); + $days = HotelBookingDetail::getDays($dateToday, $maxDate); + $idHotel = HotelBookingDetail::getIdHotelByIdOrder($idOrder); - $sql = 'SELECT * + $sql = 'SELECT hrr.`id_hotel_refund_rule`, hrr.`id_refund_rule`, hrr.`id_hotel`, hrr.`position`, + orrl.`name`, orrl.`description`, orr.`payment_type`, orr.`deduction_value_full_pay`, orr.`deduction_value_adv_pay`, + orr.`days` FROM `'._DB_PREFIX_.'htl_branch_refund_rules` hrr LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules` orr ON (orr.`id_refund_rule` = hrr.`id_refund_rule`) LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules_lang` orrl ON (orrl.`id_refund_rule` = orr.`id_refund_rule` AND orrl.`id_lang` = '.(int) $idLang.') - WHERE orr.`days` <= '.(int) $days.' - ORDER BY orr.`days` DESC'; + WHERE orr.`days` <= '.(int) $days.' AND hrr.`id_hotel` = '.(int) $idHotel.' + ORDER BY hrr.`position`'; return Db::getInstance()->executeS($sql); } From 993764a19c3e6ec48a469ac70678d9eba9e0d8cb Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 20 Mar 2023 12:21:31 +0530 Subject: [PATCH 5/5] Update HotelOrderRefundRules.php query --- .../classes/HotelOrderRefundRules.php | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php index dbc191ce5..491c82c29 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRefundRules.php @@ -247,30 +247,33 @@ class HotelOrderRefundRules extends ObjectModel WHERE hbd.`id_order` = '.(int) $idOrder ); - if (!$maxDate) { - return array(); + if ($maxDate) { + $dateToday = date('Y-m-d'); + + if (strtotime($maxDate) >= strtotime($dateToday)) { + $days = HotelBookingDetail::getDays($dateToday, $maxDate); // always returns positive + + $sql = 'SELECT hbrr.`id_hotel_refund_rule`, hbrr.`id_refund_rule`, hbrr.`id_hotel`, hbrr.`position`, + horrl.`name`, horrl.`description`, horr.`payment_type`, horr.`deduction_value_full_pay`, + horr.`deduction_value_adv_pay`, horr.`days` + FROM `'._DB_PREFIX_.'htl_branch_refund_rules` hbrr + LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules` horr + ON (horr.`id_refund_rule` = hbrr.`id_refund_rule`) + LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules_lang` horrl + ON (horrl.`id_refund_rule` = horr.`id_refund_rule` AND horrl.`id_lang` = '.(int) $idLang.') + LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd + ON (hbd.`id_hotel` = hbrr.`id_hotel` AND hbd.`id_order` = '.(int) $idOrder.') + WHERE horr.`days` <= '.(int) $days.' + GROUP BY hbrr.`id_refund_rule` + ORDER BY hbrr.`position`'; + + if ($result = Db::getInstance()->executeS($sql)) { + return $result; + } + } } - $dateToday = date('Y-m-d'); + return array(); - if (strtotime($maxDate) < strtotime($dateToday)) { // same day cancellation rules are allowed - $maxDate = $dateToday; - } - - $days = HotelBookingDetail::getDays($dateToday, $maxDate); - $idHotel = HotelBookingDetail::getIdHotelByIdOrder($idOrder); - - $sql = 'SELECT hrr.`id_hotel_refund_rule`, hrr.`id_refund_rule`, hrr.`id_hotel`, hrr.`position`, - orrl.`name`, orrl.`description`, orr.`payment_type`, orr.`deduction_value_full_pay`, orr.`deduction_value_adv_pay`, - orr.`days` - FROM `'._DB_PREFIX_.'htl_branch_refund_rules` hrr - LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules` orr - ON (orr.`id_refund_rule` = hrr.`id_refund_rule`) - LEFT JOIN `'._DB_PREFIX_.'htl_order_refund_rules_lang` orrl - ON (orrl.`id_refund_rule` = orr.`id_refund_rule` AND orrl.`id_lang` = '.(int) $idLang.') - WHERE orr.`days` <= '.(int) $days.' AND hrr.`id_hotel` = '.(int) $idHotel.' - ORDER BY hrr.`position`'; - - return Db::getInstance()->executeS($sql); } }