From 4abc908c382829424d80fc348fe0f56b13e313a1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 16 Feb 2023 11:57:09 +0530 Subject: [PATCH 01/45] Fix IDOR at order detail page --- controllers/front/OrderDetailController.php | 158 ++++++++++---------- 1 file changed, 81 insertions(+), 77 deletions(-) diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index fdb54ae3a..022035839 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -163,93 +163,97 @@ class OrderDetailControllerCore extends FrontController $this->errors[] = Tools::displayError('Order ID required'); } else { $order = new Order($id_order); - // Here handle request from the ajax on order details page i.e refund, additional qty etc - $method = Tools::getValue('method'); - // extra demands popup ajax - if ($method == 'getRoomTypeBookingDemands') { - $extraDemandsTpl = ''; - if (($idProduct = Tools::getValue('id_product')) - && ($idOrder = Tools::getValue('id_order')) - && ($dateFrom = Tools::getValue('date_from')) - && ($dateTo = Tools::getValue('date_to')) - ) { - $objBookingDemand = new HotelBookingDemands(); - $useTax = 0; - $customer = Context::getContext()->customer; - if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) { - $useTax = 1; + if (Validate::isLoadedObject($order) && $order->id_customer == $this->context->customer->id) { + // Here handle request from the ajax on order details page i.e refund, additional qty etc + $method = Tools::getValue('method'); + // extra demands popup ajax + if ($method == 'getRoomTypeBookingDemands') { + $extraDemandsTpl = ''; + if (($idProduct = Tools::getValue('id_product')) + && ($idOrder = Tools::getValue('id_order')) + && ($dateFrom = Tools::getValue('date_from')) + && ($dateTo = Tools::getValue('date_to')) + ) { + $objBookingDemand = new HotelBookingDemands(); + $useTax = 0; + $customer = Context::getContext()->customer; + if (Group::getPriceDisplayMethod($customer->id_default_group) == PS_TAX_INC) { + $useTax = 1; + } + if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + $idProduct, + 0, + $dateFrom, + $dateTo, + 1, + 0, + $useTax + )) { + $this->context->smarty->assign( + array( + 'useTax' => $useTax, + 'extraDemands' => $extraDemands, + ) + ); + $extraDemandsTpl .= $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); + } } - if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - $idProduct, - 0, - $dateFrom, - $dateTo, - 1, - 0, - $useTax - )) { - $this->context->smarty->assign( - array( - 'useTax' => $useTax, - 'extraDemands' => $extraDemands, - ) - ); - $extraDemandsTpl .= $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); - } - } - die($extraDemandsTpl); - } elseif ($method == 'submitRefundRequest') { // room cancellation ajax - $hasError = 0; - if (!$refundReason = Tools::getValue('cancellation_reason')) { - $hasError = 1; - } elseif (!Validate::isCleanHtml($refundReason)) { - $hasError = 1; - } - if ($bookingRefunds = Tools::getValue('bookings_to_refund')) { - if (!count($bookingRefunds = json_decode($bookingRefunds, true))) { + die($extraDemandsTpl); + } elseif ($method == 'submitRefundRequest') { // room cancellation ajax + $hasError = 0; + if (!$refundReason = Tools::getValue('cancellation_reason')) { $hasError = 1; - } else { - foreach ($bookingRefunds as $idHtlBooking) { - if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { - $hasError = 1; - break; + } elseif (!Validate::isCleanHtml($refundReason)) { + $hasError = 1; + } + if ($bookingRefunds = Tools::getValue('bookings_to_refund')) { + if (!count($bookingRefunds = json_decode($bookingRefunds, true))) { + $hasError = 1; + } else { + foreach ($bookingRefunds as $idHtlBooking) { + if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { + $hasError = 1; + break; + } } } + } else { + $hasError = 1; } - } else { - $hasError = 1; - } - if (!$hasError) { - $objOrderReturn = new OrderReturn(); - $objOrderReturn->id_customer = $order->id_customer; - $objOrderReturn->id_order = $order->id; - $objOrderReturn->state = 0; - $objOrderReturn->by_admin = 0; - $objOrderReturn->question = $refundReason; - $objOrderReturn->save(); - if ($objOrderReturn->id) { - foreach ($bookingRefunds as $idHtlBooking) { - $objHtlBooking = new HotelBookingDetail($idHtlBooking); - $numDays = $objHtlBooking->getNumberOfDays( - $objHtlBooking->date_from, - $objHtlBooking->date_to - ); + if (!$hasError) { + $objOrderReturn = new OrderReturn(); + $objOrderReturn->id_customer = $order->id_customer; + $objOrderReturn->id_order = $order->id; + $objOrderReturn->state = 0; + $objOrderReturn->by_admin = 0; + $objOrderReturn->question = $refundReason; + $objOrderReturn->save(); + if ($objOrderReturn->id) { + foreach ($bookingRefunds as $idHtlBooking) { + $objHtlBooking = new HotelBookingDetail($idHtlBooking); + $numDays = $objHtlBooking->getNumberOfDays( + $objHtlBooking->date_from, + $objHtlBooking->date_to + ); - $objOrderReturnDetail = new OrderReturnDetail(); - $objOrderReturnDetail->id_order_return = $objOrderReturn->id; - $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail; - $objOrderReturnDetail->product_quantity = $numDays; - $objOrderReturnDetail->id_htl_booking = $idHtlBooking; - $objOrderReturnDetail->save(); + $objOrderReturnDetail = new OrderReturnDetail(); + $objOrderReturnDetail->id_order_return = $objOrderReturn->id; + $objOrderReturnDetail->id_order_detail = $objHtlBooking->id_order_detail; + $objOrderReturnDetail->product_quantity = $numDays; + $objOrderReturnDetail->id_htl_booking = $idHtlBooking; + $objOrderReturnDetail->save(); + } } - } - // Emails to customer, admin on refund request state change - $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); + // Emails to customer, admin on refund request state change + $objOrderReturn->changeIdOrderReturnState(Configuration::get('PS_ORS_PENDING')); - die(json_encode(array('status' => 1))); + die(json_encode(array('status' => 1))); + } + die(json_encode(array('status' => 0))); } + } else { die(json_encode(array('status' => 0))); } // END ajax request handle From 278328eea10ef655b7fcab832aa9acc56a901b1f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 17 Feb 2023 17:19:50 +0530 Subject: [PATCH 02/45] Check Booking ID when cancelling booking from front office --- controllers/front/OrderDetailController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 022035839..91c745776 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -213,7 +213,10 @@ class OrderDetailControllerCore extends FrontController $hasError = 1; } else { foreach ($bookingRefunds as $idHtlBooking) { - if (OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking)) { + $objHotelBookingDetail = new HotelBookingDetail($idHtlBooking); + if ($objHotelBookingDetail->id_customer == $order->id_customer + || OrderReturn::getOrdersReturnDetail($order->id, 0, $idHtlBooking) + ) { $hasError = 1; break; } From e841cc6d491ffff6b28fff6ba2d56ab16bf6ec5b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 23 Feb 2023 15:30:03 +0530 Subject: [PATCH 03/45] Resolve merge conflicts --- controllers/front/OrderDetailController.php | 365 ++++++++++++++------ 1 file changed, 252 insertions(+), 113 deletions(-) diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 91c745776..ad57e8ae5 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -168,7 +168,7 @@ class OrderDetailControllerCore extends FrontController $method = Tools::getValue('method'); // extra demands popup ajax if ($method == 'getRoomTypeBookingDemands') { - $extraDemandsTpl = ''; + $response = array('reload' => false); if (($idProduct = Tools::getValue('id_product')) && ($idOrder = Tools::getValue('id_order')) && ($dateFrom = Tools::getValue('date_from')) @@ -196,11 +196,28 @@ class OrderDetailControllerCore extends FrontController 'extraDemands' => $extraDemands, ) ); - $extraDemandsTpl .= $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); } + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $idOrder, + 0, + 0, + $idProduct, + $dateFrom, + $dateTo, + 0, + 0, + $useTax + )) { + $this->context->smarty->assign(array( + 'useTax' => $useTax, + 'additionalServices' => $additionalServices, + )); + } + $response['extra_demands'] = $this->context->smarty->fetch(_PS_THEME_DIR_.'_partials/order_booking_demands.tpl'); } - die($extraDemandsTpl); + die(json_encode($response)); } elseif ($method == 'submitRefundRequest') { // room cancellation ajax $hasError = 0; if (!$refundReason = Tools::getValue('cancellation_reason')) { @@ -290,150 +307,270 @@ class OrderDetailControllerCore extends FrontController //by webkul to show order details properly on order history page - if (Module::isInstalled('hotelreservationsystem')) { - include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - $objHtlBranchInfo = new HotelBranchInformation(); + // if (Module::isInstalled('hotelreservationsystem')) { + // include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; + // $objHtlBranchInfo = new HotelBranchInformation(); $objBookingDetail = new HotelBookingDetail(); $objRoomType = new HotelRoomType(); $objBookingDemand = new HotelBookingDemands(); + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); $nonRequestedRooms = 1; $anyBackOrder = 0; $processedProducts = array(); $cartHotelData = array(); + $cartServiceProducts = array(); $total_demands_price_te = 0; $total_demands_price_ti = 0; - + $total_convenience_fee_te = 0; + $total_convenience_fee_ti = 0; if (!empty($products)) { foreach ($products as $type_key => $type_value) { if (in_array($type_value['product_id'], $processedProducts)) { continue; } - $processedProducts[] = $type_value['product_id']; + if ($type_value['is_booking_product']) { + $processedProducts[] = $type_value['product_id']; - $product = new Product($type_value['product_id'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['product_id']); + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); - if (!empty($cover_image_arr)) { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); - } else { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); - } - - if (isset($customer->id)) { - $obj_cart = new Cart($order->id_cart); - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); - } else { - $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); - } - $rm_dtl = $objRoomType->getRoomTypeInfoByIdProduct($type_value['product_id']); - $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; - $cartHotelData[$type_key]['cover_img'] = $cover_img; - - $objBookingDemand = new HotelBookingDemands(); - foreach ($order_bk_data as $data_k => $data_v) { - $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); - - /*Product price when order was created*/ - $order_details_obj = new OrderDetail($data_v['id_order_detail']); - $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; - $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; - $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; - - if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; - - $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; - } + if (!empty($cover_image_arr)) { + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); } else { - $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; - $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; - $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; - $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + } - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; - $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; - if ($data_v['is_back_order']) { - $anyBackOrder = 1; + if (isset($customer->id)) { + $obj_cart = new Cart($order->id_cart); + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $obj_cart->id_guest, $type_value['product_id'], $customer->id); + } else { + $order_bk_data = $objBookingDetail->getOnlyOrderBookingData($order->id, $customer->id_guest, $type_value['product_id']); + } + $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; + $cartHotelData[$type_key]['cover_img'] = $cover_img; + + + $objBookingDemand = new HotelBookingDemands(); + foreach ($order_bk_data as $data_k => $data_v) { + $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); + + $cartHotelData[$type_key]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['children'] = $data_v['children']; + /*Product price when order was created*/ + $order_details_obj = new OrderDetail($data_v['id_order_detail']); + $cartHotelData[$type_key]['name'] = $order_details_obj->product_name; + $cartHotelData[$type_key]['paid_unit_price_tax_excl'] = ($order_details_obj->total_price_tax_excl)/$order_details_obj->product_quantity; + $cartHotelData[$type_key]['paid_unit_price_tax_incl'] = ($order_details_obj->total_price_tax_incl)/$order_details_obj->product_quantity; + + if (isset($cartHotelData[$type_key]['date_diff'][$date_join])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] += 1; + + $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; + $var_quant = (int) $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] += $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] += $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } + } else { + $num_days = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); + $cartHotelData[$type_key]['date_diff'][$date_join]['num_rm'] = 1; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; + $cartHotelData[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; + $cartHotelData[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; + $cartHotelData[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_incl']/$num_days; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_incl'] = $data_v['total_price_tax_incl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['amount_tax_excl'] = $data_v['total_price_tax_excl']; + $cartHotelData[$type_key]['date_diff'][$date_join]['is_backorder'] = $data_v['is_back_order']; + if ($data_v['is_back_order']) { + $anyBackOrder = 1; + } } + + $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; + + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + 0, + $data_v['date_from'], + $data_v['date_to'] + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( + $id_order, + $type_value['product_id'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 0 + ); + $total_demands_price_ti += $extraDemandPriceTI; + $total_demands_price_te += $extraDemandPriceTE; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; + $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; + + $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); + $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; + + $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; + // add additional services products in hotel detail. + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'] + ); + + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_ti'] += $additionalServicesPriceTI = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1 + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_te'] += $additionalServicesPriceTE = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0 + ); } - - $cartHotelData[$type_key]['date_diff'][$date_join]['ids_htl_booking_detail'][] = $data_v['id']; - - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + // get auto added price to be displayed with room price + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( $id_order, - $type_value['product_id'], 0, - $data_v['date_from'], - $data_v['date_to'] - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] += $extraDemandPriceTI = $objBookingDemand->getRoomTypeBookingExtraDemands( - $id_order, + 0, $type_value['product_id'], - $data_v['id_room'], $data_v['date_from'], $data_v['date_to'], - 0, - 1, - 1 - ); - if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'])) { - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = 0; - } - $cartHotelData[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] += $extraDemandPriceTE = $objBookingDemand->getRoomTypeBookingExtraDemands( - $id_order, - $type_value['product_id'], $data_v['id_room'], + 1, + 1, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + if (empty($cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'])) { + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; + } + $cartHotelData[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + 0, + 0, + $type_value['product_id'], $data_v['date_from'], $data_v['date_to'], + $data_v['id_room'], + 1, 0, 1, - 0 + Product::PRICE_ADDITION_TYPE_WITH_ROOM ); - $total_demands_price_ti += $extraDemandPriceTI; - $total_demands_price_te += $extraDemandPriceTE; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_excl'] = $order_details_obj->unit_price_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_tax_incl'] = $order_details_obj->unit_price_tax_incl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_excl'] = $order_details_obj->unit_price_tax_excl + $order_details_obj->reduction_amount_tax_excl; - $cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] = $order_details_obj->unit_price_tax_incl + $order_details_obj->reduction_amount_tax_incl; + // calculate averages now + foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { + $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); + $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); - $feature_price_diff = (float)($cartHotelData[$type_key]['date_diff'][$date_join]['product_price_without_reduction_tax_incl'] - $cartHotelData[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']); - $cartHotelData[$type_key]['date_diff'][$date_join]['feature_price_diff'] = $feature_price_diff; + $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); + $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); + } + } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) { + if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) { + $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1 + ); + $total_convenience_fee_te += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $id_order, + $type_value['product_id'], + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1 + ); + } + } else { + // get all products that are independent. + if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITHOUT_ROOMTYPE) { + $product = new Product($type_value['product_id'], false, $this->context->language->id); + $cover_image_arr = $product->getCover($type_value['product_id']); - $cartHotelData[$type_key]['hotel_name'] = $data_v['hotel_name']; + if (!empty($cover_image_arr)) { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); + } else { + $type_value['cover_img'] = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); + } + $cartServiceProducts[] = $type_value; + } } - // calculate averages now - foreach ($cartHotelData[$type_key]['date_diff'] as $key => &$value) { - $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); - $value['avg_paid_unit_price_tax_incl'] = Tools::ps_round($value['avg_paid_unit_price_tax_incl'] / $value['num_rm'], 6); - $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6)); - $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6)); - } } $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); @@ -442,6 +579,8 @@ class OrderDetailControllerCore extends FrontController array( 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), 'THEME_DIR' => _THEME_DIR_, + 'total_convenience_fee_ti' => $total_convenience_fee_ti, + 'total_convenience_fee_te' => $total_convenience_fee_te, 'total_demands_price_ti' => $total_demands_price_ti, 'total_demands_price_te' => $total_demands_price_te, 'any_back_order' => $anyBackOrder, @@ -449,10 +588,11 @@ class OrderDetailControllerCore extends FrontController 'back_ord_msg' => Configuration::get('WK_BO_MESSAGE'), 'order_has_invoice' => $order->hasInvoice(), 'cart_htl_data' => $cartHotelData, + 'cart_service_products' => $cartServiceProducts, 'non_requested_rooms' => $nonRequestedRooms, ) ); - } + // } $objOrderReturn = new OrderReturn(); $refundedAmount = 0; @@ -468,7 +608,6 @@ class OrderDetailControllerCore extends FrontController 'refundReqBookings' => $refundReqBookings, 'hasCompletelyRefunded' => $order->hasCompletelyRefunded(), 'refundedAmount' => $refundedAmount, - 'shop_name' => strval(Configuration::get('PS_SHOP_NAME')), 'order' => $order, 'guestInformations' => (array)new Customer($order->id_customer), From ddde0e35f777957e8bc4a1b62b1010d8849730bd Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 15:19:30 +0530 Subject: [PATCH 04/45] Fix js minification issue --- js/daterangepicker/moment.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/daterangepicker/moment.min.js b/js/daterangepicker/moment.min.js index 3427886d1..02f30abfd 100644 --- a/js/daterangepicker/moment.min.js +++ b/js/daterangepicker/moment.min.js @@ -1,2 +1,2 @@ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var H;function f(){return H.apply(null,arguments)}function a(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function F(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function c(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function L(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;for(var t in e)if(c(e,t))return;return 1}function o(e){return void 0===e}function u(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function V(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function G(e,t){for(var n=[],s=e.length,i=0;i>>0,s=0;sAe(e)?(r=e+1,t-Ae(e)):(r=e,t);return{year:r,dayOfYear:n}}function qe(e,t,n){var s,i,r=ze(e.year(),t,n),r=Math.floor((e.dayOfYear()-r-1)/7)+1;return r<1?s=r+P(i=e.year()-1,t,n):r>P(e.year(),t,n)?(s=r-P(e.year(),t,n),i=e.year()+1):(i=e.year(),s=r),{week:s,year:i}}function P(e,t,n){var s=ze(e,t,n),t=ze(e+1,t,n);return(Ae(e)-s+t)/7}s("w",["ww",2],"wo","week"),s("W",["WW",2],"Wo","isoWeek"),t("week","w"),t("isoWeek","W"),n("week",5),n("isoWeek",5),v("w",p),v("ww",p,w),v("W",p),v("WW",p,w),Te(["w","ww","W","WW"],function(e,t,n,s){t[s.substr(0,1)]=g(e)});function Be(e,t){return e.slice(t,7).concat(e.slice(0,t))}s("d",0,"do","day"),s("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),s("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),s("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),s("e",0,0,"weekday"),s("E",0,0,"isoWeekday"),t("day","d"),t("weekday","e"),t("isoWeekday","E"),n("day",11),n("weekday",11),n("isoWeekday",11),v("d",p),v("e",p),v("E",p),v("dd",function(e,t){return t.weekdaysMinRegex(e)}),v("ddd",function(e,t){return t.weekdaysShortRegex(e)}),v("dddd",function(e,t){return t.weekdaysRegex(e)}),Te(["dd","ddd","dddd"],function(e,t,n,s){s=n._locale.weekdaysParse(e,s,n._strict);null!=s?t.d=s:m(n).invalidWeekday=e}),Te(["d","e","E"],function(e,t,n,s){t[s]=g(e)});var Je="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Qe="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Xe="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ke=k,et=k,tt=k;function nt(){function e(e,t){return t.length-e.length}for(var t,n,s,i=[],r=[],a=[],o=[],u=0;u<7;u++)s=l([2e3,1]).day(u),t=M(this.weekdaysMin(s,"")),n=M(this.weekdaysShort(s,"")),s=M(this.weekdays(s,"")),i.push(t),r.push(n),a.push(s),o.push(t),o.push(n),o.push(s);i.sort(e),r.sort(e),a.sort(e),o.sort(e),this._weekdaysRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+r.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+i.join("|")+")","i")}function st(){return this.hours()%12||12}function it(e,t){s(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function rt(e,t){return t._meridiemParse}s("H",["HH",2],0,"hour"),s("h",["hh",2],0,st),s("k",["kk",2],0,function(){return this.hours()||24}),s("hmm",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)}),s("hmmss",0,0,function(){return""+st.apply(this)+r(this.minutes(),2)+r(this.seconds(),2)}),s("Hmm",0,0,function(){return""+this.hours()+r(this.minutes(),2)}),s("Hmmss",0,0,function(){return""+this.hours()+r(this.minutes(),2)+r(this.seconds(),2)}),it("a",!0),it("A",!1),t("hour","h"),n("hour",13),v("a",rt),v("A",rt),v("H",p),v("h",p),v("k",p),v("HH",p,w),v("hh",p,w),v("kk",p,w),v("hmm",ge),v("hmmss",we),v("Hmm",ge),v("Hmmss",we),D(["H","HH"],x),D(["k","kk"],function(e,t,n){e=g(e);t[x]=24===e?0:e}),D(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),D(["h","hh"],function(e,t,n){t[x]=g(e),m(n).bigHour=!0}),D("hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s)),m(n).bigHour=!0}),D("hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i)),m(n).bigHour=!0}),D("Hmm",function(e,t,n){var s=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s))}),D("Hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[x]=g(e.substr(0,s)),t[T]=g(e.substr(s,2)),t[N]=g(e.substr(i))});k=de("Hours",!0);var at,ot={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Ce,monthsShort:Ue,week:{dow:0,doy:6},weekdays:Je,weekdaysMin:Xe,weekdaysShort:Qe,meridiemParse:/[ap]\.?m?\.?/i},R={},ut={};function lt(e){return e&&e.toLowerCase().replace("_","-")}function ht(e){for(var t,n,s,i,r=0;r=t&&function(e,t){for(var n=Math.min(e.length,t.length),s=0;s=t-1)break;t--}r++}return at}function dt(t){var e;if(void 0===R[t]&&"undefined"!=typeof module&&module&&module.exports&&null!=t.match("^[^/\\\\]*$"))try{e=at._abbr,require("./locale/"+t),ct(e)}catch(e){R[t]=null}return R[t]}function ct(e,t){return e&&((t=o(t)?mt(e):ft(e,t))?at=t:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),at._abbr}function ft(e,t){if(null===t)return delete R[e],null;var n,s=ot;if(t.abbr=e,null!=R[e])Q("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=R[e]._config;else if(null!=t.parentLocale)if(null!=R[t.parentLocale])s=R[t.parentLocale]._config;else{if(null==(n=dt(t.parentLocale)))return ut[t.parentLocale]||(ut[t.parentLocale]=[]),ut[t.parentLocale].push({name:e,config:t}),null;s=n._config}return R[e]=new K(X(s,t)),ut[e]&&ut[e].forEach(function(e){ft(e.name,e.config)}),ct(e),R[e]}function mt(e){var t;if(!(e=e&&e._locale&&e._locale._abbr?e._locale._abbr:e))return at;if(!a(e)){if(t=dt(e))return t;e=[e]}return ht(e)}function _t(e){var t=e._a;return t&&-2===m(e).overflow&&(t=t[O]<0||11We(t[Y],t[O])?b:t[x]<0||24P(r,u,l)?m(s)._overflowWeeks=!0:null!=h?m(s)._overflowWeekday=!0:(d=$e(r,a,o,u,l),s._a[Y]=d.year,s._dayOfYear=d.dayOfYear)),null!=e._dayOfYear&&(i=bt(e._a[Y],n[Y]),(e._dayOfYear>Ae(i)||0===e._dayOfYear)&&(m(e)._overflowDayOfYear=!0),h=Ze(i,0,e._dayOfYear),e._a[O]=h.getUTCMonth(),e._a[b]=h.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=c[t]=n[t];for(;t<7;t++)e._a[t]=c[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[x]&&0===e._a[T]&&0===e._a[N]&&0===e._a[Ne]&&(e._nextDay=!0,e._a[x]=0),e._d=(e._useUTC?Ze:je).apply(null,c),r=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[x]=24),e._w&&void 0!==e._w.d&&e._w.d!==r&&(m(e).weekdayMismatch=!0)}}function Tt(e){if(e._f===f.ISO_8601)St(e);else if(e._f===f.RFC_2822)Ot(e);else{e._a=[],m(e).empty=!0;for(var t,n,s,i,r,a=""+e._i,o=a.length,u=0,l=ae(e._f,e._locale).match(te)||[],h=l.length,d=0;de.valueOf():e.valueOf()"}),i.toJSON=function(){return this.isValid()?this.toISOString():null},i.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},i.unix=function(){return Math.floor(this.valueOf()/1e3)},i.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},i.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},i.eraName=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;nthis.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},i.isLocal=function(){return!!this.isValid()&&!this._isUTC},i.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},i.isUtc=At,i.isUTC=At,i.zoneAbbr=function(){return this._isUTC?"UTC":""},i.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},i.dates=e("dates accessor is deprecated. Use date instead.",ke),i.months=e("months accessor is deprecated. Use month instead",Ge),i.years=e("years accessor is deprecated. Use year instead",Ie),i.zone=e("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,t){return null!=e?(this.utcOffset(e="string"!=typeof e?-e:e,t),this):-this.utcOffset()}),i.isDSTShifted=e("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!o(this._isDSTShifted))return this._isDSTShifted;var e,t={};return $(t,this),(t=Nt(t))._a?(e=(t._isUTC?l:W)(t._a),this._isDSTShifted=this.isValid()&&0 Date: Fri, 24 Feb 2023 15:58:34 +0530 Subject: [PATCH 05/45] Fix cancel request issue --- classes/order/OrderReturn.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 41623a56e..10c549b4e 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -219,13 +219,13 @@ class OrderReturnCore extends ObjectModel 0 ); $bookingRow['additional_services_tax_excl'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, + $bookingRow['id_order'], 0, 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], + $bookingRow['id_product'], + $bookingRow['date_from'], + $bookingRow['date_to'], + $bookingRow['id_room'], 1, 0 ); From f22b1dcf527c426b76fb242e468fab6ab1b554eb Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 16:22:18 +0530 Subject: [PATCH 06/45] Fix email --- mails/en/credit_slip.html | 2 +- mails/en/credit_slip.txt | 2 +- .../controllers/admin/AdminOrderRefundRequestsController.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mails/en/credit_slip.html b/mails/en/credit_slip.html index 6699fa084..f7a8ded54 100644 --- a/mails/en/credit_slip.html +++ b/mails/en/credit_slip.html @@ -102,7 +102,7 @@ - You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop. + You can review this credit slip and download your invoice from the "My credit slips" section of your account by clicking "My account" on our shop. diff --git a/mails/en/credit_slip.txt b/mails/en/credit_slip.txt index ea3727f85..f0c1422ea 100644 --- a/mails/en/credit_slip.txt +++ b/mails/en/credit_slip.txt @@ -7,7 +7,7 @@ We have generated a credit slip in your name for order with the reference {order_name}. You can review this credit slip and download your invoice from the -"My credit slips" [/{history_url}] section of your account by clicking +"My credit slips" [/{credit_slip_url}] section of your account by clicking "My account" [/{my_account_url}] on our shop. {shop_name} [/{shop_url}] powered by Webkul(tm) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 9bad576c7..ee2af9910 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -448,6 +448,8 @@ class AdminOrderRefundRequestsController extends ModuleAdminController Hook::exec('actionOrderSlipAdd', array('order' => $objOrder, 'bookingList' => $bookingList)); + $params['{credit_slip_url}'] = $this->context->link->getPageLink('order-slip', true); + @Mail::Send( (int)$objOrder->id_lang, 'credit_slip', From 1bb0e35085bea3da7aaac143d93a1245de53be0b Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 17:31:38 +0530 Subject: [PATCH 07/45] Fix Operations Today --- modules/dashguestcycle/dashguestcycle.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php index a012b2b8b..7eb15b98e 100644 --- a/modules/dashguestcycle/dashguestcycle.php +++ b/modules/dashguestcycle/dashguestcycle.php @@ -170,7 +170,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $arrivalInfo['adult'] + $arrivalInfo['children'], + 'value' => $arrivalInfo['adults'] + $arrivalInfo['children'], 'class' => 'text-center', ); $tr[] = array( @@ -230,7 +230,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $departureInfo['adult'] + $departureInfo['children'], + 'value' => $departureInfo['adults'] + $departureInfo['children'], 'class' => 'text-center', ); $tr[] = array( @@ -291,7 +291,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $inHouseInfo['adult'] + $inHouseInfo['children'], + 'value' => $inHouseInfo['adults'] + $inHouseInfo['children'], 'class' => 'text-center', ); $tr[] = array( From 7a20fd535f85dd02ce061bfbf8753a7123267571 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 17:43:16 +0530 Subject: [PATCH 08/45] Preparation time text change --- controllers/admin/AdminOrderPreferencesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 5d75b728f..e1c53fd2d 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -72,7 +72,7 @@ class AdminOrderPreferencesControllerCore extends AdminController ), 'GLOBAL_PREPARATION_TIME' => array( 'title' => $this->l('Preparation time'), - 'hint' => $this->l('Number of days required to prepare a room for stay.'), + 'hint' => $this->l('Number of days required to prepare a room for a guest\'s stay. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book rooms for dates from and after 3 days, i.e, 5th of March.'), 'desc' => $this->l('Set to 0 to disable this feature.'), 'type' => 'text', 'class' => 'fixed-width-xl', From bda0b5d48d1b755e20c0af535dc765bd283ec179 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Fri, 24 Feb 2023 18:59:28 +0530 Subject: [PATCH 09/45] totalAvailableRooms issue resolved on room detail page --- controllers/front/ProductController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index a97a90577..82b8c764f 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -603,6 +603,7 @@ class ProductControllerCore extends FrontController $quantity = 1; } + $totalAvailableRooms = 0; if ($hotelRoomData = $objBookingDetail->DataForFrontSearch($bookingParams)) { $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; $quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity; From cefd2c52c90d05f104d0926d588a9896a0dddb9a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 19:07:21 +0530 Subject: [PATCH 10/45] Add statsdata module note --- modules/statscatalog/statscatalog.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/statscatalog/statscatalog.php b/modules/statscatalog/statscatalog.php index 199149606..a91052559 100644 --- a/modules/statscatalog/statscatalog.php +++ b/modules/statscatalog/statscatalog.php @@ -282,6 +282,12 @@ class StatsCatalog extends Module

'.$this->l('Defines the average conversion rate for the room type page. It is possible to book a room type without viewing the room type page, so this rate can be greater than 1.').' +

'; + + $link = $this->context->link->getAdminLink('AdminModules').'&configure=statsdata'; + $html .=' +

+ '.$this->l('Note: ').''.$this->l('You must enable the "Save global page views" option from ').'Data mining for statistics'.$this->l(' module for accurate data, or use the QloApps Google Analytics module.').'

'; From c6a98546d0c495651cfce0c0efef3fefa62216a4 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 24 Feb 2023 19:31:07 +0530 Subject: [PATCH 11/45] Change Geolocation file link --- controllers/admin/AdminGeolocationController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminGeolocationController.php b/controllers/admin/AdminGeolocationController.php index 0fbb808a1..4c960a331 100644 --- a/controllers/admin/AdminGeolocationController.php +++ b/controllers/admin/AdminGeolocationController.php @@ -139,9 +139,9 @@ class AdminGeolocationControllerCore extends AdminController { $this->display = 'options'; if (!$this->isGeoLiteCityAvailable()) { - $this->displayWarning($this->l('In order to use Geolocation, please download').' - '.$this->l('this file').' '. - $this->l('and extract it (using Winrar or Gzip) into the /tools/geoip/ directory.')); + $this->displayWarning($this->l('In order to use Geolocation, please download the file').' + GeoLiteCity.dat '. + $this->l('from GitHub and copy into the /tools/geoip/ directory.')); Configuration::updateValue('PS_GEOLOCATION_ENABLED', 0); } From b53706a53e1ded76614849ab7d1ba889b71c5f98 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Mon, 27 Feb 2023 14:49:49 +0530 Subject: [PATCH 12/45] Fixed hotel image issue on room type page --- controllers/front/ProductController.php | 7 +++++-- themes/hotel-reservation-theme/css/product.css | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index a97a90577..83eec473b 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -357,11 +357,12 @@ class ProductControllerCore extends FrontController // booking preparation time $preparationTime = (int) HotelOrderRestrictDate::getPreparationTime($hotel_id); + $objHotelImage = new HotelImage(); $hotelImageLink = null; if ($coverImage = HotelImage::getCover($hotel_id)) { $hotelImagesBaseDir = _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_img/'; $hotelImageLink = $this->context->link->getMediaLink( - $hotelImagesBaseDir.$coverImage['hotel_image_id'].'.jpg' + $objHotelImage->getImageLink($coverImage['id'], ImageType::getFormatedName('large')) ); } @@ -603,6 +604,7 @@ class ProductControllerCore extends FrontController $quantity = 1; } + $totalAvailableRooms = 0; if ($hotelRoomData = $objBookingDetail->DataForFrontSearch($bookingParams)) { $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; $quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity; @@ -1244,7 +1246,8 @@ class ProductControllerCore extends FrontController $hotelImagesBaseDir = _MODULE_DIR_.'hotelreservationsystem/views/img/hotel_img/'; foreach ($hotelImages as &$hotelImage) { $hotelImage['link'] = $this->context->link->getMediaLink( - $hotelImagesBaseDir.$hotelImage['hotel_image_id'].'.jpg' + $objHotelImage->getImageLink($hotelImage['id'], + ImageType::getFormatedName('large')) ); } diff --git a/themes/hotel-reservation-theme/css/product.css b/themes/hotel-reservation-theme/css/product.css index 105900873..3ce47bf0f 100644 --- a/themes/hotel-reservation-theme/css/product.css +++ b/themes/hotel-reservation-theme/css/product.css @@ -1689,7 +1689,8 @@ ul.service-product-nav > li:hover { height: 200px; border-radius: 4px; object-fit: cover; - transition: all 0.2s; } + transition: all 0.2s; + box-shadow: #00000029 0px 0px 2px 1px; } #room_info_hotel_images .image-item img:hover { transform: scale(1.05); } From 7801e0469aa18cad8b73d44572de3d236947e990 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 27 Feb 2023 16:20:02 +0530 Subject: [PATCH 13/45] Fix Stats > Stats issues --- modules/statscheckup/statscheckup.php | 11 ----------- modules/statsforecast/statsforecast.php | 2 +- modules/statsproduct/statsproduct.php | 16 ++-------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index 132a933bf..5192a3d48 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -280,17 +280,6 @@ class StatsCheckUp extends Module ); foreach ($result as $row) { - $row['stock'] = 0; - if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($row['id_product'])) { - $bookingParams['hotel_id'] = $roomTypeInfo['id_hotel']; - $bookingParams['id_room_type'] = $row['id_product']; - if ($booking_data = $objBookingDtl->getBookingData($bookingParams)) { - if (isset($booking_data['stats']['num_avail'])) { - $row['stock'] = $booking_data['stats']['num_avail']; - } - } - } - $totals['products']++; $scores = array( 'active' => ($row['active'] ? 2 : 0), diff --git a/modules/statsforecast/statsforecast.php b/modules/statsforecast/statsforecast.php index 426ff4cf9..b4744b6c2 100644 --- a/modules/statsforecast/statsforecast.php +++ b/modules/statsforecast/statsforecast.php @@ -240,7 +240,7 @@ class StatsForecast extends Module $this->html .= ' - '.($this->context->cookie->stats_granularity == 42 ? (Tools::displayDate($row['fix_date']).' - '.Tools::displayDate($row['end_date'])) : Tools::displayDate($row['fix_date'])).' + '.($this->context->cookie->stats_granularity == 42 ? (Tools::displayDate($row['fix_date']).' - '.Tools::displayDate($row['end_date'])) : $row['fix_date']).' '.$visits_today.' '.(int)$row['registrations'].' '.(int)$row['countOrders'].' diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 53aff5c72..3c03159e0 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -302,20 +302,8 @@ class StatsProduct extends ModuleGraph '; - $bookingParams = array(); - $bookingParams['date_from'] = $dateFrom; - $bookingParams['date_to'] = $dateTo; - foreach ($this->getProducts($this->context->language->id) as $product) { - $availRooms = 0; - if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { - $bookingParams['hotel_id'] = $roomTypeInfo['id_hotel']; - $bookingParams['id_room_type'] = $product['id_product']; - if ($booking_data = $objBookingDtl->getBookingData($bookingParams)) { - if (isset($booking_data['stats']['num_avail'])) { - $availRooms = $booking_data['stats']['num_avail']; - } - } - } + // get room types info + foreach ($this->getProducts() as $product) { $this->html .= ' From 420f77bec1c29c95afab1925357a6346d38af962 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 27 Feb 2023 16:41:39 +0530 Subject: [PATCH 14/45] Fix Purchased References --- controllers/admin/AdminStatsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 8a75a6383..8e30ebf28 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -284,7 +284,7 @@ class AdminStatsControllerCore extends AdminStatsTabController if (!$distinct_products) { return '0%'; } - return round(100 * $distinct_products / AdminStatsController::getTotalProducts()).'%'; + return round(100 * $distinct_products / AdminStatsController::getTotalRoomTypes()).'%'; } public static function getOrders($date_from, $date_to, $granularity = false, $id_hotel = false) From 2a51b07b8aa7c15165d0eebd9fa1bc19ac960ecf Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 27 Feb 2023 17:32:49 +0530 Subject: [PATCH 15/45] Fix Unknown customer age --- modules/statspersonalinfos/statspersonalinfos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/statspersonalinfos/statspersonalinfos.php b/modules/statspersonalinfos/statspersonalinfos.php index 1a7513894..6389d2255 100644 --- a/modules/statspersonalinfos/statspersonalinfos.php +++ b/modules/statspersonalinfos/statspersonalinfos.php @@ -324,7 +324,7 @@ class StatsPersonalInfos extends ModuleGraph // Total unknown $sql = 'SELECT COUNT(`id_customer`) as total FROM `'._DB_PREFIX_.'customer` - WHERE `birthday` IS NULL + WHERE `birthday` = "0000-00-00" '.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); if (isset($result['total']) && $result['total']) { From 75eef294c0e116cc819f955a1a2f9cc3fe679c68 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 27 Feb 2023 19:18:46 +0530 Subject: [PATCH 16/45] Fix DRR on dashboard --- controllers/admin/AdminStatsController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 8a75a6383..75d7a7160 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1665,9 +1665,10 @@ class AdminStatsControllerCore extends AdminStatsTabController $dateTo = date('Y-m-d', strtotime('+1 day', strtotime($dateTo))); } - $sql = 'SELECT SUM(total_paid_tax_excl) + $sql = 'SELECT SUM(total_paid_tax_excl - refunded_amount) FROM ( SELECT o.`id_order`, o.`total_paid_tax_excl` / o.`conversion_rate` AS total_paid_tax_excl, + IFNULL(orr.`refunded_amount`, 0) AS refunded_amount, (SELECT hbd.`id_hotel` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`id_order` = o.`id_order` LIMIT 1 @@ -1677,6 +1678,8 @@ class AdminStatsControllerCore extends AdminStatsTabController ON (hbd.`id_order` = o.`id_order`) INNER JOIN `'._DB_PREFIX_.'htl_branch_info` hbi ON (hbi.`id` = hbd.`id_hotel`) + LEFT JOIN `' ._DB_PREFIX_.'order_return` orr + ON (orr.`id_order` = o.`id_order`) WHERE o.`valid` = 1 AND hbi.`active` = 1 AND hbd.`is_refunded` = 0 AND o.`invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59" AND o.`source` = "'.pSQL(Configuration::get('PS_SHOP_DOMAIN')).'"'. From cf2d5d657faf7d83c6675832b459afeb86beaca8 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 27 Feb 2023 19:28:13 +0530 Subject: [PATCH 17/45] updated category quantity field view --- .../hotel-reservation-theme/_partials/quantity_field.tpl | 2 +- themes/hotel-reservation-theme/css/category.css | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/themes/hotel-reservation-theme/_partials/quantity_field.tpl b/themes/hotel-reservation-theme/_partials/quantity_field.tpl index 08cb53f9a..e285af842 100644 --- a/themes/hotel-reservation-theme/_partials/quantity_field.tpl +++ b/themes/hotel-reservation-theme/_partials/quantity_field.tpl @@ -17,7 +17,7 @@ * @license LICENSE.txt *} -
+
diff --git a/themes/hotel-reservation-theme/css/category.css b/themes/hotel-reservation-theme/css/category.css index faaa81fa2..370a352e6 100644 --- a/themes/hotel-reservation-theme/css/category.css +++ b/themes/hotel-reservation-theme/css/category.css @@ -195,13 +195,11 @@ p.capa_txt { { text-align: right; } + .rm_qty_cont { + margin-bottom: 0; + } } -.rm_qty_cont -{ - width: 120px; - margin-right: 15px; -} .qty_txt { color: #333333; From a35999f4387ee61284032062654f4cb27ce77c56 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Mon, 27 Feb 2023 19:37:58 +0530 Subject: [PATCH 18/45] resolved text-issues --- .../controllers/dashboard/helpers/view/view.tpl | 12 ++++++------ .../controllers/products/additionalfacilities.tpl | 4 ++-- .../template/controllers/products/occupancy.tpl | 4 +++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl index 3b54c23d5..593acfed7 100644 --- a/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -129,15 +129,15 @@

{l s="Help Center"}

{l s="Official Documentation"}
-
{l s="Qloapps User Guide"}
+
{l s="QloApps User Guide"}
-
{l s="Qloapps Forum"}
-
{l s="Connect with the Qloapps community"}
+
{l s="QloApps Forum"}
+
{l s="Connect with the QloApps community"}
-
{l s="Qloapps Addons"}
-
{l s="Enhance your store Qloapps modules"}
+
{l s="QloApps Addons"}
+
{l s="Enhance your store QloApps modules"}
{l s="Contact Us!"}
@@ -148,4 +148,4 @@
- + \ No newline at end of file diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl index 184db5f77..f3f6ee91f 100644 --- a/admin/themes/default/template/controllers/products/additionalfacilities.tpl +++ b/admin/themes/default/template/controllers/products/additionalfacilities.tpl @@ -24,7 +24,7 @@ {l s='Room Type Additional Facilities'}
- {l s='To create new Additiona facilities '} {l s='click here.'} + {l s='To create new Additional facilities'} {l s='click here.'}
{if isset($allDemands) && $allDemands}
@@ -112,4 +112,4 @@
{/if} -{/if} +{/if} \ No newline at end of file diff --git a/admin/themes/default/template/controllers/products/occupancy.tpl b/admin/themes/default/template/controllers/products/occupancy.tpl index 1605e2818..db17ea06e 100644 --- a/admin/themes/default/template/controllers/products/occupancy.tpl +++ b/admin/themes/default/template/controllers/products/occupancy.tpl @@ -54,7 +54,9 @@
- {l s='Below, enter the maximum of adults or children which can be accommodated in a room of this room type. Also, enter maximum number of guests for this room type.'} + {l s='Below, enter the maximum number of adults and children which can be accommodated in a room of this room type.'} +
+ {l s='For maximum room occupancy, the total number of guests which can be accommodated in a room of this room type.'}
From c55156d79709014d0bdc8e0a03b9009c46c234eb Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Mon, 27 Feb 2023 20:13:18 +0530 Subject: [PATCH 19/45] fixed free order and room reallocate issue --- classes/PaymentModule.php | 20 ++++--- .../views/js/HotelReservationAdmin.js | 59 ------------------- .../views/js/admin/hotel_rooms_booking.js | 57 ++++++++++++++++++ .../hotel_rooms_booking/helpers/view/view.tpl | 2 +- 4 files changed, 70 insertions(+), 68 deletions(-) diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index c1427a39f..44d4a95f1 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -379,19 +379,23 @@ abstract class PaymentModuleCore extends Module (float)$this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, $order->product_list, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_ ); - $order->amount_paid = (float)Tools::ps_round( - (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)), - _PS_PRICE_COMPUTE_PRECISION_ - ); + if ($totalOrder = $this->context->cart->getOrderTotal(true, Cart::ADVANCE_PAYMENT, null, $id_carrier)) { + $order->amount_paid = (float)Tools::ps_round( + (($order->advance_paid_amount * $amount_paid) / $totalOrder), + _PS_PRICE_COMPUTE_PRECISION_ + ); + } } else { $order->advance_paid_amount = (float)Tools::ps_round( (float)$this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $id_carrier), _PS_PRICE_COMPUTE_PRECISION_ ); - $order->amount_paid = (float)Tools::ps_round( - (($order->advance_paid_amount * $amount_paid) / $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)), - _PS_PRICE_COMPUTE_PRECISION_ - ); + if ($orderTotal = $this->context->cart->getOrderTotal(true, Cart::BOTH, null, $id_carrier)) { + $order->amount_paid = (float)Tools::ps_round( + (($order->advance_paid_amount * $amount_paid) / $orderTotal), + _PS_PRICE_COMPUTE_PRECISION_ + ); + } } // Creating order diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index e67d4faca..0c60a8389 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -411,65 +411,6 @@ $(document).ready(function() { $(this).parents('.child_feature_row').remove(); }); - /*For swaping rooms in the modal*/ - $("#realloc_allocated_rooms").on('click', function(e) { - $(".error_text").text(''); - if ($('#realloc_avail_rooms').val() == 0) { - $("#realloc_sel_rm_err_p").text(slct_rm_err); - return false; - } - }); - $("#swap_allocated_rooms").on('click', function(e) { - $(".error_text").text(''); - if ($('#swap_avail_rooms').val() == 0) { - $("#swap_sel_rm_err_p").text(slct_rm_err); - return false; - } - }); - - $('#mySwappigModal').on('hidden.bs.modal', function(e) { - $(".modal_date_from").val(''); - $(".modal_date_to").val(''); - $(".modal_id_room").val(''); - $(".modal_curr_room_num").val(''); - $(".cust_name").text(''); - $(".cust_email").text(''); - $(".swp_rm_opts").remove(); - $(".realloc_rm_opts").remove(); - }); - - $('#mySwappigModal').on('shown.bs.modal', function(e) { - $(".modal_date_from").val(e.relatedTarget.dataset.date_from); - $(".modal_date_to").val(e.relatedTarget.dataset.date_to); - $(".modal_id_room").val(e.relatedTarget.dataset.id_room); - $(".modal_curr_room_num").val(e.relatedTarget.dataset.room_num); - $(".cust_name").text(e.relatedTarget.dataset.cust_name); - $(".cust_email").text(e.relatedTarget.dataset.cust_email); - html = ''; - if (e.relatedTarget.dataset.avail_rm_realloc) { - var json_arr_rm_swp = JSON.parse(e.relatedTarget.dataset.avail_rm_swap); - $.each(json_arr_rm_swp, function(key, val) { - html += ''; - }); - } - if (html != '') { - $("#swap_avail_rooms").append(html); - } - - html = ''; - if (e.relatedTarget.dataset.avail_rm_realloc) { - var json_arr_rm_realloc = JSON.parse(e.relatedTarget.dataset.avail_rm_realloc); - $.each(json_arr_rm_realloc, function(key, val) { - html += ''; - }); - } - if (html != '') { - $("#realloc_avail_rooms").append(html); - } - }); - - /* ---- Book Now page Admin ---- */ - /* ---- HotelConfigurationSettingController Admin ---- */ if ($('#WK_SHOW_MSG_ON_BO_on').prop('checked') === true) { diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js index de5b4a126..233b65b4a 100644 --- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js +++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js @@ -954,4 +954,61 @@ $(document).ready(function() { return [true, ""]; } } + + /*For swaping rooms in the modal*/ + $("#realloc_allocated_rooms").on('click', function(e) { + $(".error_text").text(''); + if ($('#realloc_avail_rooms').val() == 0) { + $("#realloc_sel_rm_err_p").text(slct_rm_err); + return false; + } + }); + $("#swap_allocated_rooms").on('click', function(e) { + $(".error_text").text(''); + if ($('#swap_avail_rooms').val() == 0) { + $("#swap_sel_rm_err_p").text(slct_rm_err); + return false; + } + }); + + $('#mySwappigModal').on('hidden.bs.modal', function(e) { + $(".modal_date_from").val(''); + $(".modal_date_to").val(''); + $(".modal_id_room").val(''); + $(".modal_curr_room_num").val(''); + $(".cust_name").text(''); + $(".cust_email").text(''); + $(".swp_rm_opts").remove(); + $(".realloc_rm_opts").remove(); + }); + + $('#mySwappigModal').on('shown.bs.modal', function(e) { + $(".modal_date_from").val(e.relatedTarget.dataset.date_from); + $(".modal_date_to").val(e.relatedTarget.dataset.date_to); + $(".modal_id_room").val(e.relatedTarget.dataset.id_room); + $(".modal_curr_room_num").val(e.relatedTarget.dataset.room_num); + $(".cust_name").text(e.relatedTarget.dataset.cust_name); + $(".cust_email").text(e.relatedTarget.dataset.cust_email); + html = ''; + if (e.relatedTarget.dataset.avail_rm_realloc) { + var json_arr_rm_swp = JSON.parse(e.relatedTarget.dataset.avail_rm_swap); + $.each(json_arr_rm_swp, function(key, val) { + html += ''; + }); + } + if (html != '') { + $("#swap_avail_rooms").append(html); + } + + html = ''; + if (e.relatedTarget.dataset.avail_rm_realloc) { + var json_arr_rm_realloc = JSON.parse(e.relatedTarget.dataset.avail_rm_realloc); + $.each(json_arr_rm_realloc, function(key, val) { + html += ''; + }); + } + if (html != '') { + $("#realloc_avail_rooms").append(html); + } + }); }); \ No newline at end of file diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl index f8454e636..4b23997ad 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl @@ -218,7 +218,7 @@
-
+
- + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'})
@@ -123,7 +123,7 @@
- + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'})
diff --git a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl index e7870f4ab..e793e8618 100644 --- a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl +++ b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl @@ -63,7 +63,7 @@
- +
@@ -134,7 +134,7 @@
- +
From 7472b95ce263b2adb52057388cd2f82763db6250 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Tue, 28 Feb 2023 16:50:24 +0530 Subject: [PATCH 23/45] resolved db exception on qlocleaner integrity check --- modules/qlocleaner/qlocleaner.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/qlocleaner/qlocleaner.php b/modules/qlocleaner/qlocleaner.php index 931802cf2..8f0e96393 100644 --- a/modules/qlocleaner/qlocleaner.php +++ b/modules/qlocleaner/qlocleaner.php @@ -641,7 +641,6 @@ class QloCleaner extends Module array('warehouse_carrier', 'id_carrier', 'carrier', 'id_carrier'), array('warehouse_product_location', 'id_product', 'product', 'id_product'), array('warehouse_product_location', 'id_warehouse', 'warehouse', 'id_warehouse'), - array('product_comment', 'id_product', 'product', 'id_product'), array('specific_price', 'id_product', 'customer', 'id_customer'), array('specific_price', 'id_group', 'group', 'id_group'), array('htl_features_block_data_lang', 'id_features_block', 'htl_features_block_data', 'id_features_block'), From 2b82020381dcafa1098d57f56744d83cd9dd5192 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 28 Feb 2023 20:01:10 +0530 Subject: [PATCH 24/45] updated best and most viewed rooms stats --- modules/dashproducts/dashproducts.php | 2 +- modules/statsbestproducts/statsbestproducts.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php index 3cbe6fc69..f3927610c 100644 --- a/modules/dashproducts/dashproducts.php +++ b/modules/dashproducts/dashproducts.php @@ -561,7 +561,7 @@ class DashProducts extends Module LEFT JOIN `'._DB_PREFIX_.'date_range` dr ON pv.`id_date_range` = dr.`id_date_range` LEFT JOIN `'._DB_PREFIX_.'page` p ON pv.`id_page` = p.`id_page` LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON pt.`id_page_type` = p.`id_page_type` - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON hrt.`id_product` = p.`id_object` + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON hrt.`id_product` = p.`id_object` WHERE pt.`name` = \'product\' '.Shop::addSqlRestriction(false, 'pv').' AND dr.`time_start` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59" diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index 04dfe49ff..1d91fd849 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -205,7 +205,8 @@ class StatsBestProducts extends ModuleGrid LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (hrt.`id_product` = p.`id_product`) LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbil - ON (hbil.`id` = hrt.`id_hotel` AND hbil.`id_lang` = '.(int) $id_lang .')'; + ON (hbil.`id` = hrt.`id_hotel` AND hbil.`id_lang` = '.(int) $id_lang .') + WHERE p.`booking_product` = 1'; if (Validate::IsName($this->_sort)) { $this->query .= ' ORDER BY `'.bqSQL($this->_sort).'`'; From 241e4a85b6775a35753fd6853dfad839609d32b0 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 28 Feb 2023 20:12:06 +0530 Subject: [PATCH 25/45] Text change --- .../dashperformance/views/templates/hook/dashboard_zone_two.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl index 91842bd5b..4ea64cba4 100644 --- a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl +++ b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl @@ -50,7 +50,7 @@
-
+

{l s='Total Revenue Per Available Room' mod='dashperformance'}

From c1cc3304c349c664b3af1f3d33ee247a96d3bc00 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Wed, 1 Mar 2023 12:35:25 +0530 Subject: [PATCH 26/45] resolved php warnings on refund request --- classes/order/OrderReturn.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php index 41623a56e..10c549b4e 100644 --- a/classes/order/OrderReturn.php +++ b/classes/order/OrderReturn.php @@ -219,13 +219,13 @@ class OrderReturnCore extends ObjectModel 0 ); $bookingRow['additional_services_tax_excl'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $id_order, + $bookingRow['id_order'], 0, 0, - $type_value['product_id'], - $data_v['date_from'], - $data_v['date_to'], - $data_v['id_room'], + $bookingRow['id_product'], + $bookingRow['date_from'], + $bookingRow['date_to'], + $bookingRow['id_room'], 1, 0 ); From 09434009e80a49e9f9ba17d65f68a6940c9813e8 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 1 Mar 2023 12:52:42 +0530 Subject: [PATCH 27/45] Fix maps on room type detail page --- themes/hotel-reservation-theme/js/product.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 96ae9a806..3359014cf 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1029,7 +1029,9 @@ function checkUrl() { /*#####################################################################*/ $(document).ready(function() { - BookingForm.init(); + if (!PS_CATALOG_MODE) { + BookingForm.init(); + } $(document).on('QloApps:updateRoomOccupancy', function(e) { BookingForm.refresh(); From 1bb06de67fc2067c88856a1afcda2a48ec4a4fe9 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 1 Mar 2023 12:55:11 +0530 Subject: [PATCH 28/45] Remove Order Restrict --- .../classes/HotelReservationSystemDb.php | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index 62c56975c..dd5f1c62b 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -471,11 +471,10 @@ class HotelReservationSystemDb "INSERT INTO `"._DB_PREFIX_."htl_settings_link` (`id_settings_link`, `icon`, `link`, `new_window`, `position`, `unremovable`, `active`, `date_add`, `date_upd`) VALUES (1, 'icon-cogs', 'index.php?controller=AdminHotelGeneralSettings', 0, 0, 1, 1, NOW(), NOW()), - (2, 'icon-list-alt', 'index.php?controller=AdminOrderRestrictSettings', 0, 1, 1, 1, NOW(), NOW()), - (3, 'icon-dollar', 'index.php?controller=AdminHotelFeaturePricesSettings', 0, 2, 1, 1, NOW(), NOW()), - (4, 'icon-plus-square', 'index.php?controller=AdminRoomTypeGlobalDemand', 0, 3, 1, 1, NOW(), NOW()), - (5, 'icon-file-text', 'index.php?controller=AdminAboutHotelBlockSetting', 0, 4, 0, 1, NOW(), NOW()), - (6, 'icon-th-list', 'index.php?controller=AdminFeaturesModuleSetting', 0, 5, 0, 1, NOW(), NOW());", + (2, 'icon-dollar', 'index.php?controller=AdminHotelFeaturePricesSettings', 0, 2, 1, 1, NOW(), NOW()), + (3, 'icon-plus-square', 'index.php?controller=AdminRoomTypeGlobalDemand', 0, 3, 1, 1, NOW(), NOW()), + (4, 'icon-file-text', 'index.php?controller=AdminAboutHotelBlockSetting', 0, 4, 0, 1, NOW(), NOW()), + (5, 'icon-th-list', 'index.php?controller=AdminFeaturesModuleSetting', 0, 5, 0, 1, NOW(), NOW());", "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_settings_link_lang` ( `id_settings_link` int(10) unsigned NOT NULL, @@ -491,27 +490,22 @@ class HotelReservationSystemDb ORDER BY `id_lang`;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 2, `id_lang`, 'Order Restrict', 'Configure if you want to restrict orders till a specific date for your hotels.' + SELECT 2, `id_lang`, 'Advanced Price Rules', 'Here set Advanced price rules for specific dates.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 3, `id_lang`, 'Advanced Price Rules', 'Here set Advanced price rules for specific dates.' + SELECT 3, `id_lang`, 'Additional Facilities', 'Here create Additional facilities and their prices for room types.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 4, `id_lang`, 'Additional Facilities', 'Here create Additional facilities and their prices for room types.' + SELECT 4, `id_lang`, 'Hotel Interior Block', 'Configure Hotel Interior block. You can display hotel interior images using this block. This block will be displayed on home page.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 5, `id_lang`, 'Hotel Interior Block', 'Configure Hotel Interior block. You can display hotel interior images using this block. This block will be displayed on home page.' - FROM `"._DB_PREFIX_."lang` - ORDER BY `id_lang`;", - - "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 6, `id_lang`, 'Hotel Amenities Block', 'Configure Hotels Amenities settings. You can display hotel amenities images using this block. This block will be displayed on home page.' + SELECT 5, `id_lang`, 'Hotel Amenities Block', 'Configure Hotels Amenities settings. You can display hotel amenities images using this block. This block will be displayed on home page.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", ); From 84a2e07eb4a1e05e46edb48b1842981eac32d0ca Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Wed, 1 Mar 2023 18:54:09 +0530 Subject: [PATCH 29/45] remove unused category kpis --- .../admin/AdminCategoriesController.php | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index ae49e80d2..20725ae55 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -369,49 +369,49 @@ class AdminCategoriesControllerCore extends AdminController } } - public function renderKpis() - { - $time = time(); - $kpis = array(); + // public function renderKpis() + // { + // $time = time(); + // $kpis = array(); - $helper = new HelperKpi(); - $helper->id = 'box-disabled-categories'; - $helper->icon = 'icon-off'; - $helper->color = 'color1'; - $helper->title = $this->l('Disabled Categories', null, null, false); - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_categories'; - $kpis[] = $helper->generate(); + // $helper = new HelperKpi(); + // $helper->id = 'box-disabled-categories'; + // $helper->icon = 'icon-off'; + // $helper->color = 'color1'; + // $helper->title = $this->l('Disabled Categories', null, null, false); + // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_categories'; + // $kpis[] = $helper->generate(); - // $helper = new HelperKpi(); - // $helper->id = 'box-empty-categories'; - // $helper->icon = 'icon-bookmark-empty'; - // $helper->color = 'color2'; - // $helper->href = $this->context->link->getAdminLink('AdminTracking'); - // $helper->title = $this->l('Empty Categories', null, null, false); - // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=empty_categories'; - // $kpis[] = $helper->generate(); + // // $helper = new HelperKpi(); + // // $helper->id = 'box-empty-categories'; + // // $helper->icon = 'icon-bookmark-empty'; + // // $helper->color = 'color2'; + // // $helper->href = $this->context->link->getAdminLink('AdminTracking'); + // // $helper->title = $this->l('Empty Categories', null, null, false); + // // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=empty_categories'; + // // $kpis[] = $helper->generate(); - $helper = new HelperKpi(); - $helper->id = 'box-top-category'; - $helper->icon = 'icon-money'; - $helper->color = 'color3'; - $helper->title = $this->l('Top Category', null, null, false); - $helper->subtitle = $this->l('30 days', null, null, false); - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=top_category'; - $kpis[] = $helper->generate(); + // $helper = new HelperKpi(); + // $helper->id = 'box-top-category'; + // $helper->icon = 'icon-money'; + // $helper->color = 'color3'; + // $helper->title = $this->l('Top Category', null, null, false); + // $helper->subtitle = $this->l('30 days', null, null, false); + // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=top_category'; + // $kpis[] = $helper->generate(); - $helper = new HelperKpi(); - $helper->id = 'box-products-per-category'; - $helper->icon = 'icon-search'; - $helper->color = 'color4'; - $helper->title = $this->l('Average number of products per category', null, null, false); - $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=products_per_category'; - $kpis[] = $helper->generate(); + // $helper = new HelperKpi(); + // $helper->id = 'box-products-per-category'; + // $helper->icon = 'icon-search'; + // $helper->color = 'color4'; + // $helper->title = $this->l('Average number of products per category', null, null, false); + // $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=products_per_category'; + // $kpis[] = $helper->generate(); - $helper = new HelperKpiRow(); - $helper->kpis = $kpis; - return $helper->generate(); - } + // $helper = new HelperKpiRow(); + // $helper->kpis = $kpis; + // return $helper->generate(); + // } public function renderForm() { From 722e3cbc8c769ed2793ac94abef6d3d45fbb6923 Mon Sep 17 00:00:00 2001 From: "lakshya.chauhan193" Date: Wed, 1 Mar 2023 20:42:50 +0530 Subject: [PATCH 30/45] resolved service product url issue --- controllers/front/ProductController.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index a97a90577..6cf7da8b3 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -114,6 +114,10 @@ class ProductControllerCore extends FrontController $this->product = new Product($id_product, true, $this->context->language->id, $this->context->shop->id); } + if (!$this->product->booking_product) { + Tools::redirect($this->context->link->getPageLink('pagenotfound')); + } + if (!Validate::isLoadedObject($this->product)) { header('HTTP/1.1 404 Not Found'); header('Status: 404 Not Found'); @@ -192,12 +196,6 @@ class ProductControllerCore extends FrontController $this->context->cookie->last_visited_category = (int)$this->category->id_category; } } - - if (!$this->product->booking_product) { - header('HTTP/1.1 403 Forbidden'); - header('Status: 403 Forbidden'); - $this->errors[] = Tools::displayError('You do not have access to this Product.'); - } } } From de1846ec9f7b98fb9448ba3ecaf541403af69b4f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 2 Mar 2023 15:11:10 +0530 Subject: [PATCH 31/45] Fix stats --- install/data/xml/configuration.xml | 18 + .../statsbestproducts/statsbestproducts.php | 2 +- modules/statscatalog/statscatalog.php | 12 +- modules/statscheckup/statscheckup.php | 402 ++++++++++++++++-- modules/statsproduct/statsproduct.php | 17 +- 5 files changed, 388 insertions(+), 63 deletions(-) diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml index 6a465c94a..c9babed8d 100644 --- a/install/data/xml/configuration.xml +++ b/install/data/xml/configuration.xml @@ -686,6 +686,24 @@ 3 + + 50 + + + 150 + + + 1 + + + 2 + + + 1 + + + 2 + 0_3|0_4 diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index 04dfe49ff..fcee8f62e 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -202,7 +202,7 @@ class StatsBestProducts extends ModuleGrid FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product` AND pl.`id_lang` = '.(int) $id_lang .') - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (hrt.`id_product` = p.`id_product`) LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbil ON (hbil.`id` = hrt.`id_hotel` AND hbil.`id_lang` = '.(int) $id_lang .')'; diff --git a/modules/statscatalog/statscatalog.php b/modules/statscatalog/statscatalog.php index 199149606..8f4ab5af6 100644 --- a/modules/statscatalog/statscatalog.php +++ b/modules/statscatalog/statscatalog.php @@ -46,7 +46,7 @@ class StatsCatalog extends Module parent::__construct(); - $this->displayName = $this->l('Catalog statistics'); + $this->displayName = $this->l('Hotel statistics'); $this->description = $this->l('Adds a tab containing general statistics about your catalog to the Stats dashboard.'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.7.0.99'); } @@ -119,7 +119,7 @@ class StatsCatalog extends Module LEFT JOIN `'._DB_PREFIX_.'page` pa ON pv.`id_page` = pa.`id_page` LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON pt.`id_page_type` = pa.`id_page_type` LEFT JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = pa.`id_object` - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) '.Shop::addSqlAssociation('product', 'p').' '.$this->join.' WHERE pt.`name` IN ("product.php", "product") @@ -149,7 +149,7 @@ class StatsCatalog extends Module FROM `'._DB_PREFIX_.'image` i LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = i.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (hrt.`id_product` = i.`id_product`) WHERE hrt.`id_hotel` = hbi.`id` ) AS room_type_images @@ -174,7 +174,7 @@ class StatsCatalog extends Module FROM `'._DB_PREFIX_.'orders` o LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.`id_order` = od.`id_order` LEFT JOIN `'._DB_PREFIX_.'product` p ON p.`id_product` = od.`product_id` - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) '.Shop::addSqlAssociation('product', 'p').' '.$this->join.' WHERE o.valid = 1 @@ -194,7 +194,7 @@ class StatsCatalog extends Module $sql = 'SELECT p.id_product, pl.name, pl.link_rewrite FROM `'._DB_PREFIX_.'product` p '.Shop::addSqlAssociation('product', 'p').' - LEFT JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) + INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (p.`id_product` = hrt.`id_product`) LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product` AND pl.id_lang = '.(int)$id_lang.Shop::addSqlRestrictionOnLang('pl').') '.$this->join.' @@ -287,7 +287,7 @@ class StatsCatalog extends Module if (count($products_nb) && count($products_nb) < 50) { $html .= ' -
'.$this->l('Room types never booked').'
+
'.$this->l('Room types never booked').'
diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index 132a933bf..5ef5451e6 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -91,6 +91,8 @@ class StatsCheckUp extends Module .$this->displayName.' '; + $activeTab = 'hotels'; + if (Tools::isSubmit('submitCheckupRoomType')) { $confs = array( 'ROOM_TYPE_CHECKUP_DESCRIPTIONS_LT', @@ -129,6 +131,25 @@ class StatsCheckUp extends Module $this->html .= $this->displayConfirmation($this->l('Configuration updated.')); } + if (Tools::isSubmit('submitCheckupService')) { + $confs = array( + 'SERVICE_CHECKUP_DESCRIPTIONS_SHORT_LT', + 'SERVICE_CHECKUP_DESCRIPTIONS_SHORT_GT', + 'SERVICE_CHECKUP_IMAGES_LT', + 'SERVICE_CHECKUP_IMAGES_GT', + 'SERVICE_CHECKUP_ORDERS_LT', + 'SERVICE_CHECKUP_ORDERS_GT', + ); + + foreach ($confs as $confname) { + Configuration::updateValue($confname, (int)Tools::getValue($confname)); + } + + $this->html .= $this->displayConfirmation($this->l('Configuration updated.')); + + $activeTab = 'services'; + } + if (Tools::isSubmit('submitCheckupOrder')) { $this->context->cookie->checkup_order = (int)Tools::getValue('submitCheckupOrder'); $this->html .= $this->displayConfirmation($this->l('Configuration updated.')); @@ -142,6 +163,35 @@ class StatsCheckUp extends Module $this->id_hotel = (int) Tools::getValue('id_hotel'); } + $this->html .= ' + + +
+
+ '.$this->getHotelsTab().' +
+
+ '.$this->getServicesTab().' +
+
+ '; + + return $this->html; + } + + private function getHotelsTab() + { $employee = Context::getContext()->employee; $prop30 = ((strtotime($employee->stats_date_to.' 23:59:59') - strtotime($employee->stats_date_from.' 00:00:00')) / 60 / 60 / 24) / 30; @@ -187,7 +237,7 @@ class StatsCheckUp extends Module 'TOTAL_ROOMS' => array('name' => $this->l('Total rooms'), 'text' => $this->l('rooms')), ); - $this->html .= ' + $hotelsHtml = '
@@ -200,7 +250,7 @@ class StatsCheckUp extends Module foreach ($array_conf as $conf => $translations) { $confKeyLt = ($this->id_hotel ? 'ROOM_TYPE' : 'HOTEL').'_CHECKUP_'.$conf.'_LT'; $confKeyGt = ($this->id_hotel ? 'ROOM_TYPE' : 'HOTEL').'_CHECKUP_'.$conf.'_GT'; - $this->html .= ' + $hotelsHtml .= ' '; } - $this->html .= '
@@ -227,7 +277,7 @@ class StatsCheckUp extends Module
+ $hotelsHtml .= ' @@ -251,12 +301,12 @@ class StatsCheckUp extends Module '.$this->l('ID').' - '.$this->l('Room type').' + '.(!$this->id_hotel ? $this->l('Hotel') : $this->l('Room type')).' '.$this->l('Active').''; foreach ($languages as $language) { - $this->html .= ''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'; + $hotelsHtml .= ''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'; } - $this->html .= ' + $hotelsHtml .= ' '.$this->l('Images').' '.$this->l('Orders').' '.$this->l('Total rooms').' @@ -280,17 +330,6 @@ class StatsCheckUp extends Module ); foreach ($result as $row) { - $row['stock'] = 0; - if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($row['id_product'])) { - $bookingParams['hotel_id'] = $roomTypeInfo['id_hotel']; - $bookingParams['id_room_type'] = $row['id_product']; - if ($booking_data = $objBookingDtl->getBookingData($bookingParams)) { - if (isset($booking_data['stats']['num_avail'])) { - $row['stock'] = $booking_data['stats']['num_avail']; - } - } - } - $totals['products']++; $scores = array( 'active' => ($row['active'] ? 2 : 0), @@ -302,7 +341,7 @@ class StatsCheckUp extends Module $totals['images'] += (int)$scores['images']; $totals['orders'] += (int)$scores['orders']; $totals['total_rooms'] += (int)$scores['total_rooms']; - $descriptions = $this->getDescriptions($row['id_object']); + $descriptions = $this->getDescriptions($this->id_hotel ? 'room_type' : 'hotel', $row['id_object']); foreach ($descriptions as $description) { if (isset($description['iso_code']) && isset($description['description'])) { $row['desclength_'.$description['iso_code']] = Tools::strlen(strip_tags($description['description'])); @@ -321,16 +360,16 @@ class StatsCheckUp extends Module } else { $objectLink = $this->context->link->getAdminLink('AdminAddHotel').'&updatehtl_branch_info&id='.$row['id_object']; } - $this->html .= ' + $hotelsHtml .= ' '.$row['id_object'].' '.Tools::substr($row['object_name'], 0, 42).' '.$array_colors[$scores['active']].''; foreach ($languages as $language) { if (isset($row['desclength_'.$language['iso_code']])) { - $this->html .= ''.(int)$row['desclength_'.$language['iso_code']].' '.$array_colors[$scores['description_'.$language['iso_code']]].''; + $hotelsHtml .= ''.(int)$row['desclength_'.$language['iso_code']].' '.$array_colors[$scores['description_'.$language['iso_code']]].''; } else { - $this->html .= '0 '.$array_colors[0].''; + $hotelsHtml .= '0 '.$array_colors[0].''; } } @@ -339,7 +378,7 @@ class StatsCheckUp extends Module $objectViewLink = $this->context->link->getAdminLink('AdminStats').'&module='.$this->name.'&id_hotel='.$row['id_object']; } - $this->html .= ' + $hotelsHtml .= ' '.(int)$row['nbImages'].' '.$array_colors[$scores['images']].' '.(int)$row['nbOrders'].' '.$array_colors[$scores['orders']].' '.(int)$row['totalRooms'].' '.$array_colors[$scores['total_rooms']].' @@ -348,7 +387,7 @@ class StatsCheckUp extends Module '; } - $this->html .= ''; + $hotelsHtml .= ''; $totals['active'] = $totals['active'] / $totals['products']; $totals['active'] = ($totals['active'] < 1 ? 0 : ($totals['active'] > 1.5 ? 2 : 1)); @@ -365,15 +404,15 @@ class StatsCheckUp extends Module $totals['average'] = array_sum($totals) / $divisor; $totals['average'] = ($totals['average'] < 1 ? 0 : ($totals['average'] > 1.5 ? 2 : 1)); - $this->html .= ' + $hotelsHtml .= ' '.$this->l('Active').''; foreach ($languages as $language) { - $this->html .= ''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'; + $hotelsHtml .= ''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'; } - $this->html .= ' + $hotelsHtml .= ' '.$this->l('Images').' '.$this->l('Orders').' '.$this->l('Total rooms').' @@ -384,19 +423,248 @@ class StatsCheckUp extends Module '.$array_colors[$totals['active']].''; foreach ($languages as $language) { - $this->html .= ''.$array_colors[$totals['description_'.$language['iso_code']]].''; + $hotelsHtml .= ''.$array_colors[$totals['description_'.$language['iso_code']]].''; } - $this->html .= ' + $hotelsHtml .= ' '.$array_colors[$totals['images']].' '.$array_colors[$totals['orders']].' '.$array_colors[$totals['total_rooms']].' '.$array_colors[$totals['average']].' '.(!$this->id_hotel ? '' : '').' + '.($this->id_hotel ? ' + + + + '.$this->l('Back').' + + + ' : '').'
'; - return $this->html; + return $hotelsHtml; + } + + private function getServicesTab() + { + $employee = Context::getContext()->employee; + $prop30 = ((strtotime($employee->stats_date_to.' 23:59:59') - strtotime($employee->stats_date_from.' 00:00:00')) / 60 / 60 / 24) / 30; + + // Get languages + $sql = 'SELECT l.* + FROM '._DB_PREFIX_.'lang l' + .Shop::addSqlAssociation('lang', 'l'); + $languages = Db::getInstance()->executeS($sql); + + $array_colors = array( + 0 => ''.$this->l('Bad').'', + 1 => ''.$this->l('Average').'', + 2 => ''.$this->l('Good').'' + ); + + $divisor = 4; + $totals = array('services' => 0, 'active' => 0, 'images' => 0, 'orders' => 0, 'associated_room_types' => 0); + foreach ($languages as $language) { + $divisor++; + $totals['description_'.$language['iso_code']] = 0; + } + + // set data from here + $result = $this->getServiceStats(); + + if (!$result) { + return $this->l('No service was found.'); + } + + $array_conf = array( + 'DESCRIPTIONS_SHORT' => array('name' => $this->l('Descriptions'), 'text' => $this->l('chars (without HTML)')), + 'IMAGES' => array('name' => $this->l('Images'), 'text' => $this->l('images')), + 'ORDERS' => array('name' => $this->l('Orders'), 'text' => $this->l('orders / month')), + ); + + $servicesHtml = ' + + + + + + + + + '; + foreach ($array_conf as $conf => $translations) { + $confKeyLt = 'SERVICE_CHECKUP_'.$conf.'_LT'; + $confKeyGt = 'SERVICE_CHECKUP_'.$conf.'_GT'; + $servicesHtml .= ' + + + + + + + '; + } + $servicesHtml .= '
'.$array_colors[0].' '.$this->l('Not enough').''.$array_colors[2].' '.$this->l('Alright').'
+ + +
+
+ '.$this->l('Less than').' + + '.$translations['text'].' +
+
+
+
+
+ '.$this->l('Greater than').' + + '.$translations['text'].' +
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ + + + + + + '; + foreach ($languages as $language) { + $servicesHtml .= ''; + } + $servicesHtml .= ' + + + + '.(!$this->id_hotel ? '' : '').' + + + '; + + + $confCheckup = array( + 'IMAGES_LT' => Configuration::get('SERVICE_CHECKUP_IMAGES_LT'), + 'IMAGES_GT' => Configuration::get('SERVICE_CHECKUP_IMAGES_GT'), + 'ORDERS_LT' => Configuration::get('SERVICE_CHECKUP_ORDERS_LT'), + 'ORDERS_GT' => Configuration::get('SERVICE_CHECKUP_ORDERS_GT'), + 'DESCRIPTIONS_SHORT_LT' => Configuration::get('SERVICE_CHECKUP_DESCRIPTIONS_SHORT_LT'), + 'DESCRIPTIONS_SHORT_GT' => Configuration::get('SERVICE_CHECKUP_DESCRIPTIONS_SHORT_GT'), + ); + + foreach ($result as $row) { + $totals['services']++; + $scores = array( + 'active' => ($row['active'] ? 2 : 0), + 'images' => ($row['nbImages'] < $confCheckup['IMAGES_LT'] ? 0 : ($row['nbImages'] > $confCheckup['IMAGES_GT'] ? 2 : 1)), + 'orders' => (($row['nbOrders'] * $prop30 < $confCheckup['ORDERS_LT']) ? 0 : (($row['nbOrders'] * $prop30 > $confCheckup['ORDERS_GT']) ? 2 : 1)), + ); + $totals['active'] += (int)$scores['active']; + $totals['images'] += (int)$scores['images']; + $totals['orders'] += (int)$scores['orders']; + $descriptions = $this->getDescriptions('service', $row['id_object']); + foreach ($descriptions as $description) { + if (isset($description['iso_code']) && isset($description['description_short'])) { + $row['desclength_'.$description['iso_code']] = Tools::strlen(strip_tags($description['description_short'])); + } + if (isset($description['iso_code'])) { + $scores['description_'.$description['iso_code']] = ($row['desclength_'.$description['iso_code']] < $confCheckup['DESCRIPTIONS_SHORT_LT'] ? 0 : ($row['desclength_'.$description['iso_code']] > $confCheckup['DESCRIPTIONS_SHORT_GT'] ? 2 : 1)); + $totals['description_'.$description['iso_code']] += $scores['description_'.$description['iso_code']]; + } + } + $scores['average'] = array_sum($scores) / $divisor; + $scores['average'] = ($scores['average'] < 1 ? 0 : ($scores['average'] > 1.5 ? 2 : 1)); + + $objectLink = $this->context->link->getAdminLink('AdminNormalProducts').'&updateproduct&id_product='.$row['id_object']; + $servicesHtml .= ' + + + + + '; + foreach ($languages as $language) { + if (isset($row['desclength_'.$language['iso_code']])) { + $servicesHtml .= ''; + } else { + $servicesHtml .= ''; + } + } + + $servicesHtml .= ' + + + + '; + } + + $servicesHtml .= ''; + + $totals['active'] = $totals['active'] / $totals['services']; + $totals['active'] = ($totals['active'] < 1 ? 0 : ($totals['active'] > 1.5 ? 2 : 1)); + $totals['images'] = $totals['images'] / $totals['services']; + $totals['images'] = ($totals['images'] < 1 ? 0 : ($totals['images'] > 1.5 ? 2 : 1)); + $totals['orders'] = $totals['orders'] / $totals['services']; + $totals['orders'] = ($totals['orders'] < 1 ? 0 : ($totals['orders'] > 1.5 ? 2 : 1)); + $totals['associated_room_types'] = $totals['associated_room_types'] / $totals['services']; + $totals['associated_room_types'] = ($totals['associated_room_types'] < 1 ? 0 : ($totals['associated_room_types'] > 1.5 ? 2 : 1)); + foreach ($languages as $language) { + $totals['description_'.$language['iso_code']] = $totals['description_'.$language['iso_code']] / $totals['services']; + $totals['description_'.$language['iso_code']] = ($totals['description_'.$language['iso_code']] < 1 ? 0 : ($totals['description_'.$language['iso_code']] > 1.5 ? 2 : 1)); + } + $totals['average'] = array_sum($totals) / $divisor; + $totals['average'] = ($totals['average'] < 1 ? 0 : ($totals['average'] > 1.5 ? 2 : 1)); + + $servicesHtml .= ' + + + + + '; + foreach ($languages as $language) { + $servicesHtml .= ''; + } + $servicesHtml .= ' + + + + '.(!$this->id_hotel ? '' : '').' + + + + + '; + foreach ($languages as $language) { + $servicesHtml .= ''; + } + $servicesHtml .= ' + + + + + +
'.$this->l('ID').''.$this->l('Service').''.$this->l('Active').''.$this->l('Associated room types').''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'.$this->l('Images').''.$this->l('Orders').''.$this->l('Overall status').''.$this->l('Action').'
'.$row['id_object'].''.Tools::substr($row['object_name'], 0, 42).''.$array_colors[$scores['active']].''.$row['nbAssociatedRoomTypes'].''.(int)$row['desclength_'.$language['iso_code']].' '.$array_colors[$scores['description_'.$language['iso_code']]].'0 '.$array_colors[0].''.(int)$row['nbImages'].' '.$array_colors[$scores['images']].''.(int)$row['nbOrders'].' '.$array_colors[$scores['orders']].''.$array_colors[$scores['average']].'
'.$this->l('Active').''.$this->l('Associated room types').''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')'.$this->l('Images').''.$this->l('Orders').''.$this->l('Overall status').'
'.$array_colors[$totals['active']].'NA'.$array_colors[$totals['description_'.$language['iso_code']]].''.$array_colors[$totals['images']].''.$array_colors[$totals['orders']].''.$array_colors[$totals['average']].'
'; + + return $servicesHtml; } public function getHotelStats() @@ -479,20 +747,49 @@ class StatsCheckUp extends Module return Db::getInstance()->executeS($sql); } - public function getDescriptions($id_object) + public function getServiceStats() { - if ($this->id_hotel) { - return Db::getInstance()->executeS( - 'SELECT l.`iso_code`, pl.`description` - FROM '._DB_PREFIX_.'product_lang pl - LEFT JOIN '._DB_PREFIX_.'lang l - ON pl.`id_lang` = l.`id_lang` - LEFT JOIN '._DB_PREFIX_.'htl_room_type hrt - ON (hrt.`id_product` = pl.`id_product`) - WHERE hrt.`id_hotel` = '.(int) $this->id_hotel.' - AND pl.`id_product` = '.(int) $id_object - ); - } else { + $date_from = date('Y-m-d', strtotime($this->context->employee->stats_date_from)); + $date_to = date('Y-m-d', strtotime($this->context->employee->stats_date_to)); + $id_lang = $this->context->language->id; + + $order_by = 'p.`id_product`'; + if ($this->context->cookie->checkup_order == self::ORDER_BY_NAME) { + $order_by = 'object_name'; + } elseif ($this->context->cookie->checkup_order == self::ORDER_BY_ORDERS) { + $order_by = 'nbOrders DESC'; + } + + $sql = 'SELECT p.`id_product` AS id_object, p.`active`, pl.`name` AS object_name, + ( + SELECT COUNT(*) + FROM '._DB_PREFIX_.'image i + WHERE i.`id_product` = p.`id_product` + ) AS nbImages, + ( + SELECT COUNT(DISTINCT rsod.`id_order`) FROM `'._DB_PREFIX_.'htl_room_type_service_product_order_detail` rsod + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = rsod.`id_order`) + LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hbd ON (hbd.`id` = rsod.`id_htl_booking_detail`) + WHERE rsod.`id_product` = p.`id_product` AND o.`valid` = 1 + AND hbd.`date_to` > "'.pSQL($date_from).'" AND hbd.`date_from` < "'.pSQL($date_to).'" + ) AS nbOrders, + ( + SELECT COUNT(*) + FROM `'._DB_PREFIX_.'htl_room_type_service_product` rsp + WHERE rsp.`id_product` = p.`id_product` + ) AS nbAssociatedRoomTypes + FROM '._DB_PREFIX_.'product p + LEFT JOIN '._DB_PREFIX_.'product_lang pl + ON (p.`id_product` = pl.`id_product` AND pl.`id_lang` = '.(int) $id_lang.') + WHERE p.`booking_product` = 0 + ORDER BY '.$order_by; + + return Db::getInstance()->executeS($sql); + } + + public function getDescriptions($object_type, $id_object = null) + { + if ($object_type == 'hotel') { return Db::getInstance()->executeS( 'SELECT l.`iso_code`, hbil.`description` FROM '._DB_PREFIX_.'htl_branch_info_lang hbil @@ -500,6 +797,27 @@ class StatsCheckUp extends Module ON hbil.`id_lang` = l.`id_lang` WHERE hbil.`id` = '.(int) $id_object ); + } elseif ($object_type == 'room_type') { + return Db::getInstance()->executeS( + 'SELECT l.`iso_code`, pl.`description` + FROM '._DB_PREFIX_.'product_lang pl + LEFT JOIN '._DB_PREFIX_.'lang l + ON pl.`id_lang` = l.`id_lang` + INNER JOIN '._DB_PREFIX_.'htl_room_type hrt + ON (hrt.`id_product` = pl.`id_product`) + WHERE hrt.`id_hotel` = '.(int) $this->id_hotel.' + AND pl.`id_product` = '.(int) $id_object + ); + } elseif ($object_type == 'service') { + return Db::getInstance()->executeS( + 'SELECT l.`iso_code`, pl.`description_short` + FROM '._DB_PREFIX_.'product p + LEFT JOIN '._DB_PREFIX_.'product_lang pl + ON (pl.`id_product` = p.`id_product`) + LEFT JOIN '._DB_PREFIX_.'lang l + ON pl.`id_lang` = l.`id_lang` + WHERE p.`booking_product` = 0' + ); } } } diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php index 53aff5c72..40c3ff7fd 100644 --- a/modules/statsproduct/statsproduct.php +++ b/modules/statsproduct/statsproduct.php @@ -119,6 +119,7 @@ class StatsProduct extends ModuleGraph $sql .= ' INNER JOIN `'._DB_PREFIX_.'htl_room_type` hrt ON (hrt.`id_product` = p.`id_product` AND hrt.`id_hotel` = '.(int)Tools::getValue('id_hotel').')'; } $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` AND pl.`id_lang`='.(int)$this->context->language->id.') + WHERE p.`booking_product` = 1 ORDER BY pl.`name`'; return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); @@ -302,20 +303,8 @@ class StatsProduct extends ModuleGraph '; - $bookingParams = array(); - $bookingParams['date_from'] = $dateFrom; - $bookingParams['date_to'] = $dateTo; - foreach ($this->getProducts($this->context->language->id) as $product) { - $availRooms = 0; - if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { - $bookingParams['hotel_id'] = $roomTypeInfo['id_hotel']; - $bookingParams['id_room_type'] = $product['id_product']; - if ($booking_data = $objBookingDtl->getBookingData($bookingParams)) { - if (isset($booking_data['stats']['num_avail'])) { - $availRooms = $booking_data['stats']['num_avail']; - } - } - } + // get room types info + foreach ($this->getProducts() as $product) { $this->html .= ' From 8b2aed362f7908f27474b73be9d793715e6ff253 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 2 Mar 2023 17:36:19 +0530 Subject: [PATCH 32/45] Fix icon issue on checkout page --- themes/hotel-reservation-theme/order-opc.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl index 788a01395..3ca3c0046 100644 --- a/themes/hotel-reservation-theme/order-opc.tpl +++ b/themes/hotel-reservation-theme/order-opc.tpl @@ -408,7 +408,7 @@ {/if} - {l s='Applied'} + {l s='Applied'}
{/foreach} From d95093a8dfa0f86d9c336f8c1ce91b7d24d8dd9e Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 3 Mar 2023 11:42:14 +0530 Subject: [PATCH 33/45] Fix Customers KPI on Customers page --- controllers/admin/AdminStatsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 8a75a6383..8c0096b5f 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -354,7 +354,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getCustomerMainGender() { $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' - SELECT SUM(IF(g.id_gender IS NOT NULL, 1, 0)) as total, SUM(IF(type = 0, 1, 0)) as male, SUM(IF(type = 1, 1, 0)) as female, SUM(IF(type = 2, 1, 0)) as neutral + SELECT SUM(IF(c.id_gender IS NOT NULL, 1, 0)) as total, SUM(IF(type = 0, 1, 0)) as male, SUM(IF(type = 1, 1, 0)) as female, SUM(IF(type = 2, 1, 0)) as neutral FROM `'._DB_PREFIX_.'customer` c LEFT JOIN `'._DB_PREFIX_.'gender` g ON c.id_gender = g.id_gender WHERE c.active = 1 '.Shop::addSqlRestriction()); From 411a3f8b8eb75cf0724bcd2f76d2a2d83fb003c1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 3 Mar 2023 19:38:40 +0530 Subject: [PATCH 34/45] Update Dashavailability graph --- modules/dashavailability/views/js/dashavailability.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/dashavailability/views/js/dashavailability.js b/modules/dashavailability/views/js/dashavailability.js index 73fdefb14..89b8137de 100644 --- a/modules/dashavailability/views/js/dashavailability.js +++ b/modules/dashavailability/views/js/dashavailability.js @@ -26,6 +26,7 @@ function line_chart_availability(widget_name, chart_details) { .useInteractiveGuideline(true) .x(function(d) { return (d !== undefined ? d[0] : 0); }) .y(function(d) { return (d !== undefined ? parseInt(d[1]) : 0); }) + .forceY(0) .margin({ left: 30, right: 30, From de317fa2ad33df14d9b852db4bac368a399fd269 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 11:32:35 +0530 Subject: [PATCH 35/45] Update guests count in Operations Today --- controllers/admin/AdminStatsController.php | 15 +++++++++------ modules/dashguestcycle/dashguestcycle.php | 10 +++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 8a75a6383..f455123fd 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1176,9 +1176,10 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getArrivalsInfoByDate($date, $idHotel = null) { - $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) WHERE hbd.`is_refunded` = 0 AND hbd.`date_from` = "'.pSQL($date).' 00:00:00" AND hbd.`id_status` != '.(int) HotelBookingDetail::STATUS_CHECKED_IN.' @@ -1191,9 +1192,10 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getDeparturesInfoByDate($date, $idHotel = null) { - $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) WHERE hbd.`is_refunded` = 0 AND hbd.`date_to` = "'.pSQL($date).' 00:00:00" AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN. @@ -1205,9 +1207,10 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getInHousesInfo($idHotel = null) { - $sql = 'SELECT hbd.*, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, + $sql = 'SELECT hbd.*, o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, DATEDIFF(hbd.`date_to`, hbd.`date_from`) AS los FROM `'._DB_PREFIX_.'htl_booking_detail` hbd + LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) LEFT JOIN `'._DB_PREFIX_.'customer` c ON (c.`id_customer` = hbd.`id_customer`) WHERE hbd.`is_refunded` = 0 AND hbd.`id_status` = '.(int) HotelBookingDetail::STATUS_CHECKED_IN. (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : ''); @@ -1220,7 +1223,7 @@ class AdminStatsControllerCore extends AdminStatsTabController { $sql = 'SELECT hbd.`id_customer`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, COUNT(hbd.`id`) AS total_rooms, SUM(hbd.`adults` + hbd.`children`) AS total_guests, - hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name` + hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`with_occupancy`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) LEFT JOIN `'._DB_PREFIX_.'order_state_lang` osl @@ -1237,8 +1240,8 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getCancellationsInfoByDate($date, $idHotel = null) { $sql = 'SELECT orr.`id_order_return`, orr.`id_customer`, hbd.`room_num`, hbd.`id_product`, hbd.`room_type_name`, - CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, - hbd.`id_hotel`, hbd.`hotel_name`, SUM(hbd.`adults` + hbd.`children`) AS total_guests, + o.`with_occupancy`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, hbd.`id_hotel`, + hbd.`hotel_name`, SUM(hbd.`adults` + hbd.`children`) AS total_guests, hbd.`date_from`, hbd.`date_to`, orr.`id_order` FROM `'._DB_PREFIX_.'order_return` orr LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (ord.`id_order_return` = orr.`id_order_return`) diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php index a012b2b8b..783ac20e4 100644 --- a/modules/dashguestcycle/dashguestcycle.php +++ b/modules/dashguestcycle/dashguestcycle.php @@ -170,7 +170,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $arrivalInfo['adult'] + $arrivalInfo['children'], + 'value' => $arrivalInfo['with_occupancy'] ? ($arrivalInfo['adults'] + $arrivalInfo['children']) : '--', 'class' => 'text-center', ); $tr[] = array( @@ -230,7 +230,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $departureInfo['adult'] + $departureInfo['children'], + 'value' => $departureInfo['with_occupancy'] ? ($departureInfo['adults'] + $departureInfo['children']) : '--', 'class' => 'text-center', ); $tr[] = array( @@ -291,7 +291,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $inHouseInfo['adult'] + $inHouseInfo['children'], + 'value' => $inHouseInfo['with_occupancy'] ? ($inHouseInfo['adults'] + $inHouseInfo['children']) : '--', 'class' => 'text-center', ); $tr[] = array( @@ -357,7 +357,7 @@ class DashGuestCycle extends Module 'class' => 'text-center', ); $tr[] = array( - 'value' => $newBookingInfo['total_guests'], + 'value' => $newBookingInfo['with_occupancy'] ? $newBookingInfo['total_guests'] : '--', 'class' => 'text-center', ); $tr[] = array( @@ -425,7 +425,7 @@ class DashGuestCycle extends Module } $tr[] = array( - 'value' => $cancellationInfo['total_guests'], + 'value' => $cancellationInfo['with_occupancy'] ? $cancellationInfo['total_guests'] : '--', 'class' => 'text-center', ); $tr[] = array( From 20256d4115b5d0e502f760fdf91943477f0f6e77 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 13:51:35 +0530 Subject: [PATCH 36/45] Fix can not create order from cart --- .../default/template/controllers/carts/helpers/view/view.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl index 7f8a5e8d1..3a0ab6816 100644 --- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -74,7 +74,7 @@ {else}

{l s='No order was created from this cart.'}

{if $customer->id} - {l s='Create an order from this cart.'} + {l s='Create an order from this cart.'} {/if} {/if}
From ace3ebe197e63253740212fcf4992ce877a94f10 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 15:31:02 +0530 Subject: [PATCH 37/45] Add guest transformation dusring registration at front office --- controllers/front/AuthController.php | 578 +++++++++--------- .../authentication.tpl | 10 +- .../css/authentication.css | 4 +- .../js/authentication.js | 5 +- 4 files changed, 308 insertions(+), 289 deletions(-) diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 33f7c885e..b205b7a97 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -170,6 +170,8 @@ class AuthControllerCore extends FrontController 'informations' => $this->informations, 'hasError' => !empty($this->errors), 'errors' => $this->errors, + 'hasAjaxExtraData' => !empty($this->ajaxExtraData), + 'ajaxExtraData' => $this->ajaxExtraData, 'page' => $this->context->smarty->fetch($this->template), 'token' => Tools::getToken(false) ); @@ -416,309 +418,314 @@ class AuthControllerCore extends FrontController if (Validate::isEmail($email = Tools::getValue('email')) && !empty($email)) { if (Customer::customerExists($email)) { $this->errors[] = Tools::displayError('An account using this email address has already been registered.', false); + } elseif (Customer::customerExists($email, false, false)) { + $this->errors[] = Tools::displayError('You are already registered as a guest with this email address.').' '.Tools::displayError('').' to generate a password for your account.'; } } - // Preparing customer - $customer = new Customer(); - $lastnameAddress = Tools::getValue('lastname'); - $firstnameAddress = Tools::getValue('firstname'); - $_POST['lastname'] = Tools::getValue('customer_lastname', $lastnameAddress); - $_POST['firstname'] = Tools::getValue('customer_firstname', $firstnameAddress); - $addresses_types = array('address'); - - if (!Configuration::get('PS_ORDER_PROCESS_TYPE') && Configuration::get('PS_GUEST_CHECKOUT_ENABLED') && Tools::getValue('invoice_address')) { - $addresses_types[] = 'address_invoice'; - } - - $error_phone = false; - if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { - if (Tools::isSubmit('submitGuestAccount') || !Tools::getValue('is_new_customer')) { - if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')) { - $error_phone = true; - } - } elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE')) - || (Configuration::get('PS_ORDER_PROCESS_TYPE') && !Tools::getValue('email_create')) - || (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Tools::getValue('email_create'))) - && (!Tools::getValue('phone') && !Tools::getValue('phone_mobile'))) { - $error_phone = true; - } - } - - if ($error_phone) { - $this->errors[] = Tools::displayError('You must register at least one phone number.'); - } - - // if PS_CUSTOMER_ADDRESS_CREATION is disabled And customer has no addresses then create customer address - // with the details of first hotel which rooms he has in cart - if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION') - && isset($this->context->cart->id) - && $this->context->cart->id - ) { - if (Module::isInstalled('hotelreservationsystem')) { - include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - $objHtlCart = new HotelCartBookingData(); - if ($htlCartInfo = $objHtlCart->getCartCurrentDataByCartId($this->context->cart->id)) { - if (isset($htlCartInfo[0]['id_hotel']) && ($idHotel = $htlCartInfo[0]['id_hotel'])) { - if ($address_info = HotelBranchInformation::getAddress($idHotel)) { - $_POST['lastname'] = Tools::getValue('customer_lastname'); - $_POST['firstname'] = Tools::getValue('customer_firstname'); - $_POST['address1'] = $address_info['address1']; - $_POST['city'] = $address_info['city']; - $_POST['postcode'] = $address_info['postcode']; - $_POST['alias'] = 'My address'; - $_POST['id_country'] = $address_info['id_country']; - $_POST['id_state'] = $address_info['id_state']; - $_POST['auto_generated'] = true; - // if form is shorter then address name will be customer name - $lastnameAddress = $_POST['lastname']; - $firstnameAddress = $_POST['firstname']; - } - } - } - } - } - // End - $this->errors = array_unique(array_merge($this->errors, $customer->validateController())); - - // Check the requires fields which are settings in the BO - $this->errors = $this->errors + $customer->validateFieldsRequiredDatabase(); - - if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) { - if (!count($this->errors)) { - - $this->processCustomerNewsletter($customer); - - $customer->firstname = Tools::ucwords($customer->firstname); - $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days')); - if (!Validate::isBirthDate($customer->birthday)) { - $this->errors[] = Tools::displayError('Invalid date of birth.'); - } - - // New Guest customer - $customer->is_guest = (Tools::isSubmit('is_new_customer') ? !Tools::getValue('is_new_customer', 1) : 0); - $customer->active = 1; - - if (!count($this->errors)) { - if ($customer->add()) { - if (!$customer->is_guest) { - if (!$this->sendConfirmationMail($customer)) { - $this->errors[] = Tools::displayError('The email cannot be sent.'); - } - } - - $this->updateContext($customer); - - $this->context->cart->update(); - Hook::exec('actionCustomerAccountAdd', array( - '_POST' => $_POST, - 'newCustomer' => $customer - )); - if ($this->ajax) { - $return = array( - 'hasError' => !empty($this->errors), - 'errors' => $this->errors, - 'isSaved' => true, - 'id_customer' => (int)$this->context->cookie->id_customer, - 'id_address_delivery' => $this->context->cart->id_address_delivery, - 'id_address_invoice' => $this->context->cart->id_address_invoice, - 'token' => Tools::getToken(false) - ); - $this->ajaxDie(json_encode($return)); - } - - if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) { - Tools::redirect(html_entity_decode($back)); - } - - // redirection: if cart is not empty : redirection to the cart - if (count($this->context->cart->getProducts(true)) > 0) { - $multi = (int)Tools::getValue('multi-shipping'); - Tools::redirect('index.php?controller=order'.($multi ? '&multi-shipping='.$multi : '')); - } - // else : redirection to the account - else { - Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account')); - } - } else { - $this->errors[] = Tools::displayError('An error occurred while creating your account.'); - } - } - } - } else { - // if registration type is in one step, we save the address - - $_POST['lastname'] = $lastnameAddress; - $_POST['firstname'] = $firstnameAddress; - $post_back = $_POST; - // Preparing addresses - foreach ($addresses_types as $addresses_type) { - $$addresses_type = new Address(); - $$addresses_type->id_customer = 1; - - if ($addresses_type == 'address_invoice') { - foreach ($_POST as $key => &$post) { - if ($tmp = Tools::getValue($key.'_invoice')) { - $post = $tmp; - } - } - } - - $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController())); - if ($addresses_type == 'address_invoice') { - $_POST = $post_back; - } - - if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country)) { - $this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country'); - } - - if (!$country->active) { - $this->errors[] = Tools::displayError('This country is not active.'); - } - - $postcode = $$addresses_type->postcode; - /* Check zip code format */ - if ($country->zip_code_format && !$country->checkZipCode($postcode)) { - $this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format)))); - } elseif (empty($postcode) && $country->need_zip_code) { - $this->errors[] = Tools::displayError('A Zip / Postal code is required.'); - } elseif ($postcode && !Validate::isPostCode($postcode)) { - $this->errors[] = Tools::displayError('The Zip / Postal code is invalid.'); - } - - if ($country->need_identification_number) { - if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')) { - $$addresses_type->dni = null; - } elseif (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))) { - $this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.'); - } - } elseif (!$country->need_identification_number) { - $$addresses_type->dni = null; - } - - if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) { - if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) { - $this->errors[] = Tools::displayError('Country is invalid'); - } - } - $contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0; - $id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0; - if ((Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) { - $this->errors[] = Tools::displayError('This country requires you to choose a State.'); - } - } - } - - if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) { - $this->errors[] = Tools::displayError('Invalid date of birth'); - } if (!count($this->errors)) { - if (Customer::customerExists(Tools::getValue('email'))) { - $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false); + // Preparing customer + $customer = new Customer(); + $lastnameAddress = Tools::getValue('lastname'); + $firstnameAddress = Tools::getValue('firstname'); + $_POST['lastname'] = Tools::getValue('customer_lastname', $lastnameAddress); + $_POST['firstname'] = Tools::getValue('customer_firstname', $firstnameAddress); + $addresses_types = array('address'); + + if (!Configuration::get('PS_ORDER_PROCESS_TYPE') && Configuration::get('PS_GUEST_CHECKOUT_ENABLED') && Tools::getValue('invoice_address')) { + $addresses_types[] = 'address_invoice'; } - $this->processCustomerNewsletter($customer); + $error_phone = false; + if (Configuration::get('PS_ONE_PHONE_AT_LEAST')) { + if (Tools::isSubmit('submitGuestAccount') || !Tools::getValue('is_new_customer')) { + if (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')) { + $error_phone = true; + } + } elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE')) + || (Configuration::get('PS_ORDER_PROCESS_TYPE') && !Tools::getValue('email_create')) + || (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Tools::getValue('email_create'))) + && (!Tools::getValue('phone') && !Tools::getValue('phone_mobile'))) { + $error_phone = true; + } + } - $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days')); - if (!Validate::isBirthDate($customer->birthday)) { + if ($error_phone) { + $this->errors[] = Tools::displayError('You must register at least one phone number.'); + } + + // if PS_CUSTOMER_ADDRESS_CREATION is disabled And customer has no addresses then create customer address + // with the details of first hotel which rooms he has in cart + if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION') + && isset($this->context->cart->id) + && $this->context->cart->id + ) { + if (Module::isInstalled('hotelreservationsystem')) { + include_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; + $objHtlCart = new HotelCartBookingData(); + if ($htlCartInfo = $objHtlCart->getCartCurrentDataByCartId($this->context->cart->id)) { + if (isset($htlCartInfo[0]['id_hotel']) && ($idHotel = $htlCartInfo[0]['id_hotel'])) { + if ($address_info = HotelBranchInformation::getAddress($idHotel)) { + $_POST['lastname'] = Tools::getValue('customer_lastname'); + $_POST['firstname'] = Tools::getValue('customer_firstname'); + $_POST['address1'] = $address_info['address1']; + $_POST['city'] = $address_info['city']; + $_POST['postcode'] = $address_info['postcode']; + $_POST['alias'] = 'My address'; + $_POST['id_country'] = $address_info['id_country']; + $_POST['id_state'] = $address_info['id_state']; + $_POST['auto_generated'] = true; + // if form is shorter then address name will be customer name + $lastnameAddress = $_POST['lastname']; + $firstnameAddress = $_POST['firstname']; + } + } + } + } + } + // End + $this->errors = array_unique(array_merge($this->errors, $customer->validateController())); + + // Check the requires fields which are settings in the BO + $this->errors = $this->errors + $customer->validateFieldsRequiredDatabase(); + + if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) { + if (!count($this->errors)) { + + $this->processCustomerNewsletter($customer); + + $customer->firstname = Tools::ucwords($customer->firstname); + $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days')); + if (!Validate::isBirthDate($customer->birthday)) { + $this->errors[] = Tools::displayError('Invalid date of birth.'); + } + + // New Guest customer + $customer->is_guest = (Tools::isSubmit('is_new_customer') ? !Tools::getValue('is_new_customer', 1) : 0); + $customer->active = 1; + + if (!count($this->errors)) { + if ($customer->add()) { + if (!$customer->is_guest) { + if (!$this->sendConfirmationMail($customer)) { + $this->errors[] = Tools::displayError('The email cannot be sent.'); + } + } + + $this->updateContext($customer); + + $this->context->cart->update(); + Hook::exec('actionCustomerAccountAdd', array( + '_POST' => $_POST, + 'newCustomer' => $customer + )); + if ($this->ajax) { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'isSaved' => true, + 'id_customer' => (int)$this->context->cookie->id_customer, + 'id_address_delivery' => $this->context->cart->id_address_delivery, + 'id_address_invoice' => $this->context->cart->id_address_invoice, + 'token' => Tools::getToken(false) + ); + $this->ajaxDie(json_encode($return)); + } + + if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) { + Tools::redirect(html_entity_decode($back)); + } + + // redirection: if cart is not empty : redirection to the cart + if (count($this->context->cart->getProducts(true)) > 0) { + $multi = (int)Tools::getValue('multi-shipping'); + Tools::redirect('index.php?controller=order'.($multi ? '&multi-shipping='.$multi : '')); + } + // else : redirection to the account + else { + Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account')); + } + } else { + $this->errors[] = Tools::displayError('An error occurred while creating your account.'); + } + } + } + } else { + // if registration type is in one step, we save the address + + $_POST['lastname'] = $lastnameAddress; + $_POST['firstname'] = $firstnameAddress; + $post_back = $_POST; + // Preparing addresses + foreach ($addresses_types as $addresses_type) { + $$addresses_type = new Address(); + $$addresses_type->id_customer = 1; + + if ($addresses_type == 'address_invoice') { + foreach ($_POST as $key => &$post) { + if ($tmp = Tools::getValue($key.'_invoice')) { + $post = $tmp; + } + } + } + + $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController())); + if ($addresses_type == 'address_invoice') { + $_POST = $post_back; + } + + if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country)) { + $this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country'); + } + + if (!$country->active) { + $this->errors[] = Tools::displayError('This country is not active.'); + } + + $postcode = $$addresses_type->postcode; + /* Check zip code format */ + if ($country->zip_code_format && !$country->checkZipCode($postcode)) { + $this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format)))); + } elseif (empty($postcode) && $country->need_zip_code) { + $this->errors[] = Tools::displayError('A Zip / Postal code is required.'); + } elseif ($postcode && !Validate::isPostCode($postcode)) { + $this->errors[] = Tools::displayError('The Zip / Postal code is invalid.'); + } + + if ($country->need_identification_number) { + if (!Configuration::get('PS_CUSTOMER_ADDRESS_CREATION')) { + $$addresses_type->dni = null; + } elseif (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))) { + $this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.'); + } + } elseif (!$country->need_identification_number) { + $$addresses_type->dni = null; + } + + if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) { + if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) { + $this->errors[] = Tools::displayError('Country is invalid'); + } + } + $contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0; + $id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0; + if ((Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) { + $this->errors[] = Tools::displayError('This country requires you to choose a State.'); + } + } + } + + if (!@checkdate(Tools::getValue('months'), Tools::getValue('days'), Tools::getValue('years')) && !(Tools::getValue('months') == '' && Tools::getValue('days') == '' && Tools::getValue('years') == '')) { $this->errors[] = Tools::displayError('Invalid date of birth'); } if (!count($this->errors)) { - $customer->active = 1; - // New Guest customer - if (Tools::isSubmit('is_new_customer')) { - $customer->is_guest = !Tools::getValue('is_new_customer', 1); - } else { - $customer->is_guest = 0; + if (Customer::customerExists(Tools::getValue('email'))) { + $this->errors[] = Tools::displayError('An account using this email address has already been registered. Please enter a valid password or request a new one. ', false); } - if (!$customer->add()) { - $this->errors[] = Tools::displayError('An error occurred while creating your account.'); - } else { - foreach ($addresses_types as $addresses_type) { - $$addresses_type->id_customer = (int)$customer->id; - if ($addresses_type == 'address_invoice') { - foreach ($_POST as $key => &$post) { - if ($tmp = Tools::getValue($key.'_invoice')) { - $post = $tmp; + + $this->processCustomerNewsletter($customer); + + $customer->birthday = (empty($_POST['years']) ? '' : (int)Tools::getValue('years').'-'.(int)Tools::getValue('months').'-'.(int)Tools::getValue('days')); + if (!Validate::isBirthDate($customer->birthday)) { + $this->errors[] = Tools::displayError('Invalid date of birth'); + } + + if (!count($this->errors)) { + $customer->active = 1; + // New Guest customer + if (Tools::isSubmit('is_new_customer')) { + $customer->is_guest = !Tools::getValue('is_new_customer', 1); + } else { + $customer->is_guest = 0; + } + if (!$customer->add()) { + $this->errors[] = Tools::displayError('An error occurred while creating your account.'); + } else { + foreach ($addresses_types as $addresses_type) { + $$addresses_type->id_customer = (int)$customer->id; + if ($addresses_type == 'address_invoice') { + foreach ($_POST as $key => &$post) { + if ($tmp = Tools::getValue($key.'_invoice')) { + $post = $tmp; + } } } - } - $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController())); - if ($addresses_type == 'address_invoice') { - $_POST = $post_back; - } - if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add()) { - $this->errors[] = Tools::displayError('An error occurred while creating your address.'); - } - } - if (!count($this->errors)) { - if (!$customer->is_guest) { - $this->context->customer = $customer; - $customer->cleanGroups(); - // we add the guest customer in the default customer group - $customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP'))); - if (!$this->sendConfirmationMail($customer)) { - // webkul - we will not stop process on email delivery fails - //$this->errors[] = Tools::displayError('The email cannot be sent.'); + $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController())); + if ($addresses_type == 'address_invoice') { + $_POST = $post_back; + } + if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->add()) { + $this->errors[] = Tools::displayError('An error occurred while creating your address.'); } - } else { - $customer->cleanGroups(); - // we add the guest customer in the guest customer group - $customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP'))); - } - $this->updateContext($customer); - $this->context->cart->id_address_delivery = (int)Address::getFirstCustomerAddressId((int)$customer->id); - $this->context->cart->id_address_invoice = (int)Address::getFirstCustomerAddressId((int)$customer->id); - if (isset($address_invoice) && Validate::isLoadedObject($address_invoice)) { - $this->context->cart->id_address_invoice = (int)$address_invoice->id; } + if (!count($this->errors)) { + if (!$customer->is_guest) { + $this->context->customer = $customer; + $customer->cleanGroups(); + // we add the guest customer in the default customer group + $customer->addGroups(array((int)Configuration::get('PS_CUSTOMER_GROUP'))); + if (!$this->sendConfirmationMail($customer)) { + // webkul - we will not stop process on email delivery fails + //$this->errors[] = Tools::displayError('The email cannot be sent.'); + } + } else { + $customer->cleanGroups(); + // we add the guest customer in the guest customer group + $customer->addGroups(array((int)Configuration::get('PS_GUEST_GROUP'))); + } + $this->updateContext($customer); + $this->context->cart->id_address_delivery = (int)Address::getFirstCustomerAddressId((int)$customer->id); + $this->context->cart->id_address_invoice = (int)Address::getFirstCustomerAddressId((int)$customer->id); + if (isset($address_invoice) && Validate::isLoadedObject($address_invoice)) { + $this->context->cart->id_address_invoice = (int)$address_invoice->id; + } - if ($this->ajax && Configuration::get('PS_ORDER_PROCESS_TYPE')) { - $delivery_option = array((int)$this->context->cart->id_address_delivery => (int)$this->context->cart->id_carrier.','); - $this->context->cart->setDeliveryOption($delivery_option); - } + if ($this->ajax && Configuration::get('PS_ORDER_PROCESS_TYPE')) { + $delivery_option = array((int)$this->context->cart->id_address_delivery => (int)$this->context->cart->id_carrier.','); + $this->context->cart->setDeliveryOption($delivery_option); + } - // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated - $this->context->cart->update(); + // If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated + $this->context->cart->update(); - // Avoid articles without delivery address on the cart - $this->context->cart->autosetProductAddress(); + // Avoid articles without delivery address on the cart + $this->context->cart->autosetProductAddress(); - Hook::exec('actionCustomerAccountAdd', array( - '_POST' => $_POST, - 'newCustomer' => $customer - )); - if ($this->ajax) { - $return = array( - 'hasError' => !empty($this->errors), - 'errors' => $this->errors, - 'isSaved' => true, - 'id_customer' => (int)$this->context->cookie->id_customer, - 'id_address_delivery' => $this->context->cart->id_address_delivery, - 'id_address_invoice' => $this->context->cart->id_address_invoice, - 'token' => Tools::getToken(false) - ); - $this->ajaxDie(json_encode($return)); - } - // if registration type is in two steps, we redirect to register address - if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) { - Tools::redirect('index.php?controller=address'); - } + Hook::exec('actionCustomerAccountAdd', array( + '_POST' => $_POST, + 'newCustomer' => $customer + )); + if ($this->ajax) { + $return = array( + 'hasError' => !empty($this->errors), + 'errors' => $this->errors, + 'isSaved' => true, + 'id_customer' => (int)$this->context->cookie->id_customer, + 'id_address_delivery' => $this->context->cart->id_address_delivery, + 'id_address_invoice' => $this->context->cart->id_address_invoice, + 'token' => Tools::getToken(false) + ); + $this->ajaxDie(json_encode($return)); + } + // if registration type is in two steps, we redirect to register address + if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !$this->ajax && !Tools::isSubmit('submitGuestAccount')) { + Tools::redirect('index.php?controller=address'); + } - if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) { - Tools::redirect(html_entity_decode($back)); - } + if (($back = Tools::getValue('back')) && $back == Tools::secureReferrer($back)) { + Tools::redirect(html_entity_decode($back)); + } - // redirection: if cart is not empty : redirection to the cart - if (count($this->context->cart->getProducts(true)) > 0) { - Tools::redirect('index.php?controller=order'.($multi = (int)Tools::getValue('multi-shipping') ? '&multi-shipping='.$multi : '')); - } - // else : redirection to the account - else { - Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account')); + // redirection: if cart is not empty : redirection to the cart + if (count($this->context->cart->getProducts(true)) > 0) { + Tools::redirect('index.php?controller=order'.($multi = (int)Tools::getValue('multi-shipping') ? '&multi-shipping='.$multi : '')); + } + // else : redirection to the account + else { + Tools::redirect('index.php?controller='.(($this->authRedirection !== false) ? urlencode($this->authRedirection) : 'my-account')); + } } } } @@ -772,12 +779,21 @@ class AuthControllerCore extends FrontController */ protected function processTransformAccount() { - if (!Validate::isEmail($email = trim(Tools::getValue('email_create'))) || empty($email)) { + if (!Validate::isEmail($email = trim(Tools::getValue('email_create', Tools::getValue('email')))) || empty($email)) { $this->errors[] = Tools::displayError('Invalid email address.'); } elseif ($id_customer = Customer::customerExists($email, true, false)) { $customer = new Customer($id_customer); if ($customer->transformToCustomer($this->context->language->id)) { $this->confirmations[] = 'TRANSFORM_OK'; + + $back = ''; + if ($back == Tools::secureReferrer(Tools::getValue('back'))) { + $back = html_entity_decode($back); + } else { + $back = Tools::safeOutput($back); + } + $this->ajaxExtraData['redirect_link'] = $this->context->link->getPageLink('authentication'). + ($back ? '?back='.$back.'&' : '?').'guest_transform_success=1'; } else { $this->errors[] = Tools::displayError('Your guest account could not be transformed to a customer account.'); } diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl index e267cdf05..62f9df117 100644 --- a/themes/hotel-reservation-theme/authentication.tpl +++ b/themes/hotel-reservation-theme/authentication.tpl @@ -50,11 +50,13 @@
{/if}-->
-
- + {/if}

{l s='Create an account'}

diff --git a/themes/hotel-reservation-theme/css/authentication.css b/themes/hotel-reservation-theme/css/authentication.css index d89e3b596..de39d3d01 100644 --- a/themes/hotel-reservation-theme/css/authentication.css +++ b/themes/hotel-reservation-theme/css/authentication.css @@ -12,9 +12,9 @@ margin-bottom: 8px; } #create-account_form .form-group { margin: 0 0 20px 0; } - #create-account_form .btn-transform { + #authentication .btn-transform { padding: 0; - font-size: 16px; + font-size: 1em; cursor: pointer; vertical-align: initial; text-decoration: underline; } diff --git a/themes/hotel-reservation-theme/js/authentication.js b/themes/hotel-reservation-theme/js/authentication.js index 78c3cc503..dfee8c4a1 100644 --- a/themes/hotel-reservation-theme/js/authentication.js +++ b/themes/hotel-reservation-theme/js/authentication.js @@ -41,7 +41,8 @@ function submitFunction(submitAction) { var data = { controller: 'authentication', ajax: true, - email_create: $('#email_create').val(), + email_create: $('#email_create').val(), // for login page + email: $('#email').val(), // for personal info page back: $('input[name=back]').val(), token: token }; @@ -59,7 +60,7 @@ function submitFunction(submitAction) { // display confirmations if (jsonData.hasConfirmation) { if (in_array('TRANSFORM_OK', jsonData.confirmations)) { - $('#guest_transform_success').show('slow'); + window.location = jsonData.ajaxExtraData.redirect_link } return; } From 63013bf60ea79f94c220c70b60c2fcbba428db1f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 15:37:55 +0530 Subject: [PATCH 38/45] Remove unused fields from Catalog Price rule --- .../specific_price_rule/helpers/form/form.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl index 9ad52f538..6f7ee30f4 100644 --- a/admin/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl @@ -52,7 +52,7 @@
-
+ {*
@@ -68,8 +68,8 @@
-
-
+
*} + {*
@@ -85,8 +85,8 @@
-
-
+
*} + {*
@@ -111,7 +111,7 @@
-
+
*}
From 2a81cc028ca4f613f8df65f6d328824badd8a563 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 15:43:10 +0530 Subject: [PATCH 39/45] text change on order refund request view --- .../controllers/admin/AdminOrderRefundRequestsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 9bad576c7..ba1b5d9cd 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -164,7 +164,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController } $this->fields_list = array( 'id_order_return' => array( - 'title' => $this->l('ID'), + 'title' => $this->l('Refund ID'), 'align' => 'center', 'class' => 'fixed-width-xs', ), From 54127b5de661960bd7deddbb216806ea9a6eee6d Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 16:19:32 +0530 Subject: [PATCH 40/45] Text change on refund detail view page at front officer --- themes/hotel-reservation-theme/order-return.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl index 8a53d8b49..f34eb786f 100644 --- a/themes/hotel-reservation-theme/order-return.tpl +++ b/themes/hotel-reservation-theme/order-return.tpl @@ -96,7 +96,7 @@
- {l s='Total Order Amount'} + {l s='Total order amount'}
{displayPrice price=$orderInfo['total_paid_tax_incl'] currency=$orderInfo['id_currency']} @@ -104,7 +104,7 @@
- {l s='Refund initiated on'} + {l s='Request date'}
{$orderReturnInfo['date_add']|date_format:"%d-%m-%Y %I:%M %p"} @@ -114,7 +114,7 @@ {if $currentStateInfo['refunded']}
- {l s='Refunded Amount' mod='hotelreservationsystem'} + {l s='Refunded amount' mod='hotelreservationsystem'}
{displayPrice price=$orderReturnInfo['refunded_amount'] currency=$orderInfo['id_currency']} @@ -122,7 +122,7 @@
- {l s='Payment Mode' mod='hotelreservationsystem'} + {l s='Payment mode' mod='hotelreservationsystem'}
{$orderReturnInfo['payment_mode']|escape:'html':'UTF-8'} @@ -130,7 +130,7 @@
- {l s='Transaction Id' mod='hotelreservationsystem'} + {l s='Transaction ID' mod='hotelreservationsystem'}
{$orderReturnInfo['id_transaction']|escape:'html':'UTF-8'} From 7405418aaf848036d2b525a23de6e9093ddc3af8 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 17:11:27 +0530 Subject: [PATCH 41/45] Fix filter issues on Assign Hotel Features --- .../controllers/admin/AdminAssignHotelFeatures.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php b/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php index 3530cd844..11a6e5c01 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAssignHotelFeatures.php @@ -40,11 +40,12 @@ class AdminAssignHotelFeaturesController extends ModuleAdminController $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'htl_branch_info` hi ON (hi.`id` = a.`id_hotel`)'; $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hil ON (hi.`id` = hil.`id` AND hil.id_lang = '.(int)$this->context->language->id.')'; - $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = hi.`state_id`)'; - $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (cl.`id_country` = hi.`country_id` + $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'address` addr ON (addr.`id_hotel` = hi.`id`)'; + $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = addr.`id_state`)'; + $this->_join .= 'LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (cl.`id_country` = addr.`id_country` AND cl.`id_lang` = '.(int)$this->context->language->id.')'; - $this->_select .= 'hi.`city` as htl_city, hi.`id` as htl_id, hil.`hotel_name` as htl_name, + $this->_select .= 'addr.`city` as htl_city, hi.`id` as htl_id, hil.`hotel_name` as htl_name, s.`name` as `state_name`, cl.`name`'; $this->_group = 'GROUP BY a.`id_hotel`'; @@ -57,12 +58,12 @@ class AdminAssignHotelFeaturesController extends ModuleAdminController 'htl_name' => array( 'title' => $this->l('Hotel Name'), 'align' => 'center', - 'filter_key' => 'hi!hotel_name', + 'filter_key' => 'hil!hotel_name', ), 'htl_city' => array( 'title' => $this->l('City'), 'align' => 'center', - 'filter_key' => 'hi!city', + 'filter_key' => 'addr!city', ), 'state_name' => array( From 40b2bb590dfe8843f1a135c986e0527a40a3bdcd Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sun, 5 Mar 2023 17:17:06 +0530 Subject: [PATCH 42/45] Fix PHP issue on front pages --- classes/Page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Page.php b/classes/Page.php index d2c26df76..f63641032 100644 --- a/classes/Page.php +++ b/classes/Page.php @@ -75,7 +75,7 @@ class PageCore extends ObjectModel FROM `'._DB_PREFIX_.'page` WHERE `id_page_type` = '.(int)$page_type_id.$where; $result = Db::getInstance()->getRow($sql); - if ($result['id_page']) { + if (isset($result['id_page']) && $result['id_page']) { return $result['id_page']; } From 8e7566d3199afa15571d143850109dc934f4d2b5 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 6 Mar 2023 11:35:24 +0530 Subject: [PATCH 43/45] Fix js errors on admin book now page --- js/fullcalendar/main.js | 1 - .../admin/AdminHotelRoomsBookingController.php | 13 +++++++++++++ .../views/js/admin/hotel_rooms_booking.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/js/fullcalendar/main.js b/js/fullcalendar/main.js index 2ad9d49a2..b3a60643c 100644 --- a/js/fullcalendar/main.js +++ b/js/fullcalendar/main.js @@ -9501,7 +9501,6 @@ var FullCalendar = (function (exports) { }); return (createElement(ContentHook, { hookProps: hookProps, content: options.dayCellContent, defaultContent: props.defaultContent }, props.children)); }; - console.log(DayCellContent); return DayCellContent; }(BaseComponent)); function refineDayCellHookProps(raw) { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 3030aadc6..340c92cca 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -466,6 +466,19 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_from'] = $cal_date_from; $bookingParams['date_to'] = $cal_date_to; $eventData = $objBookingDetail->getBookingData($bookingParams); + if (!$eventData) { + $eventData['stats'] = array( + 'total_room_type' => 0, + 'total_rooms' => 0, + 'max_avail_occupancy' => 0, + 'num_unavail' => 0, + 'num_cart' => 0, + 'num_booked' => 0, + 'num_avail' => 0, + 'num_part_avai' => 0, + ); + } + $eventData['date_format'] = Tools::displayDate($cal_date_from); $events[strtotime($bookingParams['date_from'])] = array( 'is_notification' => 1, diff --git a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js index de5b4a126..111bc776a 100644 --- a/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js +++ b/modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js @@ -49,7 +49,7 @@ $(document).ready(function() { $(info.el).closest('td').find('.day-info svg circle').attr('fill', '#7EC77B'); } else if (info.event.extendedProps.data.stats.num_part_avai > 0) { $(info.el).closest('td').find('.day-info svg circle').attr('fill', '#FFC224'); - } else if (info.event.extendedProps.data.stats.num_booked == info.event.extendedProps.data.stats.total_rooms) { + } else if ((info.event.extendedProps.data.stats.num_booked == info.event.extendedProps.data.stats.total_rooms) && info.event.extendedProps.data.stats.total_rooms != 0) { $(info.el).closest('td').find('.day-info svg circle').attr('fill', '#00AFF0'); } else { $(info.el).closest('td').find('.day-info svg circle').attr('fill', '#FF3838'); From 3d2e5422c89d039784bdece4a7f648130ea0ba7d Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Mon, 6 Mar 2023 14:51:07 +0530 Subject: [PATCH 44/45] Fix Add new buttons --- controllers/admin/AdminEmployeesController.php | 4 ++-- controllers/admin/AdminThemesController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php index ab1a12d45..64308b5a7 100644 --- a/controllers/admin/AdminEmployeesController.php +++ b/controllers/admin/AdminEmployeesController.php @@ -175,8 +175,6 @@ class AdminEmployeesControllerCore extends AdminController public function initPageHeaderToolbar() { - parent::initPageHeaderToolbar(); - if (empty($this->display)) { $this->page_header_toolbar_btn['new_employee'] = array( 'href' => self::$currentIndex.'&addemployee&token='.$this->token, @@ -195,6 +193,8 @@ class AdminEmployeesControllerCore extends AdminController $this->toolbar_title); } } + + parent::initPageHeaderToolbar(); } public function renderList() diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index eaf7f4c8a..53c8b11c1 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -716,8 +716,6 @@ class AdminThemesControllerCore extends AdminController public function initPageHeaderToolbar() { - parent::initPageHeaderToolbar(); - if (empty($this->display)) { $this->page_header_toolbar_btn['import_theme'] = array( 'href' => self::$currentIndex.'&action=importtheme&token='.$this->token, @@ -746,6 +744,8 @@ class AdminThemesControllerCore extends AdminController $title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title); $this->page_header_toolbar_title = $title; + + parent::initPageHeaderToolbar(); } private function checkParentClass($name) From 1af18389dbee599b18fbe1ad6bc2ecbe9354da84 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 7 Mar 2023 11:17:15 +0000 Subject: [PATCH 45/45] prevent adding service multiple times --- controllers/front/ProductController.php | 20 +++++++++- themes/hotel-reservation-theme/js/product.js | 42 +++++++++++++------- 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 03b88c709..73808d9c9 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -1319,12 +1319,13 @@ class ProductControllerCore extends FrontController public function displayAjaxCheckServiceProductWithRoomType() { $response = array( - 'status' => false + 'success' => false ); if ($this->isTokenValid()) { $idProduct = Tools::getValue('id_product'); $idServiceProduct = Tools::getValue('service_product'); + $addedServiceProduct = Tools::getValue('added_service_product'); if (Validate::isLoadedObject($objProduct = new Product($idProduct))) { if (!Product::isBookingProduct($idProduct)) { $response['error'] = Tools::displayError('Room Type info not Found'); @@ -1335,7 +1336,22 @@ class ProductControllerCore extends FrontController if (!$objRoomTypeServiceProduct->isRoomTypeLinkedWithProduct($idProduct, $idServiceProduct)) { $response['error'] = Tools::displayError('Selected product is not available with current room type'); } else { - $response['status'] = true; + if (Validate::isLoadedObject($objServiceProduct = new Product($idServiceProduct))) { + $response['success'] = true; + if (!$objServiceProduct->allow_multiple_quantity && !empty($addedServiceProduct)) { + if (!in_array($idServiceProduct, array_column($addedServiceProduct, 'id_product'))) { + $response['add'] = true; + $response['msg'] = 'Service is added to cart.'; + } else { + $response['msg'] = 'Service already added.'; + } + } else { + $response['add'] = true; + $response['msg'] = 'Service is added to cart.'; + } + } else { + $response['error'] = Tools::displayError('Service not Found'); + } } } else { $response['error'] = Tools::displayError('Room Type not Found'); diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js index 96ae9a806..0fd9c3409 100644 --- a/themes/hotel-reservation-theme/js/product.js +++ b/themes/hotel-reservation-theme/js/product.js @@ -1201,6 +1201,13 @@ $(document).ready(function() { if (typeof(qty) == 'undefined') { qty = 1; } + var added_service_product = []; + $('#additional_products input.service_product').each(function () { + added_service_product.push({ + 'id_product': $(this).data('id_product'), + 'quantity':$(this).val(), + }); + }); $.ajax({ type: 'POST', headers: { @@ -1215,31 +1222,36 @@ $(document).ready(function() { qty: qty, id_product: $('#product_page_product_id').val(), service_product: id_product, + added_service_product: added_service_product, action: 'checkServiceProductWithRoomType', ajax: true, token: static_token }, success: function(result) { - if (result.status) { - if ($('input#service_product_'+ id_product).length) { - var prevQty = $('input#service_product_'+ id_product).val(); - if (parseInt(prevQty) > 0) { - qty = parseInt(qty) + parseInt(prevQty); + if (result.success) { + if (result.add) { + if ($('input#service_product_'+ id_product).length) { + var prevQty = $('input#service_product_'+ id_product).val(); + if (parseInt(prevQty) > 0) { + qty = parseInt(qty) + parseInt(prevQty); + } + $('input#service_product_'+ id_product).val(qty); + } else { + $('').attr({ + id: 'service_product_'+ id_product, + name: 'service_product['+ id_product +'][]', + class: 'service_product', + 'data-id_product': id_product, + value: qty + }).appendTo('#additional_products'); } - $('input#service_product_'+ id_product).val(qty); - } else { - $('').attr({ - id: 'service_product_'+ id_product, - name: 'service_product['+ id_product +'][]', - class: 'service_product', - 'data-id_product': id_product, - value: qty - }).appendTo('#additional_products'); } // reset input $(that).closest('.service_product_action_block').find('input.service_product_qty').val(1); $(that).closest('.service_product_action_block').find('.qty_count span').text(1); - showSuccessMessage(cart_extra_service_add); + if (result.msg) { + showSuccessMessage(result.msg); + } BookingForm.refresh(); } else { if (result.error) {