diff --git a/admin/themes/default/sass/partials/_content.sass b/admin/themes/default/sass/partials/_content.sass index 54165bdf3..ab40342f3 100644 --- a/admin/themes/default/sass/partials/_content.sass +++ b/admin/themes/default/sass/partials/_content.sass @@ -16,7 +16,7 @@ body @include float(left) #content.bootstrap - padding: 90px 10px 0 + padding: 100px 10px 0 @include transition-property(margin) @include transition-duration(0.4s) @include transition-timing-function(ease-out) diff --git a/admin/themes/default/sass/partials/_header.sass b/admin/themes/default/sass/partials/_header.sass index f58be6050..a1ebadd42 100644 --- a/admin/themes/default/sass/partials/_header.sass +++ b/admin/themes/default/sass/partials/_header.sass @@ -24,6 +24,10 @@ #header_shopname @extend .navbar-brand text-decoration: none +.bootstrap + #header_shopname + @media (max-width: $screen-tablet) + @include padding(9px, 5px, 9px, 40px) #header_notifs_icon_wrapper @extend .nav diff --git a/admin/themes/default/sass/partials/_toolbar.sass b/admin/themes/default/sass/partials/_toolbar.sass index 01566d268..d74310693 100644 --- a/admin/themes/default/sass/partials/_toolbar.sass +++ b/admin/themes/default/sass/partials/_toolbar.sass @@ -1,6 +1,5 @@ .page-head width: 100% - height: 78px padding: 0 margin: 0 position: fixed @@ -18,14 +17,22 @@ font-weight: bold color: #363A41 white-space: nowrap - @include padding(31px, 0, 0, ($widthSidebarNav+20px)) - @media (max-width: $screen-tablet) - @include padding(26px, 0, 0, 70px) + @include padding(31px, 0, 20px, ($widthSidebarNav+20px)) + @media (max-width: $screen-phone) + @include padding(26px, 0, 55px, 70px) + @media (min-width: $screen-phone) and (max-width: $screen-tablet) + @include padding(26px, 0, 25px, 70px) a border-bottom: dotted 1px white &:hover color: black border-color: black + h2.page-title.configure + @include padding(31px, 0, 35px, ($widthSidebarNav+20px)) + @media (max-width: $screen-phone) + @include padding(26px, 0, 60px, 70px) + @media (min-width: $screen-phone) and (max-width: $screen-tablet) + @include padding(26px, 0, 40px, 70px) a color: white text-decoration: none @@ -42,6 +49,8 @@ background-color: transparent!important @include right(0) top: 18px + @media (max-width: $screen-tablet) + top: 25px @media (max-width: $screen-sm) #toolbar-nav border: none diff --git a/admin/themes/default/template/controllers/modules/configure.tpl b/admin/themes/default/template/controllers/modules/configure.tpl index 3fcf6569c..24b6560a0 100644 --- a/admin/themes/default/template/controllers/modules/configure.tpl +++ b/admin/themes/default/template/controllers/modules/configure.tpl @@ -26,7 +26,7 @@ {block name=pageTitle} -

+

{l s='Configure'}

{$module_display_name}

diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index 3bb29c765..1ceb61c62 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -17,7 +17,9 @@ * @license https://store.webkul.com/license.html *} +{if !isset($ajax) || !$ajax}
+{/if}
{l s='Cart Details'} @@ -51,7 +53,7 @@

{$data.room_type|escape:'html':'UTF-8'}

- {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} + {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} {dateFormat date=$data.date_from full=$is_full_date} - {dateFormat date=$data.date_to full=$is_full_date} {if $occupancy_required_for_booking} @@ -187,6 +189,7 @@
+{if !isset($ajax) || !$ajax} {* Modal for extra demands *} @@ -229,3 +232,4 @@ #rooms_extra_demands .room_demand_detail { padding: 15px 15px 0px 15px;} +{/if} diff --git a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl index d15493a00..11c7f1b0e 100644 --- a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl @@ -127,7 +127,7 @@ {if sizeof($invoices_collection)} -
+
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl index 61e5e168d..21e63328b 100644 --- a/admin/themes/default/template/controllers/products/configuration.tpl +++ b/admin/themes/default/template/controllers/products/configuration.tpl @@ -409,7 +409,7 @@ html += ''; html += ''; html += ''; - html += ''; + html += ''; html += ''; html += ''; html += ''; diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index e4c6fb00a..148be94a4 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -284,7 +284,7 @@ if (typeof data[index] == 'string') $.growl.error({ title: "", message: data[index]}); }); - else if (quicklink_list) + else { $("#header_quick ul.dropdown-menu").html(quicklink_list); showSuccessMessage(update_success_msg); diff --git a/classes/Customer.php b/classes/Customer.php index 2983aa607..337ff26be 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -323,11 +323,12 @@ class CustomerCore extends ObjectModel if ($carts) { $objHtlCartData = new HotelCartBookingData(); foreach ($carts as $cart) { - $objCart = new Cart($cart['id_cart']); - Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart WHERE id_cart='.(int)$cart['id_cart']); - Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_product WHERE id_cart='.(int)$cart['id_cart']); - // delete rows from hotel booking cart table - $objHtlCartData->deleteCartBookingData($cart['id_cart'], 0, 0, 0, 0, 0); + if ($cart['id_cart']) { + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart WHERE id_cart='.(int)$cart['id_cart']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_product WHERE id_cart='.(int)$cart['id_cart']); + // delete rows from hotel booking cart table + $objHtlCartData->deleteCartBookingData($cart['id_cart'], 0, 0, 0, 0, 0); + } } } diff --git a/classes/Tab.php b/classes/Tab.php index cf68e32fa..1ebc35469 100644 --- a/classes/Tab.php +++ b/classes/Tab.php @@ -503,11 +503,13 @@ class TabCore extends ObjectModel public static function recursiveTab($id_tab, $tabs) { - $admin_tab = Tab::getTab((int)Context::getContext()->language->id, $id_tab); - $tabs[] = $admin_tab; - if ($admin_tab['id_parent'] > 0) { - $tabs = Tab::recursiveTab($admin_tab['id_parent'], $tabs); + if ($admin_tab = Tab::getTab((int)Context::getContext()->language->id, $id_tab)) { + $tabs[] = $admin_tab; + if (isset($admin_tab['id_parent']) && $admin_tab['id_parent'] > 0) { + $tabs = Tab::recursiveTab($admin_tab['id_parent'], $tabs); + } } + return $tabs; } diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 12bef797f..f25115eb2 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -666,7 +666,7 @@ class AdminControllerCore extends Controller )); /* BEGIN - Backward compatibility < 1.6.0.3 */ - $this->breadcrumbs[] = $tabs[0]['name']; + $this->breadcrumbs[] = isset($tabs[0]['name']) ? $tabs[0]['name'] : '' ; $navigation_pipe = (Configuration::get('PS_NAVIGATION_PIPE') ? Configuration::get('PS_NAVIGATION_PIPE') : '>'); $this->context->smarty->assign('navigationPipe', $navigation_pipe); /* END - Backward compatibility < 1.6.0.3 */ diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index e8203131f..e2a82cbf0 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -347,9 +347,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate if ($type_value) if (isset($customer->id)) { $cart_obj = new Cart($this->order->id_cart); - $order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, $cart_obj->id_guest, $type_value['product_id'], $customer->id, $type_value['id_order_detail']); + $order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, $cart_obj->id_guest, $type_value['product_id'], $customer->id); } else { - $order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, $customer->id_guest, $type_value['product_id'], 0, $type_value['id_order_detail']); + $order_bk_data = $obj_htl_bk_dtl->getOnlyOrderBookingData($this->order->id, $customer->id_guest, $type_value['product_id'], 0); } $cart_htl_data[$type_key]['id_product'] = $type_value['product_id']; @@ -376,40 +376,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; $var_quant = (int)$cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] += ($data_v['total_price_tax_excl']); - // For order refund - $cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room']; } else { - $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands( - $order_obj->id, - $type_value['product_id'], - 0, - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 0, - 0, - $type_value['id_order_detail'] - ); - $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands( - $order_obj->id, - $type_value['product_id'], - 0, - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 1, - 0, - $type_value['id_order_detail'] - ); $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( $order_obj->id, 0, @@ -443,33 +412,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate 0 ); - $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $order_obj->id, - 0, - 0, - $data_v['id_product'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 1, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $order_obj->id, - 0, - 0, - $data_v['id_product'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 0, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1; @@ -480,18 +422,71 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = ($data_v['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']); - + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_excl'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_incl'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = 0; // For order refund $cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room']; - $totalDemandsPriceTE += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te']; - $totalDemandsPriceTI += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti']; } + + $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + $order_obj->id, + $type_value['product_id'], + 0, + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 0, + $data_v['id'] + ); + $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti'] = $objBookingDemand->getRoomTypeBookingExtraDemands( + $order_obj->id, + $type_value['product_id'], + 0, + $data_v['date_from'], + $data_v['date_to'], + 0, + 1, + 1, + $data_v['id'] + ); + + $totalDemandsPriceTE += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te']; + $totalDemandsPriceTI += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti']; + + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_excl'] += $data_v['total_price_tax_excl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_incl'] += $data_v['total_price_tax_incl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $order_obj->id, + 0, + 0, + $data_v['id_product'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $order_obj->id, + 0, + 0, + $data_v['id_product'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( $order_obj->id, $type_value['product_id'], @@ -537,6 +532,13 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate } } + foreach ($cart_htl_data[$type_key]['date_diff'] as $date_join => $val) { + $num_days = $val['num_days']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $val['total_price_tax_excl']/$num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $val['total_price_tax_excl']/$num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] += ($val['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']); + $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + ($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']/$num_days); + } // calculate averages now foreach ($cart_htl_data[$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); diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 2ce84593f..0954044c1 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -612,10 +612,24 @@ class AdminCartsControllerCore extends AdminController $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id); - $cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart); + + if ($cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart)) { + $objRoomType = new HotelRoomType(); + foreach ($cart_detail_data as $key => $cart_data) { + + $cart_detail_data[$key]['room_type_info'] = $objRoomType->getRoomTypeInfoByIdProduct($cart_data['id_product']); + } + } + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + $this->context->smarty->assign(array( 'cart_detail_data' => $cart_detail_data, 'currency' => new Currency((int)$this->context->cart->id_currency), + 'occupancy_required_for_booking' => $occupancyRequiredForBooking, + 'ajax' => true )); $tpl_path = 'default/template/controllers/orders/_current_cart_details_data.tpl'; diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index b933780ad..3b5d80ce3 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -218,7 +218,7 @@ class AdminEmailsControllerCore extends AdminController if (!defined('_PS_HOST_MODE_')) { $this->fields_options['email']['fields']['PS_MAIL_METHOD']['choices'][1] = - $this->l('Use PHP\'s mail() function (recommended; works in most cases)'); + $this->l('Use PHP\'s mail() function'); } ksort($this->fields_options['email']['fields']['PS_MAIL_METHOD']['choices']); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index b852574d7..90593bfbc 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -855,6 +855,7 @@ class AdminOrdersControllerCore extends AdminController $this->context->smarty->assign( array( 'order' => $objOrder, + 'invoices_collection' => $objOrder->getInvoicesCollection(), 'currency' => new Currency($objOrder->id_currency), 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), ) @@ -895,89 +896,92 @@ class AdminOrdersControllerCore extends AdminController && ($productLineData = Tools::getValue('product_line_data')) ) { $productLineData = json_decode($productLineData, true); + if (Validate::isLoadedObject($objOrderDetail = new OrderDetail($productLineData['id_order_detail']))) { + $productLineData['id_order_invoice'] = $objOrderDetail->id_order_invoice; + $smartyVars = array( + 'order' => $objOrder, + 'data' => $productLineData, + 'currency' => new Currency($objOrder->id_currency), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'orderEdit' => 1, + ); - $smartyVars = array( - 'order' => $objOrder, - 'data' => $productLineData, - 'currency' => new Currency($objOrder->id_currency), - 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), - 'orderEdit' => 1, - ); + $objCurrency = new Currency($objOrder->id_currency); + $smartyVars['orderCurrency'] = $objOrder->id_currency; + $smartyVars['currencySign'] = $objCurrency->sign; + $smartyVars['link'] = $this->context->link; - $objCurrency = new Currency($objOrder->id_currency); - $smartyVars['orderCurrency'] = $objOrder->id_currency; - $smartyVars['currencySign'] = $objCurrency->sign; - $smartyVars['link'] = $this->context->link; + $smartyVars['id_booking_detail'] = $productLineData['id']; - $smartyVars['id_booking_detail'] = $productLineData['id']; + $objBookingDemand = new HotelBookingDemands(); - $objBookingDemand = new HotelBookingDemands(); + // set context currency So that we can get prices in the order currency + $this->context->currency = $objCurrency; - // set context currency So that we can get prices in the order currency - $this->context->currency = $objCurrency; - - if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - $productLineData['id'] - )) { - $smartyVars['extraDemands'] = $extraDemands; - } - - // get room type additional demands - $objRoomDemands = new HotelRoomTypeDemand(); - if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) { - foreach ($roomTypeDemands as &$demand) { - // if demand has advance options then set demand price as first advance option price. - if (isset($demand['adv_option']) && $demand['adv_option']) { - $demand['price'] = current($demand['adv_option'])['price']; - } + if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + $productLineData['id'] + )) { + $smartyVars['extraDemands'] = $extraDemands; } - $smartyVars['roomTypeDemands'] = $roomTypeDemands; - } - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( - $productLineData['id'] - )) { - $smartyVars['additionalServices'] = $additionalServices; - } - - // get room type additional demands - $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); - if ($roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, false, 2, null)) { - if ($additionalServices) { - foreach ($roomTypeServiceProducts as $key => $product) { - if (in_array($product['id_product'], array_column($additionalServices['additional_services'], 'id_product'))) { - unset($roomTypeServiceProducts[$key]); + // get room type additional demands + $objRoomDemands = new HotelRoomTypeDemand(); + if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) { + foreach ($roomTypeDemands as &$demand) { + // if demand has advance options then set demand price as first advance option price. + if (isset($demand['adv_option']) && $demand['adv_option']) { + $demand['price'] = current($demand['adv_option'])['price']; } } + $smartyVars['roomTypeDemands'] = $roomTypeDemands; } - $smartyVars['roomTypeServiceProducts'] = $roomTypeServiceProducts; + + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( + $productLineData['id'] + )) { + $smartyVars['additionalServices'] = $additionalServices; + } + + // get room type additional demands + $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); + if ($roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, false, 2, null)) { + if ($additionalServices) { + foreach ($roomTypeServiceProducts as $key => $product) { + if (in_array($product['id_product'], array_column($additionalServices['additional_services'], 'id_product'))) { + unset($roomTypeServiceProducts[$key]); + } + } + } + $smartyVars['roomTypeServiceProducts'] = $roomTypeServiceProducts; + } + + $objOrderReturn = new OrderReturn(); + $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); + $smartyVars['refundReqBookings'] = $refundReqBookings; + $smartyVars['invoices_collection'] = $objOrder->getInvoicesCollection(); + + $this->context->smarty->assign($smartyVars); + + $modal = array( + 'modal_id' => 'edit-room-booking-modal', + 'modal_class' => 'modal-lg order_detail_modal', + 'modal_title' => '  '.$this->l('Edit Room'), + 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_edit_room_booking.tpl'), + ); + + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); } - - $objOrderReturn = new OrderReturn(); - $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); - $smartyVars['refundReqBookings'] = $refundReqBookings; - - $this->context->smarty->assign($smartyVars); - - $modal = array( - 'modal_id' => 'edit-room-booking-modal', - 'modal_class' => 'modal-lg order_detail_modal', - 'modal_title' => '  '.$this->l('Edit Room'), - 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_edit_room_booking.tpl'), - ); - - $this->context->smarty->assign($modal); - $response['hasError'] = 0; - $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); } die(Tools::jsonEncode($response)); @@ -4408,14 +4412,15 @@ class AdminOrdersControllerCore extends AdminController } } - // Create Order detail information - $order_detail = new OrderDetail(); - $order_detail->createList($order, $cart, $order->getCurrentOrderState(), $cart->getProducts(), (isset($order_invoice) ? $order_invoice->id : 0), $use_taxes, (int)Tools::getValue('add_product_warehouse')); - // update totals amount of order $order->total_products += (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS); $order->total_products_wt += (float)$cart->getOrderTotal($use_taxes, Cart::ONLY_PRODUCTS); + // Create Order detail information + $order_detail = new OrderDetail(); + // In case there is no room in the order the the create list will not add taxes as total_products is zero. + $order_detail->createList($order, $cart, $order->getCurrentOrderState(), $cart->getProducts(), (isset($order_invoice) ? $order_invoice->id : 0), $use_taxes, (int)Tools::getValue('add_product_warehouse')); + $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); @@ -4871,8 +4876,6 @@ class AdminOrdersControllerCore extends AdminController if (isset($order_invoice)) { // Apply changes on OrderInvoice - $order_invoice->total_products += (float)$diff_price_tax_excl; - $order_invoice->total_products_wt += (float)$diff_price_tax_incl; $order_invoice->total_paid_tax_excl += (float)$diff_price_tax_excl; $order_invoice->total_paid_tax_incl += (float)$diff_price_tax_incl; } @@ -4884,10 +4887,6 @@ class AdminOrdersControllerCore extends AdminController $order->total_products_wt += (float)$diff_price_tax_incl; $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0; - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $res &= $order->update(); } @@ -4912,10 +4911,6 @@ class AdminOrdersControllerCore extends AdminController } } - // Save order invoice - if (isset($order_invoice)) { - $res &= $order_invoice->update(); - } if ($qty_diff != 0) { $cartQty = $qty_diff; @@ -5041,7 +5036,6 @@ class AdminOrdersControllerCore extends AdminController )) { // update extra demands total prices if dates are changes (price calc method for each day) if ($extraDemands) { - $order = new Order($id_order); foreach ($extraDemands as $demand) { if (isset($demand['extra_demands']) && $demand['extra_demands']) { foreach ($demand['extra_demands'] as $rDemand) { @@ -5066,23 +5060,23 @@ class AdminOrdersControllerCore extends AdminController $objBookingDemand->total_price_tax_incl = $demandPriceTI; $objBookingDemand->save(); + + $order_invoice->total_paid_tax_excl -= $rDemand['total_price_tax_excl']; + $order_invoice->total_paid_tax_incl -= $rDemand['total_price_tax_incl']; + + $order_invoice->total_paid_tax_excl += (float)$objBookingDemand->total_price_tax_excl; + $order_invoice->total_paid_tax_incl += (float)$objBookingDemand->total_price_tax_incl; } } } } - // change order total save - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } if (isset($orderServiceProducts) && is_array($orderServiceProducts) && count($orderServiceProducts) ) { - $order = new Order((int) $id_order); foreach ($orderServiceProducts as $orderServiceProduct) { if (isset($orderServiceProduct['additional_services']) && is_array($orderServiceProduct['additional_services']) @@ -5128,6 +5122,12 @@ class AdminOrdersControllerCore extends AdminController $objOrderDetail->product_quantity += ($newProductQuantity - $oldProductQuantity); $objOrderDetail->save(); + $order_invoice->total_paid_tax_excl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl; + $order_invoice->total_paid_tax_incl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl; + + $order_invoice->total_paid_tax_excl += (float)$newTotalPriceTaxExcl; + $order_invoice->total_paid_tax_incl += (float)$newTotalPriceTaxIncl; + $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl; $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl; $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $newTotalPriceTaxExcl; @@ -5137,14 +5137,21 @@ class AdminOrdersControllerCore extends AdminController } } } - - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } } + $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); + $order->save(); + + // Save order invoice + if (isset($order_invoice)) { + $order_invoice->total_products = $order_invoice->total_paid_tax_excl; + $order_invoice->total_products_wt = $order_invoice->total_paid_tax_incl; + $res &= $order_invoice->update(); + } + if (is_array(Tools::getValue('product_quantity'))) { $view = $this->createTemplate('_customized_data.tpl')->fetch(); } else { @@ -5524,8 +5531,8 @@ class AdminOrdersControllerCore extends AdminController // Update Order // values changes as values are calculated accoding to the quantity of the product by webkul $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal() - $roomExtraDemandTI, _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false) - $roomExtraDemandTE, _PS_PRICE_COMPUTE_PRECISION_); $order->total_products -= ($diff_products_tax_excl + $additionlServicesTE); $order->total_products = $order->total_products > 0 ? $order->total_products : 0; @@ -5594,15 +5601,15 @@ class AdminOrdersControllerCore extends AdminController $objOrderCartRule->delete(); } - // If no rooms left in the order, Update Order total and discounts to 0 - $order->total_discounts = 0; - $order->total_discounts_tax_incl = 0; - $order->total_discounts_tax_excl = 0; - $order->total_paid = 0; - $order->total_paid_tax_incl = 0; - $order->total_paid_tax_excl = 0; - $order->update(); } + // If no rooms left in the order, Update Order total and discounts to 0 + $order->total_discounts = 0; + $order->total_discounts_tax_incl = 0; + $order->total_discounts_tax_excl = 0; + $order->total_paid = 0; + $order->total_paid_tax_incl = 0; + $order->total_paid_tax_excl = 0; + $order->update(); } // Assign to smarty informations in order to show the new product line @@ -6136,7 +6143,7 @@ class AdminOrdersControllerCore extends AdminController $del_id = Tools::getValue('del_id'); $room_id = Tools::getValue('id_room'); $obj_hotel_cart_detail = new HotelCartBookingData(); - $deleted = $obj_hotel_cart_detail->deleteRowById($del_id); + $deleted = $obj_hotel_cart_detail->deleteCartBookingData($cart_id, $id_product, $room_id, $dt_frm, $dt_to); if ($deleted) { HotelRoomTypeFeaturePricing::deleteByIdCart($cart_id, $id_product, $room_id, $dt_frm, $dt_to ); $obj_product_process = new HotelCartBookingData(); diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 98ec9c7eb..c54c25390 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -85,11 +85,12 @@ class AdminPPreferencesControllerCore extends AdminController 'PS_PRODUCT_SHORT_DESC_LIMIT' => array( 'title' => $this->l('Max size of short description'), 'hint' => $this->l('Set the maximum size of room type short description (in characters).'), - 'validation' => 'isInt', + 'validation' => 'isUnsignedInt', 'cast' => 'intval', 'type' => 'text', 'suffix' => $this->l('characters'), 'class' => 'fixed-width-xl', + 'desc' => $this->l('If set to 0, the maximum limit will be 400 characters.') ), /*'PS_QTY_DISCOUNT_ON_COMBINATION' => array( 'title' => $this->l('Quantity discounts based on'), diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index d31f6b3f4..3dc7ccdda 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3497,10 +3497,10 @@ class AdminProductsControllerCore extends AdminController } $objHotelRoomInfo->id_product = $id_product; $objHotelRoomInfo->id_hotel = $id_hotel; - $objHotelRoomInfo->room_num = $roomInfo['room_num']; + $objHotelRoomInfo->room_num = trim($roomInfo['room_num']); $objHotelRoomInfo->id_status = $roomInfo['id_status']; - $objHotelRoomInfo->floor = $roomInfo['floor']; - $objHotelRoomInfo->comment = $roomInfo['comment']; + $objHotelRoomInfo->floor = trim($roomInfo['floor']); + $objHotelRoomInfo->comment = trim($roomInfo['comment']); if ($objHotelRoomInfo->save() && $objHotelRoomInfo->id_status != HotelRoomInformation::STATUS_TEMPORARY_INACTIVE ) { @@ -3536,7 +3536,7 @@ class AdminProductsControllerCore extends AdminController } } - if ($roomInfo['room_num'] && !Validate::isGenericName($roomInfo['room_num'])) { + if (empty(trim($roomInfo['room_num'])) || !Validate::isGenericName($roomInfo['room_num'])) { $this->errors[] = sprintf(Tools::displayError('Invalid room number for room %s.'), $roomIndex); } diff --git a/js/admin/modules_catalog.js b/js/admin/modules_catalog.js index 171d3ba56..417d88c4d 100644 --- a/js/admin/modules_catalog.js +++ b/js/admin/modules_catalog.js @@ -52,6 +52,7 @@ $('document').ready( function() { function filterPanel(val, element_class) { + val = $.trim(val); $('#'+element_class+' .list-empty').hide(); $('#'+element_class+' .element-panel').css('display', 'flex').removeClass('hidden'); diff --git a/js/daterangepicker/qlodaterangepicker.js b/js/daterangepicker/qlodaterangepicker.js index 401d2b6bc..83381ec19 100644 --- a/js/daterangepicker/qlodaterangepicker.js +++ b/js/daterangepicker/qlodaterangepicker.js @@ -77,11 +77,13 @@ const inputElementHeight = dateRangePickerInput.outerHeight(); const spaceTop = dateRangePickerInput.offset().top - $(window).scrollTop(); const spaceBottom = $(window).height() - inputElementHeight - spaceTop; - const maxHeightNeeded = $(calendarDom).get(0).scrollHeight; + // 20 added for padding + const maxHeightNeeded = $(calendarDom).get(0).scrollHeight + 20; let positionClass = 'bottom'; // determine position class - if (spaceBottom < maxHeightNeeded && spaceTop > spaceBottom) { + if (spaceBottom < maxHeightNeeded && spaceTop > maxHeightNeeded && spaceTop > spaceBottom) { + positionClass = 'top'; } diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php index 416ec2d67..8cca590ba 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php @@ -204,7 +204,7 @@ class HotelBookingDemands extends ObjectModel } // Rounding as per configurations - $totalAmount += Tools::processPriceRounding($amount, $quantity); + $totalAmount = Tools::processPriceRounding($amount, $quantity); $values .= '('.(int)$this->id.','.(int)$idTax.','.(float)$amount.','. (float)$totalAmount.'),'; diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 97f037fcd..3aab098e2 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1872,6 +1872,7 @@ class HotelBookingDetail extends ObjectModel $reallocatedBookingId = 0; // get the cart booking data for the given booking if (Validate::isLoadedObject($objOldHotelBooking = new HotelBookingDetail($idHotelBooking))) { + $objectHotelBookingFrom = clone $objOldHotelBooking; $objHotelRoomInfo = new HotelRoomInformation($idRoom); $idNewRoomType = $objHotelRoomInfo->id_product; if ($objOldHotelBooking->id_product != $idNewRoomType) { @@ -2098,6 +2099,7 @@ class HotelBookingDetail extends ObjectModel if ($result &= $objBookingDetail->save()) { $reallocatedBookingId = $objBookingDetail->id; + $objectHotelBookingTo = $objBookingDetail; // Get Booking Demands of the old booking to add in the new booking creation $objBookingDemand = new HotelBookingDemands(); if ($oldBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( @@ -2278,6 +2280,7 @@ class HotelBookingDetail extends ObjectModel $result &= $objOldHotelBooking->save(); $reallocatedBookingId = $objOldHotelBooking->id; + $objectHotelBookingTo = $objOldHotelBooking; } if ($result && $reallocatedBookingId) { @@ -2286,6 +2289,8 @@ class HotelBookingDetail extends ObjectModel array( 'id_htl_booking_from' => $idHotelBooking, 'id_htl_booking_to' => $reallocatedBookingId, + 'objectHotelBookingFrom' => $objectHotelBookingFrom, + 'objectHotelBookingTo' => $objectHotelBookingTo, ) ); diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 137697e46..7182faf92 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -24,17 +24,17 @@ class HotelHelper { $objModule = new HotelreservationSystem(); $jsVars = array( - 'display_name' => $objModule->l('Display', 'HotelHelper', false, true), - 'records_name' => $objModule->l('records per page', 'HotelHelper', false, true), - 'no_product' => $objModule->l('No records found', 'HotelHelper', false, true), - 'show_page' => $objModule->l('Showing page', 'HotelHelper', false, true), - 'show_of' => $objModule->l('of', 'HotelHelper', false, true), - 'no_record' => $objModule->l('No records available', 'HotelHelper', false, true), - 'filter_from' => $objModule->l('filtered from', 'HotelHelper', false, true), - 't_record' => $objModule->l('total records', 'HotelHelper', false, true), - 'search_item' => $objModule->l('Search', 'HotelHelper', false, true), - 'p_page' => $objModule->l('Previous', 'HotelHelper', false, true), - 'n_page' => $objModule->l('Next', 'HotelHelper', false, true), + 'display_name' => $objModule->l('Display', 'HotelHelper', true), + 'records_name' => $objModule->l('records per page', 'HotelHelper', true), + 'no_product' => $objModule->l('No records found', 'HotelHelper', true), + 'show_page' => $objModule->l('Showing page', 'HotelHelper', true), + 'show_of' => $objModule->l('of', 'HotelHelper', true), + 'no_record' => $objModule->l('No records available', 'HotelHelper',true), + 'filter_from' => $objModule->l('filtered from', 'HotelHelper', true), + 't_record' => $objModule->l('total records', 'HotelHelper', true), + 'search_item' => $objModule->l('Search', 'HotelHelper', true), + 'p_page' => $objModule->l('Previous', 'HotelHelper', true), + 'n_page' => $objModule->l('Next', 'HotelHelper', true), ); Media::addJsDef($jsVars); @@ -2231,6 +2231,10 @@ class HotelHelper $objProduct->price_calculation_method = $serviceProduct['price_calculation_method']; $objProduct->is_virtual = 1; $objProduct->indexed = 1; + if ($objProduct->auto_add_to_cart && $objProduct->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM) { + $objProduct->id_tax_rules_group = 0; + } + $objProduct->save(); $idProduct = $objProduct->id; diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php index d8a236f66..2d7059469 100644 --- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php +++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php @@ -239,6 +239,13 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel $totalPrice += $product['total_price_tax_excl']; } } else { + $taxes = OrderDetailCore::getTaxListStatic($product['id_order_detail']); + $tax_temp = array(); + foreach ($taxes as $tax) { + $obj = new Tax($tax['id_tax']); + $tax_temp[] = sprintf('%1$s%2$s%%', ($obj->rate + 0), ' '); + } + $product_tax_label = implode(', ', $tax_temp); if (isset($selectedAdditionalServices['additional_services'])) { $selectedAdditionalServices['total_price_tax_excl'] += $product['total_price_tax_excl']; $selectedAdditionalServices['total_price_tax_incl'] += $product['total_price_tax_incl']; @@ -257,6 +264,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel 'unit_price_tax_incl' => $product['unit_price_tax_incl'], 'total_price_tax_excl' => $product['total_price_tax_excl'], 'total_price_tax_incl' => $product['total_price_tax_incl'], + 'product_tax_label' => $product_tax_label, ); } else { $selectedAdditionalServices['id_order'] = $product['id_order']; @@ -282,6 +290,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel 'unit_price_tax_incl' => $product['unit_price_tax_incl'], 'total_price_tax_excl' => $product['total_price_tax_excl'], 'total_price_tax_incl' => $product['total_price_tax_incl'], + 'product_tax_label' => $product_tax_label, ), ); } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 19223bf00..f21791e18 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -222,6 +222,7 @@ class AdminAddHotelController extends ModuleAdminController $smartyVars['ps_img_dir'] = _PS_IMG_.'l/'; $smartyVars['MAX_GLOBAL_BOOKING_DATE'] = (Configuration::get('MAX_GLOBAL_BOOKING_DATE')); $smartyVars['GLOBAL_PREPARATION_TIME'] = Configuration::get('GLOBAL_PREPARATION_TIME'); + $smartyVars['WK_ORDER_REFUND_ALLOWED'] = Configuration::get('WK_ORDER_REFUND_ALLOWED'); $this->context->smarty->assign($smartyVars); @@ -322,6 +323,10 @@ class AdminAddHotelController extends ModuleAdminController } } + if ($activeRefund && !Configuration::get('WK_ORDER_REFUND_ALLOWED')) { + $this->errors[] = $this->l('Enable order refunds to allow hotel-wise refunds.'); + } + // validate Friendly URL values if (!trim(Tools::getValue('link_rewrite_'.$defaultLangId))) { $this->errors[] = $this->l('Friendly URL is required at least in '). diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index c4f70e5d2..6cbe0183c 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -747,13 +747,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController } } else { // remove room from cart - $objHotelCartBookingData = new HotelCartBookingData($id_cart_book_data); - if ($objHotelCartBookingData->deleteCartBookingData( - $obj_booking_dtl->id_cart, - $objHotelCartBookingData->id_product, - $objHotelCartBookingData->id_room, - $objHotelCartBookingData->date_from, - $objHotelCartBookingData->date_to + if ((Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData((int) $id_cart_book_data))) + && $objHotelCartBookingData->deleteCartBookingData( + $objHotelCartBookingData->id_cart, + $objHotelCartBookingData->id_product, + $objHotelCartBookingData->id_room, + $objHotelCartBookingData->date_from, + $objHotelCartBookingData->date_to )) { $response['success'] = true; if ($ajax_delete) { @@ -994,7 +994,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'invalid_occupancy_txt' => $this->l('Invalid occupancy(adults/children) found.', null, true), 'PS_BACKDATE_ORDER_ALLOW' => $PS_BACKDATE_ORDER_ALLOW, // 'check_calender_var' => $check_calender_var, - 'txtSomeErr' => $this->l('Some error occurred. Please try again.'), + 'txtSomeErr' => $this->l('Some error occurred. Please try again.', null, true), 'no_rm_avail_txt' => $this->l('No room available.', null, true), 'no_realloc_rm_avail_txt' => $this->l('No room available for reallocation.', null, true), 'no_realloc_rm_type_avail_txt' => $this->l('No room type available for reallocation.', null, true), diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php index cb297db48..91b3b8dbe 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php @@ -1,4 +1,26 @@ errors) && !Tools::getValue('WK_ORDER_REFUND_ALLOWED')) { + $objHotelBranchInfo = new HotelBranchInformation(); + if ($hotels = $objHotelBranchInfo->getAllHotels()) { + foreach ($hotels as $hotel) { + $objHotelBranchInfo = new HotelBranchInformation($hotel['id']); + if ($objHotelBranchInfo->active_refund) { + $objHotelBranchInfo->active_refund = 0; + $objHotelBranchInfo->save(); + } + } + } + } + } + public function setMedia() { parent::setMedia(); diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl index abe5510d2..7ce92e749 100644 --- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl @@ -482,20 +482,20 @@ {hook h='displayAdminAddHotelFormRefundPoliciesTabBefore' id_hotel=$hook_arg_id_hotel} {if isset($hotel_info.id) && $hotel_info.id} + {if isset($WK_ORDER_REFUND_ALLOWED) && !$WK_ORDER_REFUND_ALLOWED} +
+ {l s='To enable hotel-wise refunds, activate order refunds in' mod='hotelreservationsystem'} {l s='Manage Order Refund Rules' mod='hotelreservationsystem'} +
+ {/if}
- - + - - - + diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php index 9f90bf623..8a0c2335e 100644 --- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php +++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php @@ -264,6 +264,21 @@ class WkRoomSearchHelper )); } + $totalColumns = 9;// min value + if ($locationEnabled) { + $totalColumns += 4; + } + + if (!(count($hotelsInfo) <= 1 && !$smartyVars['show_hotel_name'])) { + $totalColumns += 5; + } + + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $totalColumns += 4; + } + + $smartyVars['total_columns'] = $totalColumns; + Context::getContext()->smarty->assign($smartyVars); } } diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 36d0a4205..e18babcb7 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -337,23 +337,6 @@ const BookingSearchManager = { return true; }, } -function updateGridColumns() { - const gridContainer = $('#search_hotel_block_form > .grid'); - $(gridContainer).each(function() { - const gridItems = $(this).find('div.grid-item'); - let totalColumns = 0; - - Array.from(gridItems).forEach(item => { - totalColumns += parseInt(getComputedStyle(item).getPropertyValue('--col-span')); - }); - - $(this).css('grid-template-columns', `repeat(${totalColumns}, 1fr)`); - - Array.from(gridItems).forEach(item => { - item.style.gridColumn = `span ${getComputedStyle(item).getPropertyValue('--col-span')}`; - }); - }) -} $(document).ready(function() { // initialize booking search fields diff --git a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl index 0849db558..e1173253d 100644 --- a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl @@ -23,7 +23,7 @@ {if isset($hotels_info) && count($hotels_info)}
-
+ diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index d7f89bc11..087033914 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -20,10 +20,10 @@
{hook h='displaySearchFormFieldsBefore'} {block name="search_form_fields_wrapper"} -
+
{block name='search_form_location'} {if isset($location_enabled) && $location_enabled} -
+
@@ -40,7 +40,7 @@ {else} -
+
@@ -60,7 +60,7 @@ {block name='search_form_dates'} {if isset($multiple_dates_input) && $multiple_dates_input} -
+
{l s='Check-in' mod='wkroomsearchblock'}
@@ -71,7 +71,7 @@
{else} -
+
{l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
@@ -81,7 +81,7 @@ {block name='search_form_occupancy'} {if isset($is_occupancy_wise_search) && $is_occupancy_wise_search} -
+
@@ -244,10 +244,3 @@
{/block} - diff --git a/pdf/order-slip.product-tab.tpl b/pdf/order-slip.product-tab.tpl index 31ccaa55b..823b9b135 100644 --- a/pdf/order-slip.product-tab.tpl +++ b/pdf/order-slip.product-tab.tpl @@ -27,9 +27,10 @@ - {l s='Room Type / Reference' pdf='true'} - {l s='Duration' pdf='true'} - {l s='Num rooms' pdf='true'} + {l s='Room Type / Reference' pdf='true'} + {l s='Hotel' pdf='true'} + {l s='Duration' pdf='true'} + {l s='Num rooms' pdf='true'} {* {l s='Unit price' pdf='true'}
{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if} *} {l s='Total Price' pdf='true'}
{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if} @@ -49,6 +50,9 @@ {$order_detail.product_name} + + {$order_detail.hotel_name} + {$order_detail.date_from|date_format:"%d-%m-%Y"} {l s='To' pdf='true'} {$order_detail.date_to|date_format:"%d-%m-%Y"} diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js index 5a9b17ee5..55731b7ed 100644 --- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js +++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js @@ -1267,18 +1267,21 @@ function crossselling_serialScroll() { }); } -function resetRoomtypeServices() { +function resetRoomtypeServices(refresh = true) { $('.room_demands_container').find('input.id_room_type_demand:checked').prop('checked', false).uniform(); $('#additional_products').empty(); $('#additional_products div') $('.remove_roomtype_product').text(select_txt).removeClass('btn-danger remove_roomtype_product').addClass('btn-success add_roomtype_product'); - BookingForm.refresh(); + if (refresh) { + BookingForm.refresh(); + } } function disableRoomTypeDemands(show) { if (show) { $('.room_demands_container_overlay').show(); $('.room_demands_container').find('input:checkbox.id_room_type_demand').prop('checked', false); + $('.room_demand_block').find('.id_room_type_demand').prop('checked', false).parent().removeClass('checked'); $('.room_demands_container').find('input:checkbox.id_room_type_demand').attr('disabled', 'disabled'); } else { $('.room_demands_container_overlay').hide(); @@ -1289,6 +1292,7 @@ function disableRoomTypeDemands(show) { function disableRoomTypeServices(disable) { if (disable) { + resetRoomtypeServices(false); $('#service_products_cont').find('button.add_roomtype_product').attr('disabled', 'disabled'); $('#service_products_cont').find('.qty_container .qty_direction a').attr('disabled', 'disabled'); } else {