diff --git a/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss b/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss index 271ae468f..75c8d0700 100644 --- a/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss +++ b/admin/themes/default/sass/vendor/bootstrap-sass/_buttons.scss @@ -50,6 +50,14 @@ } } +// buttons text align +.btn-left { + text-align: left; +} +.btn-right { + text-align: right; +} + // Alternate buttons // -------------------------------------------------- @@ -140,8 +148,6 @@ .btn-block { display: block; width: 100%; - padding-left: 0; - padding-right: 0; } // Vertically space out multiple block buttons 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 c26576861..d3d517b2f 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 @@ -23,7 +23,7 @@ {l s='Cart Details'}
-
+
@@ -31,6 +31,9 @@ + {if $occupancy_wise_booking} + + {/if} @@ -42,7 +45,7 @@ {if isset($cart_detail_data) && $cart_detail_data} {assign var=curr_id value=$cart->id_currency|intval} {foreach from=$cart_detail_data item=data} - + + {if $occupancy_wise_booking} + + {/if} - - + {* *} {*{if ($order->hasBeenPaid())}{/if} {if $display_warehouse}{/if} {if ($order->hasBeenDelivered())}{/if} *} - + + {if isset($refundReqBookings) && $refundReqBookings} @@ -1412,6 +1413,21 @@ {addJsDefL name=txtSomeErr}{l s='Some error occurred. Please try again.' js=1}{/addJsDefL} {addJsDefL name=txtDeleteSucc}{l s='Deleted successfully' js=1}{/addJsDefL} {addJsDefL name=txtInvalidDemandVal}{l s='Invalid demand value found' js=1}{/addJsDefL} + {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL} + {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL} + {addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL} + {addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL} + {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL} + {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL} + {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL} + {addJsDefL name='child_txt'}{l s='Child' js=1}{/addJsDefL} + {addJsDefL name='children_txt'}{l s='Children' js=1}{/addJsDefL} + {addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL} + {addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='all_children_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='invalid_occupancy_txt'}{l s='Invalid occupancy(adults/children) found.' js=1}{/addJsDefL} + {addJsDef max_child_age=$max_child_age|escape:'quotes':'UTF-8'} + {addJsDef max_child_in_room=$max_child_in_room|escape:'quotes':'UTF-8'} {/strip} {* Apply javascript for the page *} diff --git a/admin/themes/default/template/controllers/products/occupancy.tpl b/admin/themes/default/template/controllers/products/occupancy.tpl index c38cd0b92..15b7b3527 100644 --- a/admin/themes/default/template/controllers/products/occupancy.tpl +++ b/admin/themes/default/template/controllers/products/occupancy.tpl @@ -24,16 +24,14 @@

{l s='Occupancy'}

- {l s='Set the occupancy of this room type. Enter how much adults and children this room type can accomodate.'} -

- {l s='Note'} : {l s='These occupancy settings will not affect "ROOM TYPE ADDITIONAL FACILITIES" any way. It will work separately.'} + {l s='Below, enter the base occupancy of this room type.'}
@@ -44,7 +42,7 @@
@@ -53,6 +51,46 @@
+
+ +
+ {l s='Below, enter the maximum of adult or children which can be accommodated in a room of this room type. Also, enter maximum number of guests for this room type.'} +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/classes/Cart.php b/classes/Cart.php index 18b2c15cf..d1bdbe7aa 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -4370,7 +4370,7 @@ class CartCore extends ObjectModel // lets validate the cart booking data first if (isset($bookingRows) && count($bookingRows)) { $objRoomType = new HotelRoomType(); - $objBookingDtl = new HotelBookingDetail(); + $objBookingDetail = new HotelBookingDetail(); $errors = array(); $idCustomer = $objCart->id_customer; $idCurrency = $objCart->id_currency; @@ -4412,24 +4412,20 @@ class CartCore extends ObjectModel } if (!count($errors)) { - $numDays = $objBookingDtl->getNumberOfDays($dateFrom, $dateTo); + $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo); $prodQty = $prodQty * (int) $numDays; $reqRooms = 1; - if ($hotelRoomData = $objBookingDtl->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest - )) { + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'only_search_data' => 1, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { if (isset($hotelRoomData['stats']['num_avail'])) { $totalAvailRooms = $hotelRoomData['stats']['num_avail']; if ($totalAvailRooms < $reqRooms) { @@ -4470,7 +4466,7 @@ class CartCore extends ObjectModel if (!$hasErrors) { $update_quantity = $objCart->updateQty($prodQty, $idProduct, 0, 0, Tools::getValue('op', 'up'), $this->id_address_delivery); $chkQty = 0; - if ($hotelAvailRomms = $hotelRoomData['rm_data'][0]['data']['available']) { + if ($hotelAvailRomms = $hotelRoomData['rm_data'][$idProduct]['data']['available']) { foreach ($hotelAvailRomms as $key_hotel_room_info => $val_hotel_room_info) { if ($chkQty < $reqRooms) { $objCartBooking = new HotelCartBookingData(); diff --git a/classes/Cookie.php b/classes/Cookie.php index 920415da6..579c0c8db 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -82,7 +82,7 @@ class CookieCore } else { $this->_cipherTool = new PhpEncryption(_NEW_COOKIE_KEY_); } - + $this->_secure = (bool)$secure; $this->update(); diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php index 39b850a28..3c8d1f897 100644 --- a/classes/PaymentModule.php +++ b/classes/PaymentModule.php @@ -354,6 +354,10 @@ abstract class PaymentModuleCore extends Module PrestaShopLogger::addLog('PaymentModule::validateOrder - Order is about to be added', 1, null, 'Cart', (int)$id_cart, true); } + // if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + // $order->is_occupnacy_provided = 1; + // } + // advance payment information $order->is_advance_payment = $this->context->cart->is_advance_payment; if ($order->is_advance_payment) { @@ -740,6 +744,9 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->date_to = $objCartBookingData->date_to; $objBookingDetail->total_price_tax_excl = Tools::ps_round($total_price['total_price_tax_excl'], 6); $objBookingDetail->total_price_tax_incl = Tools::ps_round($total_price['total_price_tax_incl'], 6); + $objBookingDetail->adult = $objCartBookingData->adult; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; // Save hotel information/location/contact if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { @@ -762,10 +769,6 @@ abstract class PaymentModuleCore extends Module $objBookingDetail->phone = $hotelAddress['phone']; } } - if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { - $objBookingDetail->adult = $roomTypeInfo['adult']; - $objBookingDetail->children = $roomTypeInfo['children']; - } /*for saving details of the advance payment product wise*/ $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); @@ -1362,8 +1365,6 @@ abstract class PaymentModuleCore extends Module $cart_htl_data[$type_key]['cover_img'] = $cover_img; $cart_htl_data[$type_key]['name'] = $product->name; $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; - $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; foreach ($cart_bk_data as $data_k => $data_v) { $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); @@ -1373,6 +1374,9 @@ abstract class PaymentModuleCore extends Module $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adult'] += $data_v['adult']; + $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_incl'] = $data_v['total_price_tax_incl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; $cart_htl_data[$type_key]['date_diff'][$date_join]['amount_tax_incl'] += $data_v['total_price_tax_incl']; @@ -1412,6 +1416,8 @@ abstract class PaymentModuleCore extends Module $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = $data_v['date_from']; $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adult'] = $data_v['adult']; + $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_incl'] = $data_v['total_price_tax_incl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_incl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl']; diff --git a/classes/Product.php b/classes/Product.php index 52f318af5..beea5a07a 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -5631,7 +5631,7 @@ class ProductCore extends ObjectModel $roomtypeData = json_decode(json_encode($xml), true); // set room map info for the hotel from request - return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'htl_room_type` (`id_product`, `id_hotel`, `adult`, `children`, `date_add`, `date_upd`) VALUES ('.(int)$this->id.', '.(int) $roomtypeData['room_type']['id_hotel'].', '.(int) $roomtypeData['room_type']['adults'].', '.(int) $roomtypeData['room_type']['children'].', \''.date('Y-m-d h:i:s').'\', \''.date('Y-m-d h:i:s').'\')'); + return Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'htl_room_type` (`id_product`, `id_hotel`, `adult`, `children`, `date_add`, `date_upd`) VALUES ('.(int)$this->id.', '.(int) $roomtypeData['room_type']['id_hotel'].', '.(int) $roomtypeData['room_type']['adult'].', '.(int) $roomtypeData['room_type']['children'].', \''.date('Y-m-d h:i:s').'\', \''.date('Y-m-d h:i:s').'\')'); } return true; @@ -6098,12 +6098,12 @@ class ProductCore extends ObjectModel return true; } - public function setWsAdults($adults) + public function setWsAdults($adult) { if ($this->id) { return Db::getInstance()->execute( 'UPDATE `'._DB_PREFIX_.'htl_room_type` '.' - SET `adults` = '.(int) $adults.' + SET `adult` = '.(int) $adult.' WHERE `id_product` = '.(int)$this->id ); } diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 9663e7e4d..30f71aa80 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -435,6 +435,10 @@ class FrontControllerCore extends Controller $compared_products = CompareProduct::getCompareProducts($this->context->cookie->id_compare); } + $occupancyWiseSearch = false; + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $occupancyWiseSearch = true; + } $this->context->smarty->assign(array( // Useful for layout.tpl 'mobile_device' => $this->context->getMobileDevice(), @@ -482,6 +486,10 @@ class FrontControllerCore extends Controller 'currencySign' => $currency->sign, // backward compat, see global.tpl 'currencyFormat' => $currency->format, // backward compat 'currencyBlank' => $currency->blank, // backward compat + 'occupancy_wise_search' => $occupancyWiseSearch, + 'occupancy_wise_booking' => Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING'), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), )); // Add the tpl files directory for mobile @@ -1059,6 +1067,12 @@ class FrontControllerCore extends Controller } } + $this->addJS(_PS_JS_DIR_.'daterangepicker/moment.min.js'); + $this->addjqueryPlugin('daterangepicker.min', _PS_JS_DIR_.'daterangepicker/'); + $this->addJS(_PS_JS_DIR_.'daterangepicker/qlodaterangepicker.js'); + + $this->addCSS(_THEME_CSS_DIR_.'daterangepicker.css'); + if (Tools::isSubmit('live_edit') && Tools::getValue('ad') && Tools::getAdminToken('AdminModulesPositions'.(int)Tab::getIdFromClassName('AdminModulesPositions').(int)Tools::getValue('id_employee'))) { $this->addJqueryUI('ui.sortable'); $this->addjqueryPlugin('fancybox'); diff --git a/classes/order/Order.php b/classes/order/Order.php index ac8f027ab..68ac01bf7 100644 --- a/classes/order/Order.php +++ b/classes/order/Order.php @@ -190,6 +190,11 @@ class OrderCore extends ObjectModel */ public $advance_paid_amount; + /** + * @var int is occupancy provided in this order + */ + public $is_occupnacy_provided; + /** * @see ObjectModel::$definition */ @@ -244,6 +249,7 @@ class OrderCore extends ObjectModel 'reference' => array('type' => self::TYPE_STRING), 'is_advance_payment' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), 'advance_paid_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice'), + 'is_occupnacy_provided' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'default' => 0), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), ), diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 0e24e7f91..10740d2b8 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -352,8 +352,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['id_product'] = $type_value['product_id']; $cart_htl_data[$type_key]['cover_img'] = $cover_img; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; - $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; $cart_htl_data[$type_key]['hotel_name'] = $rm_dtl['hotel_name']; $objBookingDemand = new HotelBookingDemands(); foreach ($order_bk_data as $data_k => $data_v) { @@ -400,6 +398,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate ); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] += 1; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adult'] += $data_v['adult']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; @@ -446,6 +446,9 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = Tools::displayDate($data_v['date_from']); $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = Tools::displayDate($data_v['date_to']); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adult'] = $data_v['adult']; + $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; diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 690c50a90..bcba05c32 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -951,6 +951,76 @@ class AdminCartsControllerCore extends AdminController } } + public function ajaxProcessUpdateProductOccupancy() + { + $params = Tools::getValue('params'); + $id_booking_data = (int) $params['id_booking_data']; + $id_cart = (int) $params['id_cart']; + $occupancy = $params['occupancy']; + + $this->context->cart = new Cart($id_cart); + + if ($this->tabAccess['edit'] === '1') { + // validate occupancy is correct + $hasError = false; + if (is_array($occupancy)) { + if (!$occupancy['adult'] || !Validate::isUnsignedInt($occupancy['adult'])) { + $hasError = true; + } + if (!Validate::isUnsignedInt($occupancy['children'])) { + $hasError = true; + } + if ($occupancy['children']) { + if (!isset($occupancy['child_ages']) || $occupancy['children'] != count($occupancy['child_ages'])) { + $hasError = true; + } else { + foreach($occupancy['child_ages'] as $age) { + if (!Validate::isUnsignedInt($occupancy['adult'])) { + $hasError = true; + } + } + } + } + } + + if (!$hasError) { + $objHotelCartBookingData = new HotelCartBookingData($id_booking_data); + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($objHotelCartBookingData->id_product)) { + if ($occupancy['adult'] > $roomTypeInfo['max_adults']) { + $hasError = true; + } + if ($occupancy['children'] > $roomTypeInfo['max_children']) { + $hasError = true; + } + if ($occupancy['adult'] + $occupancy['children'] > $roomTypeInfo['max_guests']) { + $hasError = true; + } + if (!$hasError) { + $objHotelCartBookingData->adult = $occupancy['adult']; + $objHotelCartBookingData->children = $occupancy['children']; + $objHotelCartBookingData->child_ages = json_encode($occupancy['child_ages']); + $objHotelCartBookingData->save(); + } + } + } + $bookingsInfo = $objHotelCartBookingData->getCartFormatedBookinInfoByIdCart($id_cart); + foreach ($bookingsInfo as &$bookingInfo) { + if ($bookingInfo['id'] == $id_booking_data) { + $amt_with_qty = $bookingInfo['amt_with_qty']; + $bookingInfo['amt_with_qty'] = Tools::displayPrice($amt_with_qty); + $bookingInfo['total_price'] = Tools::displayPrice($amt_with_qty + $bookingInfo['demand_price']); + $response = array( + 'curr_booking_info' => $bookingInfo, + 'cart_info' => $this->ajaxReturnVars(), + ); + + die(json_encode($response)); + } + } + } + } + public static function getOrderTotalUsingTaxCalculationMethod($id_cart) { $context = Context::getContext(); diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index e45271256..2844bc48e 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -218,6 +218,11 @@ class AdminOrdersControllerCore extends AdminController $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); 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']); + } $this->context->smarty->assign('cart_detail_data', $cart_detail_data); } else { // if no rooms added in the cart and user visits add order page then redirect to BOOK NOW page @@ -240,6 +245,10 @@ class AdminOrdersControllerCore extends AdminController $payment_modules[] = Module::getInstanceById((int)$p_module['id_module']); } + $occupancyWiseSearch = false; + if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $occupancyWiseSearch = true; + } $this->context->smarty->assign(array( 'recyclable_pack' => (int)Configuration::get('PS_RECYCLABLE_PACK'), 'gift_wrapping' => (int)Configuration::get('PS_GIFT_WRAPPING'), @@ -253,8 +262,11 @@ class AdminOrdersControllerCore extends AdminController 'toolbar_btn' => $this->toolbar_btn, 'toolbar_scroll' => $this->toolbar_scroll, 'PS_CATALOG_MODE' => Configuration::get('PS_CATALOG_MODE'), - 'title' => array($this->l('Orders'), $this->l('Create order')) - + 'title' => array($this->l('Orders'), $this->l('Create order')), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'occupancy_wise_booking' => Configuration::get('PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING'), + 'occupancy_wise_search' => $occupancyWiseSearch )); $this->content .= $this->createTemplate('form.tpl')->fetch(); } @@ -454,8 +466,8 @@ class AdminOrdersControllerCore extends AdminController } if (!count($this->errors)) { - $obj_booking_dtl = new HotelBookingDetail(); - $room_swapped = $obj_booking_dtl->reallocateRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $realloc_room_id); + $objBookingDetail = new HotelBookingDetail(); + $room_swapped = $objBookingDetail->reallocateRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $realloc_room_id); if (!$room_swapped) { $this->errors[] = Tools::displayError('Some error occured. Please try again.'); } else { @@ -489,8 +501,8 @@ class AdminOrdersControllerCore extends AdminController } if (!count($this->errors)) { - $obj_booking_dtl = new HotelBookingDetail(); - $room_swapped = $obj_booking_dtl->swapRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id); + $objBookingDetail = new HotelBookingDetail(); + $room_swapped = $objBookingDetail->swapRoomWithAvailableSameRoomType($current_room_id, $date_from, $date_to, $swapped_room_id); if (!$room_swapped) { $this->errors[] = Tools::displayError('Some error occured. Please try again.'); } else { @@ -1431,6 +1443,7 @@ class AdminOrdersControllerCore extends AdminController $totalDemandsPriceTI = 0; if ($order_detail_data = $objBookingDetail->getOrderFormatedBookinInfoByIdOrder($order->id)) { $objBookingDemand = new HotelBookingDemands(); + $objHotelRoomType = new HotelRoomType(); foreach ($order_detail_data as $key => $value) { $order_detail_data[$key]['extra_demands'] = $objBookingDemand->getRoomTypeBookingExtraDemands( $order->id, @@ -1484,6 +1497,8 @@ class AdminOrdersControllerCore extends AdminController $order_detail_data[$key]['unit_amt_tax_incl'] = $value['total_price_tax_incl']/$num_days; $order_detail_data[$key]['amt_with_qty_tax_excl'] = $value['total_price_tax_excl']; $order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl']; + $order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']); + } } @@ -1499,7 +1514,6 @@ class AdminOrdersControllerCore extends AdminController // hotel booking statuses $htlOrderStatus = HotelBookingDetail::getAllHotelOrderStatus(); - $this->tpl_view_vars = array( // refund info 'refund_allowed' => (int) $order->isReturnable(), @@ -1515,6 +1529,8 @@ class AdminOrdersControllerCore extends AdminController 'htl_booking_order_data' => $bookingOrderInfo, 'hotel_order_status' => $htlOrderStatus, 'order_detail_data' => $order_detail_data, + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), /*END*/ 'order' => $order, 'cart' => new Cart($order->id_cart), @@ -1604,7 +1620,13 @@ class AdminOrdersControllerCore extends AdminController } if ($products = Product::searchByName((int)$this->context->language->id, pSQL(Tools::getValue('product_search')), null, $idHotel)) { + $objRoomType = new HotelRoomType(); foreach ($products as &$product) { + // get product room type informatin + if ($roomTypeDetail = $objRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { + $product['room_type_info'] = $roomTypeDetail; + } + // Formatted price $product['formatted_price'] = Tools::displayPrice(Tools::convertPrice($product['price_tax_incl'], $currency), $currency); // Concret price @@ -1737,6 +1759,7 @@ class AdminOrdersControllerCore extends AdminController $date_from = date('Y-m-d', strtotime($product_informations['date_from'])); $date_to = date('Y-m-d', strtotime($product_informations['date_to'])); $curr_date = date('Y-m-d'); + $occupancy = Tools::getValue('occupancy'); /*Validations*/ if ($date_from == '') { die(json_encode(array( @@ -1768,15 +1791,57 @@ class AdminOrdersControllerCore extends AdminController 'result' => false, 'error' => Tools::displayError('Check out Date Should be after Check In date.'), ))); + } + if ($order->is_occupnacy_provided) { + if ($occupancy) { + foreach($occupancy as $key =>$roomOccupancy) { + if (!Validate::isUnsignedInt($roomOccupancy['adult'])) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid number of adults for Room %s.'), ($key + 1)), + ))); + } elseif (!Validate::isUnsignedInt($roomOccupancy['children'])) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid number of children for Room %s.'), ($key + 1)), + ))); + } + if ($roomOccupancy['children'] > 0) { + if (!isset($roomOccupancy['child_ages']) || ($roomOccupancy['children'] != count($roomOccupancy['child_ages']))) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Please provide all children age for Room %s.'), ($key + 1)), + ))); + } else { + foreach($roomOccupancy['child_ages'] as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + die(json_encode(array( + 'result' => false, + 'error' => sprintf(Tools::displayError('Invalid children age for Room %s.'), ($key + 1)), + ))); + } + } + } + } + } + } else { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid occupancy.'), + ))); + } + $req_rm = count($occupancy); + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); } elseif (!Validate::isUnsignedInt($product_informations['product_quantity'])) { die(json_encode(array( 'result' => false, 'error' => Tools::displayError('Please Enter a valid Quantity.'), ))); + $req_rm = $product_informations['product_quantity']; } $obj_booking_detail = new HotelBookingDetail(); - $req_rm = $product_informations['product_quantity']; $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to); $product_informations['product_quantity'] = $product_informations['product_quantity'] * (int) $num_days; @@ -1787,9 +1852,17 @@ class AdminOrdersControllerCore extends AdminController $id_hotel = $room_info_by_id_product['id_hotel']; if ($id_hotel) { - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, $product_informations['product_id'], 1, 0, 0, -1, 0, 0, $id_cart, $id_guest); - + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $product_informations['product_id'], + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams); $total_available_rooms = $hotel_room_data['stats']['num_avail']; if ($total_available_rooms < $req_rm) { @@ -1860,54 +1933,36 @@ class AdminOrdersControllerCore extends AdminController $this->context->cart = $cart; $this->context->customer = new Customer($order->id_customer); - // always add taxes even if there are not displayed to the customer - $use_taxes = true; - $initial_product_price_tax_incl = Product::getPriceStatic( - $product->id, - $use_taxes, - isset($combination) ? $combination->id : null, - 2, - null, - false, - true, - 1, - false, - $order->id_customer, - $cart->id, - $order->{Configuration::get('PS_TAX_ADDRESS_TYPE', null, null, $order->id_shop)} - ); - - // create feature price if needed - $createFeaturePrice = $product_informations['product_price_tax_incl'] != $initial_product_price_tax_incl; - $featurePriceParams = array(); - if ($createFeaturePrice) { - $featurePriceParams = array( - 'id_cart' => $this->context->cart->id, - 'id_guest' => $this->context->cookie->id_guest, - 'price' => $product_informations['product_price_tax_excl'], - 'id_product' => $product->id, - ); - } - /*By Webkul to make entries in HotelCartBookingData */ - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; + $hotel_room_info_arr = $hotel_room_data['rm_data'][$idProduct]['data']['available']; $chkQty = 0; if ($hotel_room_info_arr) { - foreach ($hotel_room_info_arr as $room_info) { + foreach ($hotel_room_info_arr as $key => $room_info) { if ($chkQty < $req_rm) { - $obj_htl_cart_booking_data = new HotelCartBookingData(); - $obj_htl_cart_booking_data->id_cart = $this->context->cart->id; - $obj_htl_cart_booking_data->id_guest = $this->context->cookie->id_guest; - $obj_htl_cart_booking_data->id_customer = $this->context->customer->id; - $obj_htl_cart_booking_data->id_currency = $order->id_currency; - $obj_htl_cart_booking_data->id_product = $room_info['id_product']; - $obj_htl_cart_booking_data->id_room = $room_info['id_room']; - $obj_htl_cart_booking_data->id_hotel = $room_info['id_hotel']; - $obj_htl_cart_booking_data->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; - $obj_htl_cart_booking_data->quantity = $num_days; - $obj_htl_cart_booking_data->date_from = $date_from; - $obj_htl_cart_booking_data->date_to = $date_to; - $obj_htl_cart_booking_data->save(); + $objCartBookingData = new HotelCartBookingData(); + $objCartBookingData->id_cart = $this->context->cart->id; + $objCartBookingData->id_guest = $this->context->cookie->id_guest; + $objCartBookingData->id_customer = $this->context->customer->id; + $objCartBookingData->id_currency = $order->id_currency; + $objCartBookingData->id_product = $room_info['id_product']; + $objCartBookingData->id_room = $room_info['id_room']; + $objCartBookingData->id_hotel = $room_info['id_hotel']; + $objCartBookingData->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; + $objCartBookingData->quantity = $num_days; + $objCartBookingData->date_from = $date_from; + $objCartBookingData->date_to = $date_to; + + if ($order->is_occupnacy_provided) { + $room_occupancy = array_shift($occupancy); + $objCartBookingData->adult = $room_occupancy['adult']; + $objCartBookingData->children = $room_occupancy['children']; + $objCartBookingData->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $objCartBookingData->adult = $roomTypeInfo['adult']; + $objCartBookingData->children = $roomTypeInfo['children']; + $objCartBookingData->child_ages = json_encode(array()); + } + $objCartBookingData->save(); ++$chkQty; // create feature price if needed @@ -1922,10 +1977,52 @@ class AdminOrdersControllerCore extends AdminController } } /*END*/ + // always add taxes even if there are not displayed to the customer + $use_taxes = true; + + $initial_product_price_tax_incl = Product::getPriceStatic( + $product->id, + $use_taxes, + isset($combination) ? $combination->id : null, + 2, + null, + false, + true, + 1, + false, + $order->id_customer, + $cart->id, + $order->id_address_tax + ); + + // Creating specific price if needed + if ($product_informations['product_price_tax_incl'] != $initial_product_price_tax_incl) { + $specific_price = new SpecificPrice(); + $specific_price->id_shop = 0; + $specific_price->id_shop_group = 0; + $specific_price->id_currency = 0; + $specific_price->id_country = 0; + $specific_price->id_group = 0; + $specific_price->id_customer = $order->id_customer; + $specific_price->id_product = $product->id; + if (isset($combination)) { + $specific_price->id_product_attribute = $combination->id; + } else { + $specific_price->id_product_attribute = 0; + } + $specific_price->price = $product_informations['product_price_tax_excl']; + $specific_price->from_quantity = 1; + $specific_price->reduction = 0; + $specific_price->reduction_type = 'amount'; + $specific_price->reduction_tax = 0; + $specific_price->from = '0000-00-00 00:00:00'; + $specific_price->to = '0000-00-00 00:00:00'; + $specific_price->add(); + } // Add product to cart $update_quantity = $cart->updateQty( - $product_informations['product_quantity'], + ($req_rm * $num_days), $product->id, isset($product_informations['product_attribute_id']) ? $product_informations['product_attribute_id'] : null, isset($combination) ? $combination->id : null, @@ -2152,76 +2249,79 @@ class AdminOrdersControllerCore extends AdminController /*By Webkul Entry into table HotelbookingDetail*/ $objRoomType = new HotelRoomType(); - $objHtlBkDtl = new HotelBookingDetail(); - $inserted_id_order_detail = $objHtlBkDtl->getLastInsertedIdOrderDetail($order->id); + $objBookingDetail = new HotelBookingDetail(); + $inserted_id_order_detail = $objBookingDetail->getLastInsertedIdOrderDetail($order->id); $idLang = (int)$this->context->cart->id_lang; - $obj_cart_bk_data = new HotelCartBookingData(); - if ($cart_bk_data = $obj_cart_bk_data->getOnlyCartBookingData( + $objCartBookingData = new HotelCartBookingData(); + if ($cartBookingData = $objCartBookingData->getOnlyCartBookingData( $this->context->cart->id, $this->context->cart->id_guest, $idProduct )) { - foreach ($cart_bk_data as $cb_k => $cb_v) { - $obj_cart_bk_data = new HotelCartBookingData($cb_v['id']); - $obj_cart_bk_data->id_order = $order->id; - $obj_cart_bk_data->save(); + foreach ($cartBookingData as $cb_k => $cb_v) { + $objCartBookingData = new HotelCartBookingData($cb_v['id']); + $objCartBookingData->id_order = $order->id; + $objCartBookingData->save(); - $objHtlBkDtl = new HotelBookingDetail(); - $objHtlBkDtl->id_product = $idProduct; - $objHtlBkDtl->id_order = $order->id; - $objHtlBkDtl->id_order_detail = $inserted_id_order_detail; - $objHtlBkDtl->id_cart = $this->context->cart->id; - $objHtlBkDtl->id_room = $obj_cart_bk_data->id_room; - $objHtlBkDtl->id_hotel = $obj_cart_bk_data->id_hotel; - $objHtlBkDtl->id_customer = $this->context->customer->id; - $objHtlBkDtl->booking_type = $obj_cart_bk_data->booking_type; - $objHtlBkDtl->id_status = 1; - $objHtlBkDtl->comment = $obj_cart_bk_data->comment; - $objHtlBkDtl->room_type_name = Product::getProductName($idProduct, null, $order->id_lang); + $objBookingDetail = new HotelBookingDetail(); + $objBookingDetail->id_product = $idProduct; + $objBookingDetail->id_order = $order->id; + $objBookingDetail->id_order_detail = $inserted_id_order_detail; + $objBookingDetail->id_cart = $this->context->cart->id; + $objBookingDetail->id_room = $objCartBookingData->id_room; + $objBookingDetail->id_hotel = $objCartBookingData->id_hotel; + $objBookingDetail->id_customer = $this->context->customer->id; + $objBookingDetail->booking_type = $objCartBookingData->booking_type; + $objBookingDetail->id_status = 1; + $objBookingDetail->comment = $objCartBookingData->comment; + $objBookingDetail->room_type_name = Product::getProductName($idProduct, null, $order->id_lang); - $objHtlBkDtl->date_from = $obj_cart_bk_data->date_from; - $objHtlBkDtl->date_to = $obj_cart_bk_data->date_to; + $objBookingDetail->date_from = $objCartBookingData->date_from; + $objBookingDetail->date_to = $objCartBookingData->date_to; + $objBookingDetail->adult = $objCartBookingData->adult; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; $total_price = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $idProduct, - $obj_cart_bk_data->date_from, - $obj_cart_bk_data->date_to, + $objCartBookingData->date_from, + $objCartBookingData->date_to, 0, Group::getCurrent()->id, $this->context->cart->id, $this->context->cookie->id_guest, - $obj_cart_bk_data->id_room + $objCartBookingData->id_room ); - - $objHtlBkDtl->total_price_tax_excl = $total_price['total_price_tax_excl']; - $objHtlBkDtl->total_price_tax_incl = $total_price['total_price_tax_incl']; - $objHtlBkDtl->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); + $objBookingDetail->total_price_tax_excl = $total_price['total_price_tax_excl']; + $objBookingDetail->total_price_tax_incl = $total_price['total_price_tax_incl']; + $objBookingDetail->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5); // Save hotel information/location/contact - if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($obj_cart_bk_data->id_room))) { - $objHtlBkDtl->room_num = $objRoom->room_num; + if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($objCartBookingData->id_room))) { + $objBookingDetail->room_num = $objRoom->room_num; } if (Validate::isLoadedObject($objHotelBranch = new HotelBranchInformation( - $obj_cart_bk_data->id_hotel, + $objCartBookingData->id_hotel, $idLang ))) { - $addressInfo = $objHotelBranch->getAddress($obj_cart_bk_data->id_hotel); - $objHtlBkDtl->hotel_name = $objHotelBranch->hotel_name; - $objHtlBkDtl->city = $addressInfo['city']; - $objHtlBkDtl->state = State::getNameById($addressInfo['id_state']); - $objHtlBkDtl->country = Country::getNameById($idLang, $addressInfo['id_country']); - $objHtlBkDtl->zipcode = $addressInfo['postcode'];; - $objHtlBkDtl->phone = $addressInfo['phone']; - $objHtlBkDtl->email = $objHotelBranch->email; - $objHtlBkDtl->check_in_time = $objHotelBranch->check_in; - $objHtlBkDtl->check_out_time = $objHotelBranch->check_out; + $addressInfo = $objHotelBranch->getAddress($objCartBookingData->id_hotel); + $objBookingDetail->hotel_name = $objHotelBranch->hotel_name; + $objBookingDetail->city = $addressInfo['city']; + $objBookingDetail->state = State::getNameById($addressInfo['id_state']); + $objBookingDetail->country = Country::getNameById($idLang, $addressInfo['id_country']); + $objBookingDetail->zipcode = $addressInfo['postcode'];; + $objBookingDetail->phone = $addressInfo['phone']; + $objBookingDetail->email = $objHotelBranch->email; + $objBookingDetail->check_in_time = $objHotelBranch->check_in; + $objBookingDetail->check_out_time = $objHotelBranch->check_out; } if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { - $objHtlBkDtl->adult = $roomTypeInfo['adult']; - $objHtlBkDtl->children = $roomTypeInfo['children']; + $objBookingDetail->adult = $objCartBookingData->adult; + $objBookingDetail->children = $objCartBookingData->children; + $objBookingDetail->child_ages = $objCartBookingData->child_ages; } - $objHtlBkDtl->save(); + $objBookingDetail->save(); } } @@ -2332,7 +2432,7 @@ class AdminOrdersControllerCore extends AdminController } /*By webkul To edit Order and cart entries when edit rooms from the orderLine when editing the order*/ - $product_informations = $_POST['add_product']; + $product_informations = $_POST['edit_product']; $new_date_from = trim(date('Y-m-d', strtotime($product_informations['date_from']))); $new_date_to = trim(date('Y-m-d', strtotime($product_informations['date_to']))); $old_date_from = trim(Tools::getValue('date_from')); @@ -2345,6 +2445,10 @@ class AdminOrdersControllerCore extends AdminController $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to); $old_product_quantity = (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to); $qty_diff = $product_quantity - $old_product_quantity; + $occupancy = array_shift(Tools::getValue('occupancy')); + $adult = $occupancy['adult']; + $children = $occupancy['children']; + $child_ages = $occupancy['child_ages']; /*By webkul to validate fields before deleting the cart and order data form the tables*/ if ($id_hotel == '') { @@ -2402,6 +2506,33 @@ class AdminOrdersControllerCore extends AdminController 'result' => false, 'error' => Tools::displayError('Invalid quantity.'), ))); + } elseif (!Validate::isUnsignedInt($adult)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid number of adults.'), + ))); + } elseif (!Validate::isUnsignedInt($children)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid number of children.'), + ))); + } + if ($children > 0) { + if (!isset($child_ages) || ($children != count($child_ages))) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Please provide all children age.'), + ))); + } else { + foreach($child_ages as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + die(json_encode(array( + 'result' => false, + 'error' => Tools::displayError('Invalid children age.'), + ))); + } + } + } } $rooms_booked = $obj_booking_detail->getRoomBookinInformationForDateRangeByOrder($id_room, $old_date_from, $old_date_to, $new_date_from, $new_date_to); @@ -2630,6 +2761,13 @@ class AdminOrdersControllerCore extends AdminController $old_date_to ); + // set occupancy details + $occupancy = array( + 'adult' => $adult, + 'children' => $children, + 'child_ages' => $child_ages + ); + /*By webkul to edit the Hotel Cart and Hotel Order tables when editing the room for the order detail page*/ $new_total_price = array( 'tax_excl' => $totalRoomPriceAfterTE, @@ -2642,6 +2780,7 @@ class AdminOrdersControllerCore extends AdminController $old_date_to, $new_date_from, $new_date_to, + $occupancy, $new_total_price )) { // update extra demands total prices if dates are changes (price calc method for each day) diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index a2da76a85..0869ce60a 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -109,15 +109,80 @@ class AdminPPreferencesControllerCore extends AdminController 'cast' => 'intval', 'required' => false, 'type' => 'bool' + ) + ), + 'submit' => array('title' => $this->l('Save')) + ), + 'search' => array( + 'title' => $this->l('Search'), + 'fields' => array( + 'PS_FRONT_SEARCH_TYPE' => array( + 'title' => $this->l('Front end search type'), + 'hint' => $this->l('Select search type for frontend. In "Occupancy wise search", occupancy field will be shown in the search panel and search will be based on required occupancy by the guest. In "Search without occupancy", All available room types will be shown for the search dates without any occupancy filter.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_TYPE_OWS, 'name' => $this->l('Occupancy wise search')), + array('id' => HotelBookingDetail::SEARCH_TYPE_NORMAL, 'name' => $this->l('Search without occupancy')) + ), + 'identifier' => 'id', + 'desc' => $this->l('Choose "Occupancy wise search" or "Search without occupancy". Occupancy search restriction will depend on this option selection at front end.'), + ), + 'PS_FRONT_OWS_SEARCH_ALGO_TYPE' => array( + 'title' => $this->l('Front end occupancy wise search algorithm '), + 'hint' => $this->l('In occupancy wise search at front end, you want to display only room types which are fully satisfing searched occupancy or you want to display all the available room types for the dates searched'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, 'name' => $this->l('Show room types satisfing required occupancy')), + array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types')) + ), + 'identifier' => 'id' + ), + 'PS_FRONT_OCCUPANCY_WISE_BOOKING' => array( + 'title' => $this->l('Front end occupancy required for booking'), + 'hint' => $this->l('Select occupancy is required for booking a room for frontend. When enabled occupancy field will be shown in the booking form.'), + 'cast' => 'intval', + 'type' => 'bool', + ), + 'PS_BACKOFFICE_SEARCH_TYPE' => array( + 'title' => $this->l('Back-office search type'), + 'hint' => $this->l('Select search type for Back-office. In "Occupancy wise search", occupancy field will be shown in the search panel and search will be based on required occupancy by the employee. In "Search without occupancy", All available room types will be shown for the search dates without any occupancy filter.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_TYPE_OWS, 'name' => $this->l('Occupancy wise search')), + array('id' => HotelBookingDetail::SEARCH_TYPE_NORMAL, 'name' => $this->l('Search without occupancy')) + ), + 'identifier' => 'id', + 'desc' => $this->l('Choose "Occupancy wise search" or "Search without occupancy". Occupancy search restriction will depend on this option selection at back-office.'), + ), + 'PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE' => array( + 'title' => $this->l('Back-office occupancy wise search algorithm'), + 'hint' => $this->l('In occupancy wise search at back-office, you want to display only room types which are fully satisfing searched occupancy or you want to display all the available room types for the dates searched.'), + 'cast' => 'intval', + 'type' => 'select', + 'list' => array( + array('id' => HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, 'name' => $this->l('Show room types satisfing required occupancy')), + array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types')) + ), + 'identifier' => 'id', + 'desc' => $this->l('This option is only for fully available rooms. For partially available rooms, always all possible rooms will be displayed.'), + ), + 'PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING' => array( + 'title' => $this->l('Back-office occupancy required for booking'), + 'hint' => $this->l('Select occupancy is required for booking a room for frontend. When enabled occupancy field will be shown in the booking form.'), + 'cast' => 'intval', + 'type' => 'bool', ), 'PS_LOS_RESTRICTION_BO' => array( - 'title' => $this->l('Apply Min and Max lenght of stay restrictions for back-office bookings'), - 'hint' => $this->l('While creating bookings from back-office, apply minimum and maximum lenght of stay restrictions'), + 'title' => $this->l('Apply Min and Max lenght of stay restrictions for back-office search'), + 'hint' => $this->l('While searching for available rooms from back-office, apply minimum and maximum lenght of stay restrictions'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => false, 'type' => 'bool' - ) + ), ), 'submit' => array('title' => $this->l('Save')) ), diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index a2d708922..f6acda574 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3433,6 +3433,7 @@ class AdminProductsControllerCore extends AdminController } else { $this->displayWarning($this->l('You must save this room type before managing occupancy.')); } + $smartyVars['currency'] = $this->context->currency; $data->assign($smartyVars); $this->tpl_form_vars['custom_form'] = $data->fetch(); } @@ -3449,16 +3450,46 @@ class AdminProductsControllerCore extends AdminController if (Validate::isLoadedObject($objRoomType = new HotelRoomType($idHtlRoomType))) { $baseAdults = Tools::getValue('base_adults'); $baseChildren = Tools::getValue('base_children'); + $maxAdults = Tools::getValue('max_adults'); + $maxChildren = Tools::getValue('max_children'); + $maxGuests = Tools::getValue('max_guests'); if (!$baseAdults || !Validate::isUnsignedInt($baseAdults)) { - $this->errors[] = Tools::displayError('Invalid base adults'); + $this->errors[] = Tools::displayError('Invalid base adult'); } - if (!Validate::isUnsignedInt($baseChildren)) { + if ($baseChildren == '' || !Validate::isUnsignedInt($baseChildren)) { $this->errors[] = Tools::displayError('Invalid base children'); + } else if (Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + if ($baseChildren > Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + $this->errors[] = sprintf(Tools::displayError('Base children cannot be greater than max childern allowed on your website (Max: %s)'), Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')); + } } + if (!$maxAdults || !Validate::isUnsignedInt($maxAdults)) { + $this->errors[] = Tools::displayError('Invalid maximum number of adult'); + } elseif ($maxAdults < $baseAdults) { + $this->errors[] = Tools::displayError('Maximum number of adult cannot be less than base adult'); + } + if ($maxChildren == '' || !Validate::isUnsignedInt($maxChildren)) { + $this->errors[] = Tools::displayError('Invalid maximum number of children'); + } else if (Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + if ($maxChildren > Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')) { + $this->errors[] = sprintf(Tools::displayError('Maximum number of children cannot be greater than max childern allowed on your website (Max: %s)'), Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM')); + } + } elseif ($maxChildren < $baseChildren) { + $this->errors[] = Tools::displayError('Maximum number of children cannot be less than base children'); + } + if (!$maxGuests || !Validate::isUnsignedInt($maxGuests)) { + $this->errors[] = Tools::displayError('Invalid maximum number of guests'); + } elseif ($maxGuests < ($baseAdults + $baseChildren)) { + $this->errors[] = Tools::displayError('Maximum number of guests cannot be less than base occupancy of adult and children'); + } + if (!count($this->errors)) { $objRoomType->adult = $baseAdults; $objRoomType->children = $baseChildren; + $objRoomType->max_adults = $maxAdults; + $objRoomType->max_children = $maxChildren; + $objRoomType->max_guests = $maxGuests; $objRoomType->save(); } } else { @@ -3469,7 +3500,7 @@ class AdminProductsControllerCore extends AdminController } } } - + // send information for the length of stay tab public function initFormLengthOfStay($product) { diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 25aec2cc9..532ad216d 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -850,7 +850,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getGuestsByDate($date, $idHotel = false) { return Db::getInstance()->getRow( - 'SELECT SUM(hbd.`adult`) AS `adults`, SUM(hbd.`children`) AS `children` + 'SELECT SUM(hbd.`adult`) AS `adult`, SUM(hbd.`children`) AS `children` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd WHERE hbd.`is_refunded` = 0 AND hbd.`is_back_order` = 0 AND hbd.`date_from` BETWEEN "'.pSQL($date).' 00:00:00" AND "'.pSQL($date).' 23:59:59"'. diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index a44865537..0147210a5 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -176,14 +176,15 @@ class CartControllerCore extends FrontController $result = $objCartBooking->deleteCartBookingData($id_cart, $id_product, 0, 0, 0, 0); if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product)) { if ($id_hotel = $roomTypeInfo['id_hotel']) { - $obj_booking_dtl = new HotelBookingDetail(); - if ($hotel_room_data = $obj_booking_dtl->DataForFrontSearch( - $date_from, - $date_to, - $id_hotel, - $id_product, - 1 - )) { + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + ); + if ($hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams)) { $total_available_rooms = $hotel_room_data['stats']['num_avail']; } } @@ -267,11 +268,18 @@ class CartControllerCore extends FrontController $date_to = Tools::getValue('dateTo'); $date_from = date("Y-m-d", strtotime($date_from)); $date_to = date("Y-m-d", strtotime($date_to)); + + if ($occupancy = json_decode(Tools::getValue('occupancy'), true)) { + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + $this->qty = count($occupancy); + } else { + $this->qty = $occupancy; + + } + } $id_cart = $this->context->cart->id; $id_guest = $this->context->cart->id_guest; - - if ($this->qty == 0) { $this->errors[] = Tools::displayError('Null quantity.', !Tools::getValue('ajax')); } elseif (!$this->id_product) { @@ -284,71 +292,104 @@ class CartControllerCore extends FrontController return; } - $qty_to_check = $this->qty; - $cart_products = $this->context->cart->getProducts(); - - // By Webkul : This code is to check available quantity of Room before adding it to cart. - // only check availability if qty is increasing - if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { - require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - $objRoomType = new HotelRoomType(); - if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) { - if ($id_hotel = $roomTypeInfo['id_hotel']) { - if (strtotime($date_from) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('You can\'t book room before current date'); - } elseif (strtotime($date_from) >= strtotime($date_to)) { - $this->errors[] = Tools::displayError('Check-out date must be after check-in date'); - } elseif ($maxOrdDate = HotelOrderRestrictDate::getMaxOrderDate($id_hotel)) { - // Check Order restrict condition before adding in to cart - if (strtotime('-1 day', strtotime($maxOrdDate)) < strtotime($date_from) - || strtotime($maxOrdDate) < strtotime($date_to) - ) { - $maxOrdDate = date('d-m-Y', strtotime($maxOrdDate)); - $this->errors[] = Tools::displayError('You can\'t book room after date '.$maxOrdDate); + // valdiate occupancy if providede + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + foreach($occupancy as $key =>$roomOccupancy) { + if (!isset($roomOccupancy['adult']) || !$roomOccupancy['adult'] || !Validate::isUnsignedInt($roomOccupancy['adult'])) { + $this->errors[] = sprintf(Tools::displayError('Invalid number of adults for Room %s.'), ($key + 1)); + } + if (isset($roomOccupancy['children'])) { + if (!Validate::isUnsignedInt($roomOccupancy['children'])) { + $this->errors[] = sprintf(Tools::displayError('Invalid number of children for Room %s.'), ($key + 1)); + } + if ($roomOccupancy['children'] > 0) { + if (!isset($roomOccupancy['child_ages']) || ($roomOccupancy['children'] != count($roomOccupancy['child_ages'])) || !is_array($roomOccupancy['child_ages'])) { + $this->errors[] = sprintf(Tools::displayError('Please provide all children age for Room %s.'), ($key + 1)); + } else { + if (is_array($roomOccupancy['child_ages'])) { + foreach($roomOccupancy['child_ages'] as $childAge) { + if (!Validate::isUnsignedInt($childAge)) { + $this->errors[] = sprintf(Tools::displayError('Invalid children age for Room %s.'), ($key + 1)); + } + } } } - if (!$this->errors) { - $objBookingDtl = new HotelBookingDetail(); - $num_days = $objBookingDtl->getNumberOfDays($date_from, $date_to); - $req_rm = $this->qty; - $this->qty = $this->qty * (int) $num_days; - $obj_booking_dtl = new HotelBookingDetail(); - if ($hotel_room_data = $obj_booking_dtl->DataForFrontSearch( - $date_from, - $date_to, - $id_hotel, - $this->id_product, - 1, - 0, - 0, - -1, - 0, - 0, - $id_cart, - $id_guest - )) { - if (isset($hotel_room_data['stats']['num_avail'])) { - $total_available_rooms = $hotel_room_data['stats']['num_avail']; - if (Tools::getValue('op', 'up') == 'up') { - if ($total_available_rooms < $req_rm) { - die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); - } + } + } + } + } + // By Webkul : This code is to check available quantity of Room before adding it to cart. + // only check availability if qty is increasing + if (!$this->errors) { + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) { + if ($id_hotel = $roomTypeInfo['id_hotel']) { + if (strtotime($date_from) < strtotime(date('Y-m-d'))) { + $this->errors[] = Tools::displayError('You can\'t book room before current date'); + } elseif (strtotime($date_from) >= strtotime($date_to)) { + $this->errors[] = Tools::displayError('Check-out date must be after check-in date'); + } elseif ($maxOrdDate = HotelOrderRestrictDate::getMaxOrderDate($id_hotel)) { + // Check Order restrict condition before adding in to cart + if (strtotime('-1 day', strtotime($maxOrdDate)) < strtotime($date_from) + || strtotime($maxOrdDate) < strtotime($date_to) + ) { + $maxOrdDate = date('d-m-Y', strtotime($maxOrdDate)); + $this->errors[] = Tools::displayError('You can\'t book room after date '.$maxOrdDate); + } + } + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + foreach($occupancy as $key =>$roomOccupancy) { + if ($roomOccupancy['adult'] > $roomTypeInfo['max_adults']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have adults more than %s'), $key + 1, $roomTypeInfo['max_adults']); + } + if ($roomOccupancy['children'] > $roomTypeInfo['max_children']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have children more than %s'), $key + 1, $roomTypeInfo['max_children']); + } + if ($roomOccupancy['adult'] + $roomOccupancy['children'] > $roomTypeInfo['max_guests']) { + $this->errors[] = sprintf(Tools::displayError('Room %s cannot have total guests more than %s'), $key + 1, $roomTypeInfo['max_guests']); + } + } + } + if (!$this->errors) { + $objBookingDetail = new HotelBookingDetail(); + $num_days = $objBookingDetail->getNumberOfDays($date_from, $date_to); + $req_rm = $this->qty; + $this->qty = $this->qty * (int) $num_days; + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $this->id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + if ($hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams)) { + if (isset($hotel_room_data['stats']['num_avail'])) { + $total_available_rooms = $hotel_room_data['stats']['num_avail']; + if (Tools::getValue('op', 'up') == 'up') { + if ($total_available_rooms < $req_rm) { + die(json_encode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); } - } else { - $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); } } else { $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); } + } else { + $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); } - } else { - die(json_encode(array('status' => 'failed3'))); } } else { - die(json_encode(array('status' => 'failed4'))); + die(json_encode(array('status' => 'failed3'))); } + } else { + die(json_encode(array('status' => 'failed4'))); + } } + $cart_products = $this->context->cart->getProducts(); + $qty_to_check = $this->qty; if (is_array($cart_products)) { foreach ($cart_products as $cart_product) { if ((!isset($this->id_product_attribute) || $cart_product['id_product_attribute'] == $this->id_product_attribute) && @@ -411,54 +452,38 @@ class CartControllerCore extends FrontController /* * To add Rooms in hotel cart */ - if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { - if (Tools::getValue('op', 'up') == 'up') { - $update_quantity = $this->context->cart->updateQty($this->qty, $this->id_product, $this->id_product_attribute, $this->customization_id, Tools::getValue('op', 'up'), $this->id_address_delivery); - $this->availQty = false; - $id_customer = $this->context->cart->id_customer; - $id_currency = $this->context->cart->id_currency; - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; - $chkQty = 0; - foreach ($hotel_room_info_arr as $key_hotel_room_info => $val_hotel_room_info) { - if ($chkQty < $req_rm) { - $roomDemand = Tools::getValue('roomDemands'); - $roomDemand = json_decode($roomDemand, true); - $roomDemand = json_encode($roomDemand); - $obj_htl_cart_booking_data = new HotelCartBookingData(); - $obj_htl_cart_booking_data->id_cart = $this->context->cart->id; - $obj_htl_cart_booking_data->id_guest = $this->context->cart->id_guest; - $obj_htl_cart_booking_data->id_customer = $id_customer; - $obj_htl_cart_booking_data->id_currency = $id_currency; - $obj_htl_cart_booking_data->id_product = $val_hotel_room_info['id_product']; - $obj_htl_cart_booking_data->id_room = $val_hotel_room_info['id_room']; - $obj_htl_cart_booking_data->id_hotel = $val_hotel_room_info['id_hotel']; - $obj_htl_cart_booking_data->booking_type = HotelBookingDetail::ALLOTMENT_AUTO; - $obj_htl_cart_booking_data->quantity = $num_days; - $obj_htl_cart_booking_data->extra_demands = $roomDemand; - $obj_htl_cart_booking_data->date_from = $date_from; - $obj_htl_cart_booking_data->date_to = $date_to; - $obj_htl_cart_booking_data->save(); - ++$chkQty; - } else { - break; - } - } - $this->availQty = $total_available_rooms - $req_rm; - } else { - $objCartBooking = new HotelCartBookingData(); - $update_quantity = $objCartBooking->deleteCartBookingData( - $id_cart, - $this->id_product, - 0, - $date_from, - $date_to - ); - $this->availQty = $total_available_rooms + $req_rm; - - } - $this->context->cookie->avail_rooms = $this->availQty; + $objHotelCartBookingData = new HotelCartBookingData(); + $roomDemand = json_decode(Tools::getValue('roomDemands'), true); + $roomDemand = json_encode($roomDemand); + $operator = Tools::getValue('op', 'up'); + $this->availQty = $total_available_rooms; + $update_quantity = $objHotelCartBookingData->updateRoomCartBookingData( + $this->id_product, + $occupancy, + $operator, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $id_cart, + $id_guest + ); + if ($operator == 'up') { + $this->availQty = $total_available_rooms - $req_rm; + $this->context->cookie->currentAddedProduct = json_encode(array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'id_product' => $this->id_product, + 'occupancy' => $occupancy, + 'room_demand' => $roomDemand, + 'req_rm' => $req_rm + )); + } else { + $this->availQty = $total_available_rooms + $req_rm; } + $this->context->cookie->avail_rooms = $this->availQty; + /*------ BY Webkul ------*/ if ($update_quantity < 0) { diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index ffc087ecd..7337d78cc 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -138,6 +138,9 @@ class CategoryControllerCore extends FrontController $date_to = date('Y-m-d', strtotime($date_from) + 86400); } + // get occupancy of the search + $occupancy = Tools::getValue('occupancy'); + $currency = new Currency($this->context->currency->id); if (Module::isInstalled('hotelreservationsystem')) { @@ -148,8 +151,18 @@ class CategoryControllerCore extends FrontController $id_cart = $this->context->cart->id; $id_guest = $this->context->cookie->id_guest; - $obj_booking_dtl = new HotelBookingDetail(); - $booking_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, 0, 0, 0, 0, -1, 0, 0, $id_cart, $id_guest); + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'occupancy' => $occupancy, + 'hotel_id' => $id_hotel, + 'get_total_rooms' => 0, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + + $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); $feat_img_dir = _PS_IMG_.'rf/'; $ratting_img = _MODULE_DIR_.'hotelreservationsystem/views/img/Slices/icons-sprite.png'; @@ -227,6 +240,10 @@ class CategoryControllerCore extends FrontController $date_to = Tools::getValue('date_to'); $htl_id_category = Tools::getValue('id_category'); + // occupancy of the search + // @todo send occupancy in the search function + $occupancy = Tools::getValue('occupancy'); + $sort_by = Tools::getValue('sort_by'); $sort_value = Tools::getValue('sort_value'); $filter_data = Tools::getValue('filter_data'); @@ -263,11 +280,23 @@ class CategoryControllerCore extends FrontController $id_hotel = HotelBranchInformation::getHotelIdByIdCategory($htl_id_category); - $id_cart = $this->context->cart->id; - $id_guest = $this->context->cookie->id_guest; + $objBookingDetail = new HotelBookingDetail(); - $obj_booking_dtl = new HotelBookingDetail(); - $booking_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, 0, 0, $adult, $child, $ratting, $amenities, $price, $id_cart, $id_guest); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'adult' => $adult, + 'children' => $child, + 'ratting' => $ratting, + 'amenities' => $amenities, + 'price' => $price, + 'get_total_rooms' => 0, + 'id_cart' => $this->context->cart->id, + 'id_guest' => $this->context->cookie->id_guest, + ); + + $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); // reset array keys from 0 $booking_data['rm_data'] = array_values($booking_data['rm_data']); if ($sort_by && $sort_value) { diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 868eb6fee..7aaf9e6de 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -157,6 +157,7 @@ class OrderConfirmationControllerCore extends FrontController $cart_htl_data[$type_key]['cover_img'] = $cover_img; $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; + 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*/ @@ -176,6 +177,9 @@ class OrderConfirmationControllerCore extends FrontController $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]['adult'] += $data_v['adult']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] += $data_v['children']; + //// By webkul New way to calculate product prices with feature Prices $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_incl']/$num_days; @@ -195,6 +199,10 @@ class OrderConfirmationControllerCore extends FrontController $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = $data_v['date_to']; $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; + $cart_htl_data[$type_key]['date_diff'][$date_join]['adult'] = $data_v['adult']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; + + // By webkul New way to calculate product prices with feature Prices $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_incl']/$num_days; diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index 120a32022..e56bf00de 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -315,8 +315,6 @@ class OrderDetailControllerCore extends FrontController $rm_dtl = $objRoomType->getRoomTypeInfoByIdProduct($type_value['product_id']); $cartHotelData[$type_key]['id_product'] = $type_value['product_id']; $cartHotelData[$type_key]['cover_img'] = $cover_img; - $cartHotelData[$type_key]['adult'] = $rm_dtl['adult']; - $cartHotelData[$type_key]['children'] = $rm_dtl['children']; $objBookingDemand = new HotelBookingDemands(); foreach ($order_bk_data as $data_k => $data_v) { @@ -333,6 +331,9 @@ class OrderDetailControllerCore extends FrontController $num_days = $cartHotelData[$type_key]['date_diff'][$date_join]['num_days']; + $cartHotelData[$type_key]['date_diff'][$date_join]['adult'] += $data_v['adult']; + $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']; @@ -349,6 +350,8 @@ class OrderDetailControllerCore extends FrontController $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]['adult'] = $data_v['adult']; + $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; @@ -422,7 +425,6 @@ class OrderDetailControllerCore extends FrontController $redirectTermsLink = $this->context->link->getCMSLink(new CMS(3, $this->context->language->id), null, $this->context->language->id); } - $this->context->smarty->assign( array( 'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'), diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index d1ed6a7dc..3a9ec7d30 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -46,10 +46,10 @@ class ProductControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'product.css'); $this->addCSS(_THEME_CSS_DIR_.'print.css', 'print'); $this->addJqueryPlugin(array('fancybox', 'idTabs', 'scrollTo', 'serialScroll', 'bxslider')); - $this->addCSS(_THEME_CSS_DIR_.'datepicker.css'); + $this->addJS(array( _THEME_JS_DIR_.'tools.js', // retro compat themes 1.5 - _THEME_JS_DIR_.'product.js' + _THEME_JS_DIR_.'product.js', )); } else { $this->addJqueryPlugin(array('scrollTo', 'serialScroll')); @@ -310,10 +310,23 @@ class ProductControllerCore extends FrontController if (!($date_to = Tools::getValue('date_to'))) { $date_to = date('Y-m-d', strtotime('+1 day', strtotime($date_from))); } + if (!$occupancy = Tools::getValue('occupancy')) { + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_NORMAL) { + $occupancy = 1; + } + } - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $hotel_id, $this->product->id, 1); + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $hotel_id, + 'occupancy' => $occupancy, + 'id_room_type' => $this->product->id, + 'only_search_data' => 1 + ); + $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams); if ($hotel_room_data) { $total_available_rooms = $hotel_room_data['stats']['num_avail']; } @@ -359,8 +372,10 @@ class ProductControllerCore extends FrontController ); } + $this->context->smarty->assign( array( + 'room_type_info' => $room_info_by_product_id, 'isHotelRefundable' => $hotel_branch_obj->isRefundable(), 'max_order_date' => $max_order_date, 'warning_num' => Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER'), @@ -387,7 +402,7 @@ class ProductControllerCore extends FrontController ) ); - $this->assignBookingFormVars($this->product->id, $date_from, $date_to); + $this->assignBookingFormVars($this->product->id, $date_from, $date_to, $occupancy); // product price after imposing feature prices... if ($useTax) { @@ -425,6 +440,7 @@ class ProductControllerCore extends FrontController $this->context->smarty->assign( array( + // occupancy fields 'room_type_demands' => $roomTypeDemands, 'WK_PRICE_CALC_METHOD_EACH_DAY' => HotelRoomTypeGlobalDemand::WK_PRICE_CALC_METHOD_EACH_DAY, 'product_id_hotel' => $hotel_id, @@ -474,7 +490,7 @@ class ProductControllerCore extends FrontController $idProduct, $dateFrom, $dateTo, - $quantity = 1, + $occupancy, $jsonDemands = '' ) { $objProduct = new Product($idProduct, true, $this->context->language->id, $this->context->shop->id); @@ -512,23 +528,21 @@ class ProductControllerCore extends FrontController } $numDays = $objBookingDetail->getNumberOfDays($dateFrom, $dateTo); - - $hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, ); + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + $quantity = count($occupancy); + } else { + $quantity = $occupancy; + } - if ($hotelRoomData) { + if ($hotelRoomData = $objBookingDetail->DataForFrontSearch($bookingParams)) { $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; $quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity; } @@ -583,6 +597,13 @@ class ProductControllerCore extends FrontController // calculate total price $totalPrice = $totalRoomPrice + $demandsPrice; + // send occupancy information searched by the user + if ($this->ajax && $occupancy && is_array($occupancy)) { + $smartyVars['occupancies'] = $occupancy; + $smartyVars['occupancy_adults'] = array_sum(array_column($occupancy, 'adult')); + $smartyVars['occupancy_children'] = array_sum(array_column($occupancy, 'children')); + $smartyVars['occupancy_child_ages'] = array_sum(array_column($occupancy, 'child_ages')); + } $smartyVars['hotel_location'] = $hotelLocation; $smartyVars['order_date_restrict'] = $orderDateRestrict; @@ -1073,7 +1094,7 @@ class ProductControllerCore extends FrontController $idProduct = (int) Tools::getValue('id_product'); $dateFrom = Tools::getValue('date_from'); $dateTo = Tools::getValue('date_to'); - $quantity = (int) Tools::getValue('quantity'); + $occupancy = Tools::getValue('occupancy'); $roomTypeDemands = Tools::getValue('room_type_demands'); $dateFrom = date('Y-m-d', strtotime($dateFrom)); @@ -1083,7 +1104,7 @@ class ProductControllerCore extends FrontController $idProduct, $dateFrom, $dateTo, - $quantity, + $occupancy, $roomTypeDemands )) { $html = $this->context->smarty->fetch('_partials/booking-form.tpl'); @@ -1102,23 +1123,25 @@ class ProductControllerCore extends FrontController if ($roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($idProduct)) { $dateFrom = Tools::getValue('date_from'); $dateTo = Tools::getValue('date_to'); - $quantity = Tools::getValue('qty'); + // occupancy is created for sending to the search function + $occupancy = Tools::getValue('occupancy'); + $occupancy = json_decode($occupancy, true); + // @todo for now we are sending the num of rooms for current algo, + // @todo Send occupancy in the dataForFrontSearch function + $quantity = count($occupancy); if ($idHotel = $roomTypeInfo['id_hotel']) { $objBookingDetail = new HotelBookingDetail(); - if ($hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $this->context->cart->id, - $this->context->cart->id_guest - )) { + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'occupancy' => $occupancy, + 'only_search_data' => 1, + 'id_cart' => $this->context->cart->id, + 'id_guest' => $this->context->cart->id_guest + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { $totalAvailRooms = $hotelRoomData['stats']['num_avail']; if ($totalAvailRooms >= $quantity) { $totalPrice = 0; @@ -1143,7 +1166,8 @@ class ProductControllerCore extends FrontController $featurePriceDiff = (float)($productPriceWithoutReduction - $featurePrice); //$price_tax_incl = Product::getPriceStatic($idProduct, $price_tax); - $totalRoomPrice = $roomTypeDateRangePrice * $quantity; + // $totalRoomPrice = $roomTypeDateRangePrice * $quantity; + $totalRoomPrice = $roomTypeDateRangePrice; $totalPrice += $totalRoomPrice; $demandsPrice = 0; if ($roomDemand = Tools::getValue('room_demands')) { diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql index 75266469e..78dcb4907 100644 --- a/install/data/db_structure.sql +++ b/install/data/db_structure.sql @@ -673,7 +673,6 @@ CREATE TABLE `PREFIX_customer_thread` ( KEY `id_product` (`id_product`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8 COLLATION; - CREATE TABLE `PREFIX_customization` ( `id_customization` int(10) unsigned NOT NULL auto_increment, `id_product_attribute` int(10) unsigned NOT NULL DEFAULT '0', @@ -1139,6 +1138,7 @@ CREATE TABLE `PREFIX_orders` ( `valid` int(1) unsigned NOT NULL DEFAULT '0', `is_advance_payment` tinyint(1) NOT NULL DEFAULT '0', `advance_paid_amount` decimal(20,6) NOT NULL DEFAULT '0.00', + `is_occupnacy_provided` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order`), diff --git a/js/admin/orders.js b/js/admin/orders.js index fce74f114..738e78903 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -383,6 +383,12 @@ function init() else { $('tr#new_product input, tr#new_product select, tr#new_product button').removeAttr('disabled'); + $('tr#new_product .booking_guest_occupancy').removeClass('disabled'); + if (data.room_type_info) { + $('tr#new_product .num_adults').attr('max', data.room_type_info.max_adults); + $('tr#new_product .num_children').attr('max', data.room_type_info.max_children); + } + // Keep product variable current_product = data; $('#add_product_product_id').val(data.id_product); @@ -458,9 +464,294 @@ function init() else $('#add_product_product_stock').css('font-weight', 'normal').css('color', 'black').css('font-size', '1em'); } + // update occupancy input + // updateOccupancyInput() // total update addProductRefreshTotal(); }); + initOccupancyField(); + + function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) + { + var adult = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adult += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adult) + ' '; + if (parseInt(adult) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + if (parseInt(rooms) > 1) { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + } + + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); + } + + function initOccupancyField() + { + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + if ($(this).hasClass('num_children')) { + var totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + if (totalChilds < max_child_in_room) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + + + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + + var childAgeSelect = '

'; + childAgeSelect += ''; + childAgeSelect += '

'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + + $(document).on('click', '.booking_guest_occupancy:not(.disabled)', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + let hasErrors = 0; + + let adult = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adult.length || (adult.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adult and children + adult.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().removeClass('has-error'); + + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } else { + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().addClass('has-error'); + } + } + } + }); + + $('.booking_occupancy_wrapper .add_new_occupancy_btn').on('click', function(e) { + e.preventDefault(); + + var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var occupancy_block = ''; + var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index')); + roomBlockIndex += 1; + + + var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); + countRooms += 1 + occupancy_block += '
'; + occupancy_block += '
' + remove_txt + '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + $(booking_occupancy_wrapper).find('.booking_occupancy_inner').append(occupancy_block); + + setRoomTypeGuestOccupancy(booking_occupancy_wrapper); + }); + } + + $('input#add_product_product_quantity').on('change', function(){ + // updateOccupancyInput() + addProductRefreshTotal(); + }); + + + // function updateOccupancyInput() + // { + // let roomRequired = parseInt($('input#add_product_product_quantity').val()); + // let add_booking_occupancy_div = $('tr#new_product').find('#add_product_occupancy'); + // if ($(add_booking_occupancy_div).find('> div').length < roomRequired) { + // while ($(add_booking_occupancy_div).find('> div').length < roomRequired) { + // let html = '
'; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'+adults_txt+'
'; + // html += ''; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'+children_txt+'
'; + // html += ''; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'; + // html += ''; + // html += '
'; + // html += ''; + // html += '
'; + // html += '
'; + // html += '
'; + // html += '
'; + // $(add_booking_occupancy_div).append(html); + // } + // } else { + // $(add_booking_occupancy_div).find('> div').each(function(ind, element) { + // if (roomRequired <= ind) { + // element.remove(); + // } + // }); + // } + + // } + + // $('.add_product_children').on('change', function(e) { + // let elementVal = parseInt($(this).val()); + // let children_age_div = $(this).closest('.row').find('.children_age_div'); + // if ($(children_age_div).find('.child_age').length < elementVal) { + // while ($(children_age_div).find('.child_age').length < elementVal) { + // let html = '
'; + // html += ''; + // html += '
'; + + // $(children_age_div).closest('.children_age_div').append(html); + // // children_age_div = $(this).closest('.booking_occupancy_edit').find('.children_age_div .child_age'); + // } + // } else { + // $(children_age_div).find('.child_age').each(function(ind, element) { + // if (elementVal <= ind) { + // element.remove(); + // } + // }); + + // } + // // if ($(children_age_div).length ) + // }); + $('#submitAddProduct').unbind('click').click(function(e) { e.preventDefault(); @@ -635,16 +926,13 @@ function init() if (!element_list.length) { element_list = element.parents('.product-line-row'); - element_list.find('td .booking_duration_show').hide(); - element_list.find('td .booking_duration_edit').show(); - } - else - { - element_list.find('td .booking_duration_show').hide(); - element_list.find('td .booking_duration_edit').show(); } element_list.find('td .room_unit_price_show').hide(); element_list.find('td .room_unit_price_edit').show(); + element_list.find('td .booking_duration_show').hide(); + element_list.find('td .booking_duration_edit').show(); + element_list.find('td .booking_occupancy_show').hide(); + element_list.find('td .booking_occupancy_edit').show(); //element_list.find('td .product_price_show').hide(); //element_list.find('td .product_price_edit').show(); element_list.find('td.cancelCheck').hide(); @@ -685,6 +973,8 @@ function init() element_list.find('td .booking_duration_edit').hide(); element_list.find('td .room_unit_price_show').show(); element_list.find('td .room_unit_price_edit').hide(); + element_list.find('td .booking_occupancy_show').show(); + element_list.find('td .booking_occupancy_edit').hide(); element_list.find('td.product_invoice').hide(); element_list.find('td.cancelCheck').show(); element_list.find('td.cancelQuantity').show(); @@ -724,10 +1014,12 @@ function init() var id_order_detail = $(this).closest('.product-line-row').find('td .edit_product_id_order_detail').val(); //some vaues are added to the query by webkul query = 'ajax=1&token='+token+'&action=editProductOnOrder&id_order='+id_order+'&id_room='+id_room+'&id_product='+id_product+'&id_hotel='+id_hotel+'&date_from='+date_from+'&date_to='+date_to+'&order_detail_id='+order_detail_id+'&'; - if (element_list.length) + + if (element_list.length) { query += element_list.parent().parent().find('input, select, .edit_product_id_order_detail').serialize(); - else + } else { query += element.parent().parent().find('input, select, .edit_product_id_order_detail').serialize(); + } $.ajax({ type: 'POST', diff --git a/js/daterangepicker/LICENSE.txt b/js/daterangepicker/LICENSE.txt new file mode 100644 index 000000000..171f9923c --- /dev/null +++ b/js/daterangepicker/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Chunlong + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/js/daterangepicker/jquery.daterangepicker.css b/js/daterangepicker/jquery.daterangepicker.css new file mode 100644 index 000000000..7bff17336 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.css @@ -0,0 +1,460 @@ +.date-picker { + width: 170px; + height: 25px; + padding: 0; + border: 0; + line-height: 25px; + padding-left: 10px; + font-size: 12px; + font-family: Arial, sans-serif; + font-weight: bold; + cursor: pointer; + color: #303030; + position: relative; + z-index: 2; +} + +.date-picker-wrapper { + position: absolute; + z-index: 1; + border: 1px solid #bfbfbf; + background-color: #efefef; + padding: 5px 12px; + font-size: 12px; + line-height: 20px; + color: #aaa; + font-family: Arial, sans-serif; + -webkit-box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5); + box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5); + -webkit-box-sizing: initial; + box-sizing: initial; +} + +.dp-clearfix { + clear: both; + height: 0; + font-size: 0; +} + +.date-picker-wrapper.inline-wrapper { + position: relative; + -webkit-box-shadow: none; + box-shadow: none; + display: inline-block; +} + +.date-picker-wrapper.single-date { + width: auto; +} + +.date-picker-wrapper.no-shortcuts { + padding-bottom: 12px; +} + +.date-picker-wrapper.no-topbar { + padding-top: 12px; +} + +.date-picker-wrapper .footer { + font-size: 11px; + padding-top: 3px; +} + +.date-picker-wrapper b { + color: #666; + font-weight: 700; +} + +.date-picker-wrapper a { + color: #6bb4d6; + text-decoration: underline; +} + +.date-picker-wrapper .month-name { + text-transform: uppercase; +} + +.date-picker-wrapper .select-wrapper { + position: relative; + overflow: hidden; + display: inline-block; + vertical-align: middle; +} + +.date-picker-wrapper .select-wrapper:hover { + text-decoration: underline; +} + +.date-picker-wrapper .month-element { + display: inline-block; + vertical-align: middle; +} + +.date-picker-wrapper .select-wrapper select { + position: absolute; + margin: 0; + padding: 0; + left: 0; + top: -1px; + font-size: inherit; + font-style: inherit; + font-weight: inherit; + text-transform: inherit; + color: inherit; + cursor: pointer; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background: transparent; + border: 0; + outline: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)"; + filter: alpha(opacity=1); + opacity: 0.01; +} + +.date-picker-wrapper .month-wrapper { + border: 1px solid #bfbfbf; + border-radius: 3px; + background-color: #fff; + padding: 5px; + cursor: default; + position: relative; + _overflow: hidden; +} + +.date-picker-wrapper .month-wrapper table { + width: 190px; + float: left; +} + +.date-picker-wrapper .month-wrapper table.month2 { + width: 190px; + float: left; +} + +.date-picker-wrapper .month-wrapper table th, .date-picker-wrapper .month-wrapper table td { + vertical-align: middle; + text-align: center; + line-height: 14px; + margin: 0px; + padding: 0px; +} + +.date-picker-wrapper .month-wrapper table .day { + padding: 5px 0; + line-height: 1; + font-size: 12px; + margin-bottom: 1px; + color: #ccc; + cursor: default; +} + +.date-picker-wrapper .month-wrapper table div.day.lastMonth, .date-picker-wrapper .month-wrapper table div.day.nextMonth { + color: #999; + cursor: default; +} + +.date-picker-wrapper .month-wrapper table .day.checked { + background-color: #9cdbf7; +} + +.date-picker-wrapper .month-wrapper table .week-name { + height: 20px; + line-height: 20px; + font-weight: 100; + text-transform: uppercase; +} + +.date-picker-wrapper .month-wrapper table .day.has-tooltip { + cursor: help !important; +} + +.date-picker-wrapper .month-wrapper table .day.has-tooltip .tooltip { + white-space: nowrap; +} + +.date-picker-wrapper .time label { + white-space: nowrap; +} + +.date-picker-wrapper .month-wrapper table .day.toMonth.valid { + color: #333; + cursor: pointer; +} + +.date-picker-wrapper .month-wrapper table .day.toMonth.hovering { + background-color: #cdecfa; +} + +.date-picker-wrapper .month-wrapper table .day.nextMonth, .date-picker-wrapper .month-wrapper table .day.lastMonth { + display: none; +} + +.date-picker-wrapper .month-wrapper table .day.real-today { + background-color: #ffe684; +} + +.date-picker-wrapper .month-wrapper table .day.real-today.checked, .date-picker-wrapper .month-wrapper table .day.real-today.hovering { + background-color: #70ccd5; +} + +.date-picker-wrapper table .caption { + height: 40px; +} + +.date-picker-wrapper table .caption > th:first-of-type, .date-picker-wrapper table .caption > th:last-of-type { + width: 27px; +} + +.date-picker-wrapper table .caption .next, .date-picker-wrapper table .caption .prev { + padding: 0 5px; + cursor: pointer; +} + +.date-picker-wrapper table .caption .next:hover, .date-picker-wrapper table .caption .prev:hover { + background-color: #ccc; + color: white; +} + +.date-picker-wrapper .gap { + position: relative; + z-index: 1; + width: 15px; + height: 100%; + background-color: red; + font-size: 0; + line-height: 0; + float: left; + top: -5px; + margin: 0 10px -10px; + visibility: hidden; + height: 0; +} + +.date-picker-wrapper .gap .gap-lines { + height: 100%; + overflow: hidden; +} + +.date-picker-wrapper .gap .gap-line { + height: 15px; + width: 15px; + position: relative; +} + +.date-picker-wrapper .gap .gap-line .gap-1 { + z-index: 1; + height: 0; + border-left: 8px solid white; + border-top: 8px solid #eee; + border-bottom: 8px solid #eee; +} + +.date-picker-wrapper .gap .gap-line .gap-2 { + position: absolute; + right: 0; + top: 0px; + z-index: 2; + height: 0; + border-left: 8px solid transparent; + border-top: 8px solid white; +} + +.date-picker-wrapper .gap .gap-line .gap-3 { + position: absolute; + right: 0; + top: 8px; + z-index: 2; + height: 0; + border-left: 8px solid transparent; + border-bottom: 8px solid white; +} + +.date-picker-wrapper .gap .gap-top-mask { + width: 6px; + height: 1px; + position: absolute; + top: -1px; + left: 1px; + background-color: #eee; + z-index: 3; +} + +.date-picker-wrapper .gap .gap-bottom-mask { + width: 6px; + height: 1px; + position: absolute; + bottom: -1px; + left: 7px; + background-color: #eee; + z-index: 3; +} + +.date-picker-wrapper .selected-days { + display: none; +} + +.date-picker-wrapper .drp_top-bar { + line-height: 1.4; + position: relative; + padding: 10px 40px 10px 0; +} + +.date-picker-wrapper .drp_top-bar .error-top, .date-picker-wrapper .drp_top-bar .normal-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar .default-top { + display: block; +} + +.date-picker-wrapper .drp_top-bar.error .default-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar.error .error-top { + display: block; + color: red; +} + +.date-picker-wrapper .drp_top-bar.normal .default-top { + display: none; +} + +.date-picker-wrapper .drp_top-bar.normal .normal-top { + display: block; +} + +.date-picker-wrapper .drp_top-bar.normal .normal-top .selection-top { + color: #333; +} + +.date-picker-wrapper .drp_top-bar .apply-btn { + position: absolute; + right: 0px; + top: 6px; + padding: 3px 5px; + margin: 0; + font-size: 12px; + border-radius: 4px; + cursor: pointer; + color: #d9eef7; + border: solid 1px #0076a3; + background: #0095cd; + background: -moz-linear-gradient(top, #00adee, #0078a5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); + color: white; + line-height: initial; +} + +.date-picker-wrapper .drp_top-bar .apply-btn.disabled { + cursor: pointer; + color: #606060; + border: solid 1px #b7b7b7; + background: #fff; + background: -moz-linear-gradient(top, #fff, #ededed); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed'); +} + +.date-picker-wrapper .time { + position: relative; +} + +.date-picker-wrapper.single-month .time { + display: block; +} + +.date-picker-wrapper .time input[type=range] { + vertical-align: middle; + width: 129px; + padding: 0; + margin: 0; + height: 20px; +} + +.date-picker-wrapper .time1 { + width: 180px; + padding: 0 5px; + text-align: center; +} + +/*time styling*/ +.time2 { + width: 180px; + padding: 0 5px; + text-align: center; +} + +.date-picker-wrapper .time1 { + float: left; +} + +.date-picker-wrapper .time2 { + float: right; +} + +.date-picker-wrapper .hour { + text-align: right; +} + +.minute { + text-align: right; +} + +.date-picker-wrapper .hide { + display: none; +} + +.date-picker-wrapper .first-date-selected, .date-picker-wrapper .last-date-selected { + background-color: #49e !important; + color: white !important; +} + +.date-picker-wrapper .date-range-length-tip { + position: absolute; + margin-top: -4px; + margin-left: -8px; + -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 3px rgba(0, 0, 0, 0.3); + display: none; + background-color: yellow; + padding: 0 6px; + border-radius: 2px; + font-size: 12px; + line-height: 16px; + -webkit-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -moz-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -ms-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + -o-filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); + filter: drop-shadow(0 0 3px rgba(0, 0, 0, 0.3)); +} + +.date-picker-wrapper .date-range-length-tip:after { + content: ''; + position: absolute; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid yellow; + left: 50%; + margin-left: -4px; + bottom: -4px; +} + +.date-picker-wrapper.two-months.no-gap .month1 .next, .date-picker-wrapper.two-months.no-gap .month2 .prev { + display: none; +} + +.date-picker-wrapper .week-number { + padding: 5px 0; + line-height: 1; + font-size: 12px; + margin-bottom: 1px; + color: #999; + cursor: pointer; +} + +.date-picker-wrapper .week-number.week-number-selected { + color: #49e; + font-weight: bold; +} diff --git a/js/daterangepicker/jquery.daterangepicker.js b/js/daterangepicker/jquery.daterangepicker.js new file mode 100755 index 000000000..c104e536b --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.js @@ -0,0 +1,2638 @@ +// jquery.daterangepicker.js +// author : Chunlong Liu +// license : MIT +// www.jszen.com + +(function(factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery', 'moment'], factory); + } else if (typeof exports === 'object' && typeof module !== 'undefined') { + // CommonJS. Register as a module + module.exports = factory(require('jquery'), require('moment')); + } else { + // Browser globals + factory(jQuery, moment); + } +}(function($, moment) { + 'use strict'; + $.dateRangePickerLanguages = { + "default": //default language: English + { + "selected": "Selected:", + "day": "Day", + "days": "Days", + "apply": "Close", + "week-1": "mo", + "week-2": "tu", + "week-3": "we", + "week-4": "th", + "week-5": "fr", + "week-6": "sa", + "week-7": "su", + "week-number": "W", + "month-name": ["january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"], + "shortcuts": "Shortcuts", + "custom-values": "Custom Values", + "past": "Past", + "following": "Following", + "previous": "Previous", + "prev-week": "Week", + "prev-month": "Month", + "prev-year": "Year", + "next": "Next", + "next-week": "Week", + "next-month": "Month", + "next-year": "Year", + "less-than": "Date range should not be more than %d days", + "more-than": "Date range should not be less than %d days", + "default-more": "Please select a date range longer than %d days", + "default-single": "Please select a date", + "default-less": "Please select a date range less than %d days", + "default-range": "Please select a date range between %d and %d days", + "default-default": "Please select a date range", + "time": "Time", + "hour": "Hour", + "minute": "Minute" + }, + "id": { + "selected": "Terpilih:", + "day": "Hari", + "days": "Hari", + "apply": "Tutup", + "week-1": "sen", + "week-2": "sel", + "week-3": "rab", + "week-4": "kam", + "week-5": "jum", + "week-6": "sab", + "week-7": "min", + "week-number": "W", + "month-name": ["januari", "februari", "maret", "april", "mei", "juni", "juli", "agustus", "september", "oktober", "november", "desember"], + "shortcuts": "Pintas", + "custom-values": "Nilai yang ditentukan", + "past": "Yang Lalu", + "following": "Mengikuti", + "previous": "Sebelumnya", + "prev-week": "Minggu", + "prev-month": "Bulan", + "prev-year": "Tahun", + "next": "Selanjutnya", + "next-week": "Minggu", + "next-month": "Bulan", + "next-year": "Tahun", + "less-than": "Tanggal harus lebih dari %d hari", + "more-than": "Tanggal harus kurang dari %d hari", + "default-more": "Jarak tanggal harus lebih lama dari %d hari", + "default-single": "Silakan pilih tanggal", + "default-less": "Jarak rentang tanggal tidak boleh lebih lama dari %d hari", + "default-range": "Rentang tanggal harus antara %d dan %d hari", + "default-default": "Silakan pilih rentang tanggal", + "time": "Waktu", + "hour": "Jam", + "minute": "Menit" + }, + "az": { + "selected": "Seçildi:", + "day": " gün", + "days": " gün", + "apply": "tətbiq", + "week-1": "1", + "week-2": "2", + "week-3": "3", + "week-4": "4", + "week-5": "5", + "week-6": "6", + "week-7": "7", + "month-name": ["yanvar", "fevral", "mart", "aprel", "may", "iyun", "iyul", "avqust", "sentyabr", "oktyabr", "noyabr", "dekabr"], + "shortcuts": "Qısayollar", + "past": "Keçmiş", + "following": "Növbəti", + "previous": "   ", + "prev-week": "Öncəki həftə", + "prev-month": "Öncəki ay", + "prev-year": "Öncəki il", + "next": "   ", + "next-week": "Növbəti həftə", + "next-month": "Növbəti ay", + "next-year": "Növbəti il", + "less-than": "Tarix aralığı %d gündən çox olmamalıdır", + "more-than": "Tarix aralığı %d gündən az olmamalıdır", + "default-more": "%d gündən çox bir tarix seçin", + "default-single": "Tarix seçin", + "default-less": "%d gündən az bir tarix seçin", + "default-range": "%d və %d gün aralığında tarixlər seçin", + "default-default": "Tarix aralığı seçin" + }, + "bg": { + "selected": "Избрано:", + "day": "Ден", + "days": "Дни", + "apply": "Затвори", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "нд", + "week-number": "С", + "month-name": ["януари", "февруари", "март", "април", "май", "юни", "юли", "август", "септември", "октомври", "ноември", "декември"], + "shortcuts": "Преки пътища", + "custom-values": "Персонализирани стойности", + "past": "Минал", + "following": "Следващ", + "previous": "Предишен", + "prev-week": "Седмица", + "prev-month": "Месец", + "prev-year": "Година", + "next": "Следващ", + "next-week": "Седмица", + "next-month": "Месец", + "next-year": "Година", + "less-than": "Периодът от време не трябва да е повече от %d дни", + "more-than": "Периодът от време не трябва да е по-малко от %d дни", + "default-more": "Моля изберете период по-дълъг от %d дни", + "default-single": "Моля изберете дата", + "default-less": "Моля изберете период по-къс от %d дни", + "default-range": "Моля изберете период между %d и %d дни", + "default-default": "Моля изберете период", + "time": "Време", + "hour": "Час", + "minute": "Минута" + }, + "cn": //simplified chinese + { + "selected": "已选择:", + "day": "天", + "days": "天", + "apply": "确定", + "week-1": "一", + "week-2": "二", + "week-3": "三", + "week-4": "四", + "week-5": "五", + "week-6": "六", + "week-7": "日", + "week-number": "周", + "month-name": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + "shortcuts": "快捷选择", + "past": "过去", + "following": "将来", + "previous": "   ", + "prev-week": "上周", + "prev-month": "上个月", + "prev-year": "去年", + "next": "   ", + "next-week": "下周", + "next-month": "下个月", + "next-year": "明年", + "less-than": "所选日期范围不能大于%d天", + "more-than": "所选日期范围不能小于%d天", + "default-more": "请选择大于%d天的日期范围", + "default-less": "请选择小于%d天的日期范围", + "default-range": "请选择%d天到%d天的日期范围", + "default-single": "请选择一个日期", + "default-default": "请选择一个日期范围", + "time": "时间", + "hour": "小时", + "minute": "分钟" + }, + "cz": { + "selected": "Vybráno:", + "day": "Den", + "days": "Dny", + "apply": "Zavřít", + "week-1": "po", + "week-2": "út", + "week-3": "st", + "week-4": "čt", + "week-5": "pá", + "week-6": "so", + "week-7": "ne", + "month-name": ["leden", "únor", "březen", "duben", "květen", "červen", "červenec", "srpen", "září", "říjen", "listopad", "prosinec"], + "shortcuts": "Zkratky", + "past": "po", + "following": "následující", + "previous": "předchozí", + "prev-week": "týden", + "prev-month": "měsíc", + "prev-year": "rok", + "next": "další", + "next-week": "týden", + "next-month": "měsíc", + "next-year": "rok", + "less-than": "Rozsah data by neměl být větší než %d dnů", + "more-than": "Rozsah data by neměl být menší než %d dnů", + "default-more": "Prosím zvolte rozsah data větší než %d dnů", + "default-single": "Prosím zvolte datum", + "default-less": "Prosím zvolte rozsah data menší než %d dnů", + "default-range": "Prosím zvolte rozsah data mezi %d a %d dny", + "default-default": "Prosím zvolte rozsah data" + }, + "de": { + "selected": "Auswahl:", + "day": "Tag", + "days": "Tage", + "apply": "Schließen", + "week-1": "mo", + "week-2": "di", + "week-3": "mi", + "week-4": "do", + "week-5": "fr", + "week-6": "sa", + "week-7": "so", + "month-name": ["januar", "februar", "märz", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "dezember"], + "shortcuts": "Schnellwahl", + "past": "Vorherige", + "following": "Folgende", + "previous": "Vorherige", + "prev-week": "Woche", + "prev-month": "Monat", + "prev-year": "Jahr", + "next": "Nächste", + "next-week": "Woche", + "next-month": "Monat", + "next-year": "Jahr", + "less-than": "Datumsbereich darf nicht größer sein als %d Tage", + "more-than": "Datumsbereich darf nicht kleiner sein als %d Tage", + "default-more": "Bitte mindestens %d Tage auswählen", + "default-single": "Bitte ein Datum auswählen", + "default-less": "Bitte weniger als %d Tage auswählen", + "default-range": "Bitte einen Datumsbereich zwischen %d und %d Tagen auswählen", + "default-default": "Bitte ein Start- und Enddatum auswählen", + "Time": "Zeit", + "hour": "Stunde", + "minute": "Minute" + }, + "es": { + "selected": "Seleccionado:", + "day": "Día", + "days": "Días", + "apply": "Cerrar", + "week-1": "lu", + "week-2": "ma", + "week-3": "mi", + "week-4": "ju", + "week-5": "vi", + "week-6": "sa", + "week-7": "do", + "month-name": ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"], + "shortcuts": "Accesos directos", + "past": "Pasado", + "following": "Siguiente", + "previous": "Anterior", + "prev-week": "Semana", + "prev-month": "Mes", + "prev-year": "Año", + "next": "Siguiente", + "next-week": "Semana", + "next-month": "Mes", + "next-year": "Año", + "less-than": "El rango no debería ser mayor de %d días", + "more-than": "El rango no debería ser menor de %d días", + "default-more": "Por favor selecciona un rango mayor a %d días", + "default-single": "Por favor selecciona un día", + "default-less": "Por favor selecciona un rango menor a %d días", + "default-range": "Por favor selecciona un rango entre %d y %d días", + "default-default": "Por favor selecciona un rango de fechas." + }, + "fr": { + "selected": "Sélection:", + "day": "Jour", + "days": "Jours", + "apply": "Fermer", + "week-1": "lu", + "week-2": "ma", + "week-3": "me", + "week-4": "je", + "week-5": "ve", + "week-6": "sa", + "week-7": "di", + "month-name": ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"], + "shortcuts": "Raccourcis", + "past": "Passé", + "following": "Suivant", + "previous": "Précédent", + "prev-week": "Semaine", + "prev-month": "Mois", + "prev-year": "Année", + "next": "Suivant", + "next-week": "Semaine", + "next-month": "Mois", + "next-year": "Année", + "less-than": "L'intervalle ne doit pas être supérieure à %d jours", + "more-than": "L'intervalle ne doit pas être inférieure à %d jours", + "default-more": "Merci de choisir une intervalle supérieure à %d jours", + "default-single": "Merci de choisir une date", + "default-less": "Merci de choisir une intervalle inférieure %d jours", + "default-range": "Merci de choisir une intervalle comprise entre %d et %d jours", + "default-default": "Merci de choisir une date" + }, + "hu": { + "selected": "Kiválasztva:", + "day": "Nap", + "days": "Nap", + "apply": "Ok", + "week-1": "h", + "week-2": "k", + "week-3": "sz", + "week-4": "cs", + "week-5": "p", + "week-6": "sz", + "week-7": "v", + "month-name": ["január", "február", "március", "április", "május", "június", "július", "augusztus", "szeptember", "október", "november", "december"], + "shortcuts": "Gyorsválasztó", + "past": "Múlt", + "following": "Következő", + "previous": "Előző", + "prev-week": "Hét", + "prev-month": "Hónap", + "prev-year": "Év", + "next": "Következő", + "next-week": "Hét", + "next-month": "Hónap", + "next-year": "Év", + "less-than": "A kiválasztás nem lehet több %d napnál", + "more-than": "A kiválasztás nem lehet több %d napnál", + "default-more": "Válassz ki egy időszakot ami hosszabb mint %d nap", + "default-single": "Válassz egy napot", + "default-less": "Válassz ki egy időszakot ami rövidebb mint %d nap", + "default-range": "Válassz ki egy %d - %d nap hosszú időszakot", + "default-default": "Válassz ki egy időszakot" + }, + "it": { + "selected": "Selezionati:", + "day": "Giorno", + "days": "Giorni", + "apply": "Chiudi", + "week-1": "lu", + "week-2": "ma", + "week-3": "me", + "week-4": "gi", + "week-5": "ve", + "week-6": "sa", + "week-7": "do", + "month-name": ["gennaio", "febbraio", "marzo", "aprile", "maggio", "giugno", "luglio", "agosto", "settembre", "ottobre", "novembre", "dicembre"], + "shortcuts": "Scorciatoie", + "past": "Scorso", + "following": "Successivo", + "previous": "Precedente", + "prev-week": "Settimana", + "prev-month": "Mese", + "prev-year": "Anno", + "next": "Prossimo", + "next-week": "Settimana", + "next-month": "Mese", + "next-year": "Anno", + "less-than": "L'intervallo non dev'essere maggiore di %d giorni", + "more-than": "L'intervallo non dev'essere minore di %d giorni", + "default-more": "Seleziona un intervallo maggiore di %d giorni", + "default-single": "Seleziona una data", + "default-less": "Seleziona un intervallo minore di %d giorni", + "default-range": "Seleziona un intervallo compreso tra i %d e i %d giorni", + "default-default": "Seleziona un intervallo di date" + }, + "ko": { + "selected": "기간:", + "day": "일", + "days": "일간", + "apply": "닫기", + "week-1": "월", + "week-2": "화", + "week-3": "수", + "week-4": "목", + "week-5": "금", + "week-6": "토", + "week-7": "일", + "week-number": "주", + "month-name": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], + "shortcuts": "단축키들", + "past": "지난(오늘기준)", + "following": "이후(오늘기준)", + "previous": "이전", + "prev-week": "1주", + "prev-month": "1달", + "prev-year": "1년", + "next": "다음", + "next-week": "1주", + "next-month": "1달", + "next-year": "1년", + "less-than": "날짜 범위는 %d 일보다 많을 수 없습니다", + "more-than": "날짜 범위는 %d 일보다 작을 수 없습니다", + "default-more": "날짜 범위를 %d 일보다 길게 선택해 주세요", + "default-single": "날짜를 선택해 주세요", + "default-less": "%d 일보다 작은 날짜를 선택해 주세요", + "default-range": "%d와 %d 일 사이의 날짜 범위를 선택해 주세요", + "default-default": "날짜 범위를 선택해 주세요", + "time": "시각", + "hour": "시", + "minute": "분" + }, + "no": { + "selected": "Valgt:", + "day": "Dag", + "days": "Dager", + "apply": "Lukk", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lø", + "week-7": "sø", + "month-name": ["januar", "februar", "mars", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "desember"], + "shortcuts": "Snarveier", + "custom-values": "Egendefinerte Verdier", + "past": "Over", // Not quite sure about the context of this one + "following": "Følger", + "previous": "Forrige", + "prev-week": "Uke", + "prev-month": "Måned", + "prev-year": "År", + "next": "Neste", + "next-week": "Uke", + "next-month": "Måned", + "next-year": "År", + "less-than": "Datoperioden skal ikkje være lengre enn %d dager", + "more-than": "Datoperioden skal ikkje være kortere enn %d dager", + "default-more": "Vennligst velg ein datoperiode lengre enn %d dager", + "default-single": "Vennligst velg ein dato", + "default-less": "Vennligst velg ein datoperiode mindre enn %d dager", + "default-range": "Vennligst velg ein datoperiode mellom %d og %d dager", + "default-default": "Vennligst velg ein datoperiode", + "time": "Tid", + "hour": "Time", + "minute": "Minutter" + }, + "nl": { + "selected": "Geselecteerd:", + "day": "Dag", + "days": "Dagen", + "apply": "Ok", + "week-1": "ma", + "week-2": "di", + "week-3": "wo", + "week-4": "do", + "week-5": "vr", + "week-6": "za", + "week-7": "zo", + "month-name": ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"], + "shortcuts": "Snelkoppelingen", + "custom-values": "Aangepaste waarden", + "past": "Verleden", + "following": "Komend", + "previous": "Vorige", + "prev-week": "Week", + "prev-month": "Maand", + "prev-year": "Jaar", + "next": "Volgende", + "next-week": "Week", + "next-month": "Maand", + "next-year": "Jaar", + "less-than": "Interval moet langer dan %d dagen zijn", + "more-than": "Interval mag niet minder dan %d dagen zijn", + "default-more": "Selecteer een interval langer dan %dagen", + "default-single": "Selecteer een datum", + "default-less": "Selecteer een interval minder dan %d dagen", + "default-range": "Selecteer een interval tussen %d en %d dagen", + "default-default": "Selecteer een interval", + "time": "Tijd", + "hour": "Uur", + "minute": "Minuut" + }, + "ru": { + "selected": "Выбрано:", + "day": "День", + "days": "Дней", + "apply": "Применить", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "вс", + "month-name": ["январь", "февраль", "март", "апрель", "май", "июнь", "июль", "август", "сентябрь", "октябрь", "ноябрь", "декабрь"], + "shortcuts": "Быстрый выбор", + "custom-values": "Пользовательские значения", + "past": "Прошедшие", + "following": "Следующие", + "previous": "   ", + "prev-week": "Неделя", + "prev-month": "Месяц", + "prev-year": "Год", + "next": "   ", + "next-week": "Неделя", + "next-month": "Месяц", + "next-year": "Год", + "less-than": "Диапазон не может быть больше %d дней", + "more-than": "Диапазон не может быть меньше %d дней", + "default-more": "Пожалуйста выберите диапазон больше %d дней", + "default-single": "Пожалуйста выберите дату", + "default-less": "Пожалуйста выберите диапазон меньше %d дней", + "default-range": "Пожалуйста выберите диапазон между %d и %d днями", + "default-default": "Пожалуйста выберите диапазон", + "time": "Время", + "hour": "Часы", + "minute": "Минуты" + }, + "uk": { + "selected": "Вибрано:", + "day": "День", + "days": "Днів", + "apply": "Застосувати", + "week-1": "пн", + "week-2": "вт", + "week-3": "ср", + "week-4": "чт", + "week-5": "пт", + "week-6": "сб", + "week-7": "нд", + "month-name": ["січень", "лютий", "березень", "квітень", "травень", "червень", "липень", "серпень", "вересень", "жовтень", "листопад", "грудень"], + "shortcuts": "Швидкий вибір", + "custom-values": "Значення користувача", + "past": "Минулі", + "following": "Наступні", + "previous": "   ", + "prev-week": "Тиждень", + "prev-month": "Місяць", + "prev-year": "Рік", + "next": "   ", + "next-week": "Тиждень", + "next-month": "Місяць", + "next-year": "Рік", + "less-than": "Діапазон не може бути більш ніж %d днів", + "more-than": "Діапазон не може бути меньш ніж %d днів", + "default-more": "Будь ласка виберіть діапазон більше %d днів", + "default-single": "Будь ласка виберіть дату", + "default-less": "Будь ласка виберіть діапазон менше %d днів", + "default-range": "Будь ласка виберіть діапазон між %d та %d днями", + "default-default": "Будь ласка виберіть діапазон", + "time": "Час", + "hour": "Години", + "minute": "Хвилини" + }, + "pl": { + "selected": "Wybrany:", + "day": "Dzień", + "days": "Dni", + "apply": "Zamknij", + "week-1": "pon", + "week-2": "wt", + "week-3": "śr", + "week-4": "czw", + "week-5": "pt", + "week-6": "so", + "week-7": "nd", + "month-name": ["styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień"], + "shortcuts": "Skróty", + "custom-values": "Niestandardowe wartości", + "past": "Przeszłe", + "following": "Następne", + "previous": "Poprzednie", + "prev-week": "tydzień", + "prev-month": "miesiąc", + "prev-year": "rok", + "next": "Następny", + "next-week": "tydzień", + "next-month": "miesiąc", + "next-year": "rok", + "less-than": "Okres nie powinien być dłuższy niż %d dni", + "more-than": "Okres nie powinien być krótszy niż %d ni", + "default-more": "Wybierz okres dłuższy niż %d dni", + "default-single": "Wybierz datę", + "default-less": "Wybierz okres krótszy niż %d dni", + "default-range": "Wybierz okres trwający od %d do %d dni", + "default-default": "Wybierz okres", + "time": "Czas", + "hour": "Godzina", + "minute": "Minuta" + }, + "se": { + "selected": "Vald:", + "day": "dag", + "days": "dagar", + "apply": "godkänn", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lö", + "week-7": "sö", + "month-name": ["januari", "februari", "mars", "april", "maj", "juni", "juli", "augusti", "september", "oktober", "november", "december"], + "shortcuts": "genvägar", + "custom-values": "Anpassade värden", + "past": "över", + "following": "följande", + "previous": "förra", + "prev-week": "vecka", + "prev-month": "månad", + "prev-year": "år", + "next": "nästa", + "next-week": "vecka", + "next-month": "måned", + "next-year": "år", + "less-than": "Datumintervall bör inte vara mindre än %d dagar", + "more-than": "Datumintervall bör inte vara mer än %d dagar", + "default-more": "Välj ett datumintervall längre än %d dagar", + "default-single": "Välj ett datum", + "default-less": "Välj ett datumintervall mindre än %d dagar", + "default-range": "Välj ett datumintervall mellan %d och %d dagar", + "default-default": "Välj ett datumintervall", + "time": "tid", + "hour": "timme", + "minute": "minut" + }, + "pt": //Portuguese (European) + { + "selected": "Selecionado:", + "day": "Dia", + "days": "Dias", + "apply": "Fechar", + "week-1": "seg", + "week-2": "ter", + "week-3": "qua", + "week-4": "qui", + "week-5": "sex", + "week-6": "sab", + "week-7": "dom", + "week-number": "N", + "month-name": ["janeiro", "fevereiro", "março", "abril", "maio", "junho", "julho", "agosto", "setembro", "outubro", "novembro", "dezembro"], + "shortcuts": "Atalhos", + "custom-values": "Valores Personalizados", + "past": "Passado", + "following": "Seguinte", + "previous": "Anterior", + "prev-week": "Semana", + "prev-month": "Mês", + "prev-year": "Ano", + "next": "Próximo", + "next-week": "Próxima Semana", + "next-month": "Próximo Mês", + "next-year": "Próximo Ano", + "less-than": "O período selecionado não deve ser maior que %d dias", + "more-than": "O período selecionado não deve ser menor que %d dias", + "default-more": "Selecione um período superior a %d dias", + "default-single": "Selecione uma data", + "default-less": "Selecione um período inferior a %d dias", + "default-range": "Selecione um período de %d a %d dias", + "default-default": "Selecione um período", + "time": "Tempo", + "hour": "Hora", + "minute": "Minuto" + }, + "tc": // traditional chinese + { + "selected": "已選擇:", + "day": "天", + "days": "天", + "apply": "確定", + "week-1": "一", + "week-2": "二", + "week-3": "三", + "week-4": "四", + "week-5": "五", + "week-6": "六", + "week-7": "日", + "week-number": "週", + "month-name": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], + "shortcuts": "快速選擇", + "past": "過去", + "following": "將來", + "previous": "   ", + "prev-week": "上週", + "prev-month": "上個月", + "prev-year": "去年", + "next": "   ", + "next-week": "下週", + "next-month": "下個月", + "next-year": "明年", + "less-than": "所選日期範圍不能大於%d天", + "more-than": "所選日期範圍不能小於%d天", + "default-more": "請選擇大於%d天的日期範圍", + "default-less": "請選擇少於%d天的日期範圍", + "default-range": "請選擇%d天到%d天的日期範圍", + "default-single": "請選擇一個日期", + "default-default": "請選擇一個日期範圍", + "time": "日期", + "hour": "小時", + "minute": "分鐘" + }, + "ja": { + "selected": "選択しました:", + "day": "日", + "days": "日", + "apply": "確定", + "week-1": "月", + "week-2": "火", + "week-3": "水", + "week-4": "木", + "week-5": "金", + "week-6": "土", + "week-7": "日", + "month-name": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], + "shortcuts": "クイック選択", + "past": "過去", + "following": "将来", + "previous": "   ", + "prev-week": "先週", + "prev-month": "先月", + "prev-year": "昨年", + "next": "   ", + "next-week": "来週", + "next-month": "来月", + "next-year": "来年", + "less-than": "日付の範囲は％d日以上にすべきではありません", + "more-than": "日付の範囲は％d日を下回ってはいけません", + "default-more": "％d日よりも長い期間を選択してください", + "default-less": "％d日未満の期間を選択してください", + "default-range": "％d日と％d日の間の日付範囲を選択してください", + "default-single": "日付を選択してください", + "default-default": "日付範囲を選択してください", + "time": "時間", + "hour": "時間", + "minute": "分" + }, + "da": { + "selected": "Valgt:", + "day": "Dag", + "days": "Dage", + "apply": "Luk", + "week-1": "ma", + "week-2": "ti", + "week-3": "on", + "week-4": "to", + "week-5": "fr", + "week-6": "lø", + "week-7": "sø", + "month-name": ["januar", "februar", "marts", "april", "maj", "juni", "juli", "august", "september", "oktober", "november", "december"], + "shortcuts": "genveje", + "custom-values": "Brugerdefinerede værdier", + "past": "Forbi", + "following": "Følgende", + "previous": "Forrige", + "prev-week": "uge", + "prev-month": "måned", + "prev-year": "år", + "next": "Næste", + "next-week": "uge", + "next-month": "måned", + "next-year": "år", + "less-than": "Dato interval bør ikke være med end %d dage", + "more-than": "Dato interval bør ikke være mindre end %d dage", + "default-more": "Vælg datointerval længere end %d dage", + "default-single": "Vælg dato", + "default-less": "Vælg datointerval mindre end %d dage", + "default-range": "Vælg datointerval mellem %d og %d dage", + "default-default": "Vælg datointerval", + "time": "tid", + "hour": "time", + "minute": "minut" + }, + "fi": // Finnish + { + "selected": "Valittu:", + "day": "Päivä", + "days": "Päivää", + "apply": "Sulje", + "week-1": "ma", + "week-2": "ti", + "week-3": "ke", + "week-4": "to", + "week-5": "pe", + "week-6": "la", + "week-7": "su", + "week-number": "V", + "month-name": ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"], + "shortcuts": "Pikavalinnat", + "custom-values": "Mukautetut Arvot", + "past": "Menneet", + "following": "Tulevat", + "previous": "Edellinen", + "prev-week": "Viikko", + "prev-month": "Kuukausi", + "prev-year": "Vuosi", + "next": "Seuraava", + "next-week": "Viikko", + "next-month": "Kuukausi", + "next-year": "Vuosi", + "less-than": "Aikajakson tulisi olla vähemmän kuin %d päivää", + "more-than": "Aikajakson ei tulisi olla vähempää kuin %d päivää", + "default-more": "Valitse pidempi aikajakso kuin %d päivää", + "default-single": "Valitse päivä", + "default-less": "Valitse lyhyempi aikajakso kuin %d päivää", + "default-range": "Valitse aikajakso %d ja %d päivän väliltä", + "default-default": "Valitse aikajakso", + "time": "Aika", + "hour": "Tunti", + "minute": "Minuutti" + }, + "cat": // Catala + { + "selected": "Seleccionats:", + "day": "Dia", + "days": "Dies", + "apply": "Tanca", + "week-1": "Dl", + "week-2": "Dm", + "week-3": "Dc", + "week-4": "Dj", + "week-5": "Dv", + "week-6": "Ds", + "week-7": "Dg", + "week-number": "S", + "month-name": ["gener", "febrer", "març", "abril", "maig", "juny", "juliol", "agost", "setembre", "octubre", "novembre", "desembre"], + "shortcuts": "Dreçeres", + "custom-values": "Valors personalitzats", + "past": "Passat", + "following": "Futur", + "previous": "Anterior", + "prev-week": "Setmana", + "prev-month": "Mes", + "prev-year": "Any", + "next": "Següent", + "next-week": "Setmana", + "next-month": "Mes", + "next-year": "Any", + "less-than": "El període no hauria de ser de més de %d dies", + "more-than": "El període no hauria de ser de menys de %d dies", + "default-more": "Perfavor selecciona un període més gran de %d dies", + "default-single": "Perfavor selecciona una data", + "default-less": "Perfavor selecciona un període de menys de %d dies", + "default-range": "Perfavor selecciona un període d'entre %d i %d dies", + "default-default": "Perfavor selecciona un període", + "time": "Temps", + "hour": "Hora", + "minute": "Minut" + }, + "sk": { + "selected": "Vybrané:", + "day": "Deň", + "days": "Dni", + "apply": "Zavrieť", + "week-1": "po", + "week-2": "út", + "week-3": "st", + "week-4": "št", + "week-5": "pi", + "week-6": "so", + "week-7": "ne", + "week-number": "T", + "month-name": ["január", "február", "marec", "apríl", "máj", "jún", "júl", "august", "september", "október", "november", "december"], + "shortcuts": "Skratky", + "custom-values": "Vlastné hodnoty", + "past": "po", + "following": "nasledujúci", + "previous": "predchádzajúci", + "prev-week": "týždeň", + "prev-month": "mesiac", + "prev-year": "rok", + "next": "ďalší", + "next-week": "týždeň", + "next-month": "mesiac", + "next-year": "rok", + "less-than": "Rozsah dátumu by nemal byť väčší ako %d dní", + "more-than": "Rozsah dátumu by nemal byť menší ako %d dní", + "default-more": "Prosím zvoľte rozsah dlhší ako %d dní", + "default-single": "Prosím zvoľte dátum", + "default-less": "Prosím zvoľte rozsah menší ako %d dní", + "default-range": "Prosím zvoľte rozsah medzi %d a %d dňami", + "default-default": "Prosím zvoľte rozsah", + "time": "Čas", + "hour": "Hodina", + "minute": "Minúta" + } + }; + + $.fn.dateRangePicker = function(opt) { + if (!opt) opt = {}; + opt = $.extend(true, { + autoClose: false, + format: 'YYYY-MM-DD', + separator: ' to ', + language: 'auto', + startOfWeek: 'sunday', // or monday + getValue: function() { + return $(this).val(); + }, + setValue: function(s) { + if (!$(this).attr('readonly') && !$(this).is(':disabled') && s != $(this).val()) { + $(this).val(s); + } + }, + startDate: false, + endDate: false, + time: { + enabled: false + }, + minDays: 0, + maxDays: 0, + showShortcuts: false, + shortcuts: { + //'prev-days': [1,3,5,7], + // 'next-days': [3,5,7], + //'prev' : ['week','month','year'], + // 'next' : ['week','month','year'] + }, + customShortcuts: [], + inline: false, + container: 'body', + alwaysOpen: false, + singleDate: false, + lookBehind: false, + batchMode: false, + duration: 200, + stickyMonths: false, + dayDivAttrs: [], + dayTdAttrs: [], + selectForward: false, + selectBackward: false, + applyBtnClass: '', + singleMonth: 'auto', + hoveringTooltip: function(days, startTime, hoveringTime) { + return days > 1 ? days + ' ' + translate('days') : ''; + }, + showTopbar: true, + swapTime: false, + showWeekNumbers: false, + getWeekNumber: function(date) //date will be the first day of a week + { + return moment(date).format('w'); + }, + customOpenAnimation: null, + customCloseAnimation: null, + customArrowPrevSymbol: null, + customArrowNextSymbol: null, + monthSelect: false, + yearSelect: false + }, opt); + + opt.start = false; + opt.end = false; + + opt.startWeek = false; + + //detect a touch device + opt.isTouchDevice = 'ontouchstart' in window || navigator.msMaxTouchPoints; + + //if it is a touch device, hide hovering tooltip + if (opt.isTouchDevice) opt.hoveringTooltip = false; + + //show one month on mobile devices + if (opt.singleMonth == 'auto') opt.singleMonth = $(window).width() < 480; + if (opt.singleMonth) opt.stickyMonths = false; + + if (!opt.showTopbar) opt.autoClose = true; + + if (opt.startDate && typeof opt.startDate == 'string') opt.startDate = moment(opt.startDate, opt.format).toDate(); + if (opt.endDate && typeof opt.endDate == 'string') opt.endDate = moment(opt.endDate, opt.format).toDate(); + + if (opt.yearSelect && typeof opt.yearSelect === 'boolean') { + opt.yearSelect = function(current) { return [current - 5, current + 5]; } + } + + var languages = getLanguages(); + var box; + var initiated = false; + var self = this; + var selfDom = $(self).get(0); + var domChangeTimer; + + $(this).off('.datepicker').on('click.datepicker', function(evt) { + var isOpen = box.is(':visible'); + if (!isOpen) open(opt.duration); + }).on('change.datepicker', function(evt) { + checkAndSetDefaultValue(); + }).on('keyup.datepicker', function() { + try { + clearTimeout(domChangeTimer); + } catch (e) {} + domChangeTimer = setTimeout(function() { + checkAndSetDefaultValue(); + }, 2000); + }); + + init_datepicker.call(this); + + if (opt.alwaysOpen) { + open(0); + } + + // expose some api + $(this).data('dateRangePicker', { + setStart: function(d1) { + if (typeof d1 == 'string') { + d1 = moment(d1, opt.format).toDate(); + } + + opt.end = false; + setSingleDate(d1); + + return this; + }, + setEnd: function(d2, silent) { + var start = new Date(); + start.setTime(opt.start); + if (typeof d2 == 'string') { + d2 = moment(d2, opt.format).toDate(); + } + setDateRange(start, d2, silent); + return this; + }, + setDateRange: function(d1, d2, silent) { + if (typeof d1 == 'string' && typeof d2 == 'string') { + d1 = moment(d1, opt.format).toDate(); + d2 = moment(d2, opt.format).toDate(); + } + setDateRange(d1, d2, silent); + }, + clear: clearSelection, + close: closeDatePicker, + open: open, + redraw: redrawDatePicker, + getDatePicker: getDatePicker, + resetMonthsView: resetMonthsView, + destroy: function() { + $(self).off('.datepicker'); + $(self).data('dateRangePicker', ''); + $(self).data('date-picker-opened', null); + box.remove(); + $(window).off('resize.datepicker', calcPosition); + $(document).off('click.datepicker', outsideClickClose); + } + }); + + $(window).on('resize.datepicker', calcPosition); + + return this; + + function IsOwnDatePickerClicked(evt, selfObj) { + return (selfObj.contains(evt.target) || evt.target == selfObj || (selfObj.childNodes != undefined && $.inArray(evt.target, selfObj.childNodes) >= 0)); + } + + function init_datepicker() { + var self = this; + + if ($(this).data('date-picker-opened')) { + closeDatePicker(); + return; + } + $(this).data('date-picker-opened', true); + + + box = createDom().hide(); + box.append('
'); + + $(opt.container).append(box); + + if (!opt.inline) { + calcPosition(); + } else { + box.addClass('inline-wrapper'); + } + + if (opt.alwaysOpen) { + box.find('.apply-btn').hide(); + } + + var defaultTime = getDefaultTime(); + resetMonthsView(defaultTime); + + if (opt.time.enabled) { + if ((opt.startDate && opt.endDate) || (opt.start && opt.end)) { + showTime(moment(opt.start || opt.startDate).toDate(), 'time1'); + showTime(moment(opt.end || opt.endDate).toDate(), 'time2'); + } else { + var defaultEndTime = opt.defaultEndTime ? opt.defaultEndTime : defaultTime; + showTime(defaultTime, 'time1'); + showTime(defaultEndTime, 'time2'); + } + } + + //showSelectedInfo(); + + + var defaultTopText = ''; + if (opt.singleDate) + defaultTopText = translate('default-single'); + else if (opt.minDays && opt.maxDays) + defaultTopText = translate('default-range'); + else if (opt.minDays) + defaultTopText = translate('default-more'); + else if (opt.maxDays) + defaultTopText = translate('default-less'); + else + defaultTopText = translate('default-default'); + + box.find('.default-top').html(defaultTopText.replace(/\%d/, opt.minDays).replace(/\%d/, opt.maxDays)); + if (opt.singleMonth) { + box.addClass('single-month'); + } else { + box.addClass('two-months'); + } + + + setTimeout(function() { + updateCalendarWidth(); + initiated = true; + }, 0); + + box.on('click', function(evt) { + evt.stopPropagation(); + }); + + //if user click other place of the webpage, close date range picker window + $(document).on('click.datepicker', outsideClickClose); + + box.find('.next').on('click', function() { + if (!opt.stickyMonths) + gotoNextMonth(this); + else + gotoNextMonth_stickily(this); + }); + + function gotoNextMonth(self) { + var isMonth2 = $(self).parents('table').hasClass('month2'); + var month = isMonth2 ? opt.month2 : opt.month1; + month = nextMonth(month); + if (!opt.singleMonth && !opt.singleDate && !isMonth2 && compare_month(month, opt.month2) >= 0 || isMonthOutOfBounds(month)) return; + showMonth(month, isMonth2 ? 'month2' : 'month1'); + showGap(); + } + + function gotoNextMonth_stickily(self) { + var nextMonth1 = nextMonth(opt.month1); + var nextMonth2 = nextMonth(opt.month2); + if (isMonthOutOfBounds(nextMonth2)) return; + if (!opt.singleDate && compare_month(nextMonth1, nextMonth2) >= 0) return; + showMonth(nextMonth1, 'month1'); + showMonth(nextMonth2, 'month2'); + showSelectedDays(); + } + + + box.find('.prev').on('click', function() { + if (!opt.stickyMonths) + gotoPrevMonth(this); + else + gotoPrevMonth_stickily(this); + }); + + function gotoPrevMonth(self) { + var isMonth2 = $(self).parents('table').hasClass('month2'); + var month = isMonth2 ? opt.month2 : opt.month1; + month = prevMonth(month); + if (isMonth2 && compare_month(month, opt.month1) <= 0 || isMonthOutOfBounds(month)) return; + showMonth(month, isMonth2 ? 'month2' : 'month1'); + showGap(); + } + + function gotoPrevMonth_stickily(self) { + var prevMonth1 = prevMonth(opt.month1); + var prevMonth2 = prevMonth(opt.month2); + if (isMonthOutOfBounds(prevMonth1)) return; + if (!opt.singleDate && compare_month(prevMonth2, prevMonth1) <= 0) return; + showMonth(prevMonth2, 'month2'); + showMonth(prevMonth1, 'month1'); + showSelectedDays(); + } + + box.attr('unselectable', 'on') + .css('user-select', 'none') + .on('selectstart', function(e) { + e.preventDefault(); + return false; + }); + + box.find('.apply-btn').on('click', function() { + closeDatePicker(); + var dateRange = getDateString(new Date(opt.start)) + opt.separator + getDateString(new Date(opt.end)); + $(self).trigger('datepicker-apply', { + 'value': dateRange, + 'date1': new Date(opt.start), + 'date2': new Date(opt.end) + }); + }); + + box.find('[custom]').on('click', function() { + var valueName = $(this).attr('custom'); + opt.start = false; + opt.end = false; + box.find('.day.checked').removeClass('checked'); + opt.setValue.call(selfDom, valueName); + checkSelectionValid(); + showSelectedInfo(true); + showSelectedDays(); + if (opt.autoClose) closeDatePicker(); + }); + + box.find('[shortcut]').on('click', function() { + var shortcut = $(this).attr('shortcut'); + var end = new Date(), + start = false; + var dir; + if (shortcut.indexOf('day') != -1) { + var day = parseInt(shortcut.split(',', 2)[1], 10); + start = new Date(new Date().getTime() + 86400000 * day); + end = new Date(end.getTime() + 86400000 * (day > 0 ? 1 : -1)); + } else if (shortcut.indexOf('week') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + var stopDay; + if (dir == 1) + stopDay = opt.startOfWeek == 'monday' ? 1 : 0; + else + stopDay = opt.startOfWeek == 'monday' ? 0 : 6; + + end = new Date(end.getTime() - 86400000); + while (end.getDay() != stopDay) end = new Date(end.getTime() + dir * 86400000); + start = new Date(end.getTime() + dir * 86400000 * 6); + } else if (shortcut.indexOf('month') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + if (dir == 1) + start = nextMonth(end); + else + start = prevMonth(end); + start.setDate(1); + end = nextMonth(start); + end.setDate(1); + end = new Date(end.getTime() - 86400000); + } else if (shortcut.indexOf('year') != -1) { + dir = shortcut.indexOf('prev,') != -1 ? -1 : 1; + start = new Date(); + start.setFullYear(end.getFullYear() + dir); + start.setMonth(0); + start.setDate(1); + end.setFullYear(end.getFullYear() + dir); + end.setMonth(11); + end.setDate(31); + } else if (shortcut == 'custom') { + var name = $(this).html(); + if (opt.customShortcuts && opt.customShortcuts.length > 0) { + for (var i = 0; i < opt.customShortcuts.length; i++) { + var sh = opt.customShortcuts[i]; + if (sh.name == name) { + var data = []; + // try + // { + data = sh['dates'].call(); + //}catch(e){} + if (data && data.length == 2) { + start = data[0]; + end = data[1]; + } + + // if only one date is specified then just move calendars there + // move calendars to show this date's month and next months + if (data && data.length == 1) { + var movetodate = data[0]; + showMonth(movetodate, 'month1'); + showMonth(nextMonth(movetodate), 'month2'); + showGap(); + } + + break; + } + } + } + } + if (start && end) { + setDateRange(start, end); + checkSelectionValid(); + } + }); + + box.find('.time1 input[type=range]').on('change touchmove', function(e) { + var target = e.target, + hour = target.name == 'hour' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined, + min = target.name == 'minute' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined; + setTime('time1', hour, min); + }); + + box.find('.time2 input[type=range]').on('change touchmove', function(e) { + var target = e.target, + hour = target.name == 'hour' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined, + min = target.name == 'minute' ? $(target).val().replace(/^(\d{1})$/, '0$1') : undefined; + setTime('time2', hour, min); + }); + + } + + + function calcPosition() { + if (!opt.inline) { + var offset = $(self).offset(); + if ($(opt.container).css('position') == 'relative') { + var containerOffset = $(opt.container).offset(); + var leftIndent = Math.max(0, offset.left + box.outerWidth() - $('body').width() + 16); + box.css({ + top: offset.top - containerOffset.top + $(self).outerHeight() + 4, + left: offset.left - containerOffset.left - leftIndent + }); + } else { + if (offset.left < 460) //left to right + { + box.css({ + top: offset.top + $(self).outerHeight() + parseInt($('body').css('border-top') || 0, 10), + left: offset.left + }); + } else { + box.css({ + top: offset.top + $(self).outerHeight() + parseInt($('body').css('border-top') || 0, 10), + left: offset.left + $(self).width() - box.width() - 16 + }); + } + } + } + } + + // Return the date picker wrapper element + function getDatePicker() { + return box; + } + + function open(animationTime) { + redrawDatePicker(); + checkAndSetDefaultValue(); + if (opt.customOpenAnimation) { + opt.customOpenAnimation.call(box.get(0), function() { + $(self).trigger('datepicker-opened', { + relatedTarget: box + }); + }); + } else { + box.slideDown(animationTime, function() { + $(self).trigger('datepicker-opened', { + relatedTarget: box + }); + }); + } + $(self).trigger('datepicker-open', { + relatedTarget: box + }); + showGap(); + updateCalendarWidth(); + calcPosition(); + } + + function checkAndSetDefaultValue() { + var __default_string = opt.getValue.call(selfDom); + var defaults = __default_string ? __default_string.split(opt.separator) : ''; + + if (defaults && ((defaults.length == 1 && opt.singleDate) || defaults.length >= 2)) { + var ___format = opt.format; + if (___format.match(/Do/)) { + + ___format = ___format.replace(/Do/, 'D'); + defaults[0] = defaults[0].replace(/(\d+)(th|nd|st)/, '$1'); + if (defaults.length >= 2) { + defaults[1] = defaults[1].replace(/(\d+)(th|nd|st)/, '$1'); + } + } + // set initiated to avoid triggerring datepicker-change event + initiated = false; + if (defaults.length >= 2) { + setDateRange(getValidValue(defaults[0], ___format, moment.locale(opt.language)), getValidValue(defaults[1], ___format, moment.locale(opt.language))); + } else if (defaults.length == 1 && opt.singleDate) { + setSingleDate(getValidValue(defaults[0], ___format, moment.locale(opt.language))); + } + + initiated = true; + } + } + + function getValidValue(date, format, locale) { + if (moment(date, format, locale).isValid()) { + return moment(date, format, locale).toDate(); + } else { + return moment().toDate(); + } + } + + function updateCalendarWidth() { + var gapMargin = box.find('.gap').css('margin-left'); + if (gapMargin) gapMargin = parseInt(gapMargin); + var w1 = box.find('.month1').width(); + var w2 = box.find('.gap').width() + (gapMargin ? gapMargin * 2 : 0); + var w3 = box.find('.month2').width(); + box.find('.month-wrapper').width(w1 + w2 + w3); + } + + function renderTime(name, date) { + box.find('.' + name + ' input[type=range].hour-range').val(moment(date).hours()); + box.find('.' + name + ' input[type=range].minute-range').val(moment(date).minutes()); + setTime(name, moment(date).format('HH'), moment(date).format('mm')); + } + + function changeTime(name, date) { + opt[name] = parseInt( + moment(parseInt(date)) + .hour(moment(opt[name + 'Time']).format('HH'), 'h') + .minute(moment(opt[name + 'Time']).format('mm'), 'm').valueOf() + ); + } + + function swapTime() { + renderTime('time1', opt.start); + renderTime('time2', opt.end); + } + + function setTime(name, hour, minute) { + hour && (box.find('.' + name + ' .hour-val').text(hour)); + minute && (box.find('.' + name + ' .minute-val').text(minute)); + switch (name) { + case 'time1': + if (opt.start) { + setRange('start', moment(opt.start)); + } + setRange('startTime', moment(opt.startTime || moment().valueOf())); + break; + case 'time2': + if (opt.end) { + setRange('end', moment(opt.end)); + } + setRange('endTime', moment(opt.endTime || moment().valueOf())); + break; + } + + function setRange(name, timePoint) { + var h = timePoint.format('HH'), + m = timePoint.format('mm'); + opt[name] = timePoint + .hour(hour || h, 'h') + .minute(minute || m, 'm') + .valueOf(); + } + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + } + + function clearSelection() { + opt.start = false; + opt.end = false; + box.find('.day.checked').removeClass('checked'); + box.find('.day.last-date-selected').removeClass('last-date-selected'); + box.find('.day.first-date-selected').removeClass('first-date-selected'); + opt.setValue.call(selfDom, ''); + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + } + + function handleStart(time) { + var r = time; + if (opt.batchMode === 'week-range') { + if (opt.startOfWeek === 'monday') { + r = moment(parseInt(time)).startOf('isoweek').valueOf(); + } else { + r = moment(parseInt(time)).startOf('week').valueOf(); + } + } else if (opt.batchMode === 'month-range') { + r = moment(parseInt(time)).startOf('month').valueOf(); + } + return r; + } + + function handleEnd(time) { + var r = time; + if (opt.batchMode === 'week-range') { + if (opt.startOfWeek === 'monday') { + r = moment(parseInt(time)).endOf('isoweek').valueOf(); + } else { + r = moment(parseInt(time)).endOf('week').valueOf(); + } + } else if (opt.batchMode === 'month-range') { + r = moment(parseInt(time)).endOf('month').valueOf(); + } + return r; + } + + + function dayClicked(day) { + if (day.hasClass('invalid')) return; + var time = day.attr('time'); + day.addClass('checked'); + if (opt.singleDate) { + opt.start = time; + opt.end = false; + } else if (opt.batchMode === 'week') { + if (opt.startOfWeek === 'monday') { + opt.start = moment(parseInt(time)).startOf('isoweek').valueOf(); + opt.end = moment(parseInt(time)).endOf('isoweek').valueOf(); + } else { + opt.end = moment(parseInt(time)).endOf('week').valueOf(); + opt.start = moment(parseInt(time)).startOf('week').valueOf(); + } + } else if (opt.batchMode === 'workweek') { + opt.start = moment(parseInt(time)).day(1).valueOf(); + opt.end = moment(parseInt(time)).day(5).valueOf(); + } else if (opt.batchMode === 'weekend') { + opt.start = moment(parseInt(time)).day(6).valueOf(); + opt.end = moment(parseInt(time)).day(7).valueOf(); + } else if (opt.batchMode === 'month') { + opt.start = moment(parseInt(time)).startOf('month').valueOf(); + opt.end = moment(parseInt(time)).endOf('month').valueOf(); + } else if ((opt.start && opt.end) || (!opt.start && !opt.end)) { + opt.start = handleStart(time); + opt.end = false; + } else if (opt.start) { + opt.end = handleEnd(time); + if (opt.time.enabled) { + changeTime('end', opt.end); + } + } + + //Update time in case it is enabled and timestamps are available + if (opt.time.enabled) { + if (opt.start) { + changeTime('start', opt.start); + } + if (opt.end) { + changeTime('end', opt.end); + } + } + + //In case the start is after the end, swap the timestamps + if (!opt.singleDate && opt.start && opt.end && opt.start > opt.end) { + var tmp = opt.end; + opt.end = handleEnd(opt.start); + opt.start = handleStart(tmp); + if (opt.time.enabled && opt.swapTime) { + swapTime(); + } + } + + opt.start = parseInt(opt.start); + opt.end = parseInt(opt.end); + + clearHovering(); + if (opt.start && !opt.end) { + $(self).trigger('datepicker-first-date-selected', { + 'date1': new Date(opt.start) + }); + dayHovering(day); + } + updateSelectableRange(time); + + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + autoclose(); + } + + + function weekNumberClicked(weekNumberDom) { + var thisTime = parseInt(weekNumberDom.attr('data-start-time'), 10); + var date1, date2; + if (!opt.startWeek) { + opt.startWeek = thisTime; + weekNumberDom.addClass('week-number-selected'); + date1 = new Date(thisTime); + opt.start = moment(date1).day(opt.startOfWeek == 'monday' ? 1 : 0).valueOf(); + opt.end = moment(date1).day(opt.startOfWeek == 'monday' ? 7 : 6).valueOf(); + } else { + box.find('.week-number-selected').removeClass('week-number-selected'); + date1 = new Date(thisTime < opt.startWeek ? thisTime : opt.startWeek); + date2 = new Date(thisTime < opt.startWeek ? opt.startWeek : thisTime); + opt.startWeek = false; + opt.start = moment(date1).day(opt.startOfWeek == 'monday' ? 1 : 0).valueOf(); + opt.end = moment(date2).day(opt.startOfWeek == 'monday' ? 7 : 6).valueOf(); + } + updateSelectableRange(); + checkSelectionValid(); + showSelectedInfo(); + showSelectedDays(); + autoclose(); + } + + function isValidTime(time) { + time = parseInt(time, 10); + if (opt.startDate && compare_day(time, opt.startDate) < 0) return false; + if (opt.endDate && compare_day(time, opt.endDate) > 0) return false; + + if (opt.start && !opt.end && !opt.singleDate) { + //check maxDays and minDays setting + if (opt.maxDays > 0 && countDays(time, opt.start) > opt.maxDays) return false; + if (opt.minDays > 0 && countDays(time, opt.start) < opt.minDays) return false; + + //check selectForward and selectBackward + if (opt.selectForward && time < opt.start) return false; + if (opt.selectBackward && time > opt.start) return false; + + //check disabled days + if (opt.beforeShowDay && typeof opt.beforeShowDay == 'function') { + var valid = true; + var timeTmp = time; + while (countDays(timeTmp, opt.start) > 1) { + var arr = opt.beforeShowDay(new Date(timeTmp)); + if (!arr[0]) { + valid = false; + break; + } + if (Math.abs(timeTmp - opt.start) < 86400000) break; + if (timeTmp > opt.start) timeTmp -= 86400000; + if (timeTmp < opt.start) timeTmp += 86400000; + } + if (!valid) return false; + } + } + return true; + } + + + function updateSelectableRange() { + box.find('.day.invalid.tmp').removeClass('tmp invalid').addClass('valid'); + if (opt.start && !opt.end) { + box.find('.day.toMonth.valid').each(function() { + var time = parseInt($(this).attr('time'), 10); + if (!isValidTime(time)) + $(this).addClass('invalid tmp').removeClass('valid'); + else + $(this).addClass('valid tmp').removeClass('invalid'); + }); + } + + return true; + } + + + function dayHovering(day) { + var hoverTime = parseInt(day.attr('time')); + var tooltip = ''; + + if (day.hasClass('has-tooltip') && day.attr('data-tooltip')) { + tooltip = '' + day.attr('data-tooltip') + ''; + } else if (!day.hasClass('invalid')) { + if (opt.singleDate) { + box.find('.day.hovering').removeClass('hovering'); + day.addClass('hovering'); + } else { + box.find('.day').each(function() { + var time = parseInt($(this).attr('time')), + start = opt.start, + end = opt.end; + + if (time == hoverTime) { + $(this).addClass('hovering'); + } else { + $(this).removeClass('hovering'); + } + + if ( + (opt.start && !opt.end) && + ( + (opt.start < time && hoverTime >= time) || + (opt.start > time && hoverTime <= time) + ) + ) { + $(this).addClass('hovering'); + } else { + $(this).removeClass('hovering'); + } + }); + + if (opt.start && !opt.end) { + var days = countDays(hoverTime, opt.start); + if (opt.hoveringTooltip) { + if (typeof opt.hoveringTooltip == 'function') { + tooltip = opt.hoveringTooltip(days, opt.start, hoverTime); + } else if (opt.hoveringTooltip === true && days > 1) { + tooltip = days + ' ' + translate('days'); + } + } + } + } + } + + if (tooltip) { + var posDay = day.offset(); + var posBox = box.offset(); + + var _left = posDay.left - posBox.left; + var _top = posDay.top - posBox.top; + _left += day.width() / 2; + + + var $tip = box.find('.date-range-length-tip'); + var w = $tip.css({ + 'visibility': 'hidden', + 'display': 'none' + }).html(tooltip).width(); + var h = $tip.height(); + _left -= w / 2; + _top -= h; + setTimeout(function() { + $tip.css({ + left: _left, + top: _top, + display: 'block', + 'visibility': 'visible' + }); + }, 10); + } else { + box.find('.date-range-length-tip').hide(); + } + } + + function clearHovering() { + box.find('.day.hovering').removeClass('hovering'); + box.find('.date-range-length-tip').hide(); + } + + function dateChanged(date) { + var value = date.val(); + var name = date.attr('name'); + var type = date.parents('table').hasClass('month1') ? 'month1' : 'month2'; + var oppositeType = type === 'month1' ? 'month2' : 'month1'; + var startDate = opt.startDate ? moment(opt.startDate) : false; + var endDate = opt.endDate ? moment(opt.endDate) : false; + var newDate = moment(opt[type])[name](value); + + + if (startDate && newDate.isSameOrBefore(startDate)) { + newDate = startDate.add(type === 'month2' ? 1 : 0, 'month'); + } + + if (endDate && newDate.isSameOrAfter(endDate)) { + newDate = endDate.add(!opt.singleMonth && type === 'month1' ? -1 : 0, 'month'); + } + + showMonth(newDate, type); + + if (type === 'month1') { + if (opt.stickyMonths || moment(newDate).isSameOrAfter(opt[oppositeType], 'month')) { + showMonth(moment(newDate).add(1, 'month'), oppositeType); + } + } else { + if (opt.stickyMonths || moment(newDate).isSameOrBefore(opt[oppositeType], 'month')) { + showMonth(moment(newDate).add(-1, 'month'), oppositeType); + } + } + + showGap(); + } + + function autoclose() { + if (opt.singleDate === true) { + if (initiated && opt.start) { + if (opt.autoClose) closeDatePicker(); + } + } else { + if (initiated && opt.start && opt.end) { + if (opt.autoClose) closeDatePicker(); + } + } + } + + function checkSelectionValid() { + var days = Math.ceil((opt.end - opt.start) / 86400000) + 1; + if (opt.singleDate) { // Validate if only start is there + if (opt.start && !opt.end) + box.find('.drp_top-bar').removeClass('error').addClass('normal'); + else + box.find('.drp_top-bar').removeClass('error').removeClass('normal'); + } else if (opt.maxDays && days > opt.maxDays) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + box.find('.drp_top-bar').removeClass('normal').addClass('error').find('.error-top').html(translate('less-than').replace('%d', opt.maxDays)); + } else if (opt.minDays && days < opt.minDays) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + box.find('.drp_top-bar').removeClass('normal').addClass('error').find('.error-top').html(translate('more-than').replace('%d', opt.minDays)); + } else { + if (opt.start || opt.end) + box.find('.drp_top-bar').removeClass('error').addClass('normal'); + else + box.find('.drp_top-bar').removeClass('error').removeClass('normal'); + } + + if ((opt.singleDate && opt.start && !opt.end) || (!opt.singleDate && opt.start && opt.end)) { + box.find('.apply-btn').removeClass('disabled'); + } else { + box.find('.apply-btn').addClass('disabled'); + } + + if (opt.batchMode) { + if ( + (opt.start && opt.startDate && compare_day(opt.start, opt.startDate) < 0) || + (opt.end && opt.endDate && compare_day(opt.end, opt.endDate) > 0) + ) { + opt.start = false; + opt.end = false; + box.find('.day').removeClass('checked'); + } + } + } + + function showSelectedInfo(forceValid, silent) { + box.find('.start-day').html('...'); + box.find('.end-day').html('...'); + box.find('.selected-days').hide(); + if (opt.start) { + box.find('.start-day').html(getDateString(new Date(parseInt(opt.start)))); + } + if (opt.end) { + box.find('.end-day').html(getDateString(new Date(parseInt(opt.end)))); + } + var dateRange; + if (opt.start && opt.singleDate) { + box.find('.apply-btn').removeClass('disabled'); + dateRange = getDateString(new Date(opt.start)); + opt.setValue.call(selfDom, dateRange, getDateString(new Date(opt.start)), getDateString(new Date(opt.end))); + + if (initiated && !silent) { + $(self).trigger('datepicker-change', { + 'value': dateRange, + 'date1': new Date(opt.start) + }); + } + } else if (opt.start && opt.end) { + box.find('.selected-days').show().find('.selected-days-num').html(countDays(opt.end, opt.start)); + box.find('.apply-btn').removeClass('disabled'); + dateRange = getDateString(new Date(opt.start)) + opt.separator + getDateString(new Date(opt.end)); + opt.setValue.call(selfDom, dateRange, getDateString(new Date(opt.start)), getDateString(new Date(opt.end))); + if (initiated && !silent) { + $(self).trigger('datepicker-change', { + 'value': dateRange, + 'date1': new Date(opt.start), + 'date2': new Date(opt.end) + }); + } + } else if (forceValid) { + box.find('.apply-btn').removeClass('disabled'); + } else { + box.find('.apply-btn').addClass('disabled'); + } + } + + function countDays(start, end) { + return Math.abs(moment(start).diff(moment(end), 'd')) + 1; + } + + function setDateRange(date1, date2, silent) { + if (date1.getTime() > date2.getTime()) { + var tmp = date2; + date2 = date1; + date1 = tmp; + tmp = null; + } + var valid = true; + if (opt.startDate && compare_day(date1, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(date2, opt.endDate) > 0) valid = false; + if (!valid) { + showMonth(opt.startDate, 'month1'); + showMonth(nextMonth(opt.startDate), 'month2'); + showGap(); + return; + } + + opt.start = date1.getTime(); + opt.end = date2.getTime(); + + if (opt.time.enabled) { + renderTime('time1', date1); + renderTime('time2', date2); + } + + if (opt.stickyMonths || (compare_day(date1, date2) > 0 && compare_month(date1, date2) === 0)) { + if (opt.lookBehind) { + date1 = prevMonth(date2); + } else { + date2 = nextMonth(date1); + } + } + + if (opt.stickyMonths && opt.endDate !== false && compare_month(date2, opt.endDate) > 0) { + date1 = prevMonth(date1); + date2 = prevMonth(date2); + } + + if (!opt.stickyMonths) { + if (compare_month(date1, date2) === 0) { + if (opt.lookBehind) { + date1 = prevMonth(date2); + } else { + date2 = nextMonth(date1); + } + } + } + + showMonth(date1, 'month1'); + showMonth(date2, 'month2'); + showGap(); + checkSelectionValid(); + showSelectedInfo(false, silent); + autoclose(); + } + + function setSingleDate(date1) { + + var valid = true; + if (opt.startDate && compare_day(date1, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(date1, opt.endDate) > 0) valid = false; + if (!valid) { + showMonth(opt.startDate, 'month1'); + return; + } + + opt.start = date1.getTime(); + + + if (opt.time.enabled) { + renderTime('time1', date1); + + } + showMonth(date1, 'month1'); + if (opt.singleMonth !== true) { + var date2 = nextMonth(date1); + showMonth(date2, 'month2'); + } + showGap(); + showSelectedInfo(); + autoclose(); + } + + function showSelectedDays() { + if (!opt.start && !opt.end) return; + box.find('.day').each(function() { + var time = parseInt($(this).attr('time')), + start = opt.start, + end = opt.end; + if (opt.time.enabled) { + time = moment(time).startOf('day').valueOf(); + start = moment(start || moment().valueOf()).startOf('day').valueOf(); + end = moment(end || moment().valueOf()).startOf('day').valueOf(); + } + if ( + (opt.start && opt.end && end >= time && start <= time) || + (opt.start && !opt.end && moment(start).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) + ) { + $(this).addClass('checked'); + } else { + $(this).removeClass('checked'); + } + + //add first-date-selected class name to the first date selected + if (opt.start && moment(start).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) { + $(this).addClass('first-date-selected'); + } else { + $(this).removeClass('first-date-selected'); + } + //add last-date-selected + if (opt.end && moment(end).format('YYYY-MM-DD') == moment(time).format('YYYY-MM-DD')) { + $(this).addClass('last-date-selected'); + } else { + $(this).removeClass('last-date-selected'); + } + }); + + box.find('.week-number').each(function() { + if ($(this).attr('data-start-time') == opt.startWeek) { + $(this).addClass('week-number-selected'); + } + }); + } + + function showMonth(date, month) { + date = moment(date).toDate(); + var monthElement = generateMonthElement(date, month); + var yearElement = generateYearElement(date, month); + + box.find('.' + month + ' .month-name').html(monthElement + ' ' + yearElement); + box.find('.' + month + ' tbody').html(createMonthHTML(date)); + opt[month] = date; + updateSelectableRange(); + bindEvents(); + } + + function generateMonthElement(date, month) { + date = moment(date); + var currentMonth = date.get('month'); + var currentMonthName = nameMonth(currentMonth); + var nonSelectableMonth = '
' + currentMonthName + '
'; + + if (!opt.monthSelect) { return nonSelectableMonth; } + + var startDate = opt.startDate ? moment(opt.startDate).add(!opt.singleMonth && month === 'month2' ? 1 : 0, 'month') : false; + var endDate = opt.endDate ? moment(opt.endDate).add(!opt.singleMonth && month === 'month1' ? -1 : 0, 'month') : false; + + var minSelectableMonth = startDate && date.isSame(startDate, 'year') ? startDate.get('month') : 0; + var maxSelectableMonth = endDate && date.isSame(endDate, 'year') ? endDate.get('month') : 11; + var minVisibleMonth = Math.min(minSelectableMonth, currentMonth); + var maxVisibleMonth = Math.max(maxSelectableMonth, currentMonth); + + if (minVisibleMonth === maxVisibleMonth) { return nonSelectableMonth; } + + var selectData = generateSelectData( + { + minSelectable: minSelectableMonth, + maxSelectable: maxSelectableMonth, + minVisible: minVisibleMonth, + maxVisible: maxVisibleMonth, + }, + currentMonth, + function (value) { return nameMonth(value); } + ) + return generateSelect('month', selectData); + } + + function generateYearElement(date, month) { + date = moment(date); + var currentYear = date.get('year'); + var nonSelectableMonth = '
' + currentYear + '
'; + + if (!opt.yearSelect) { return nonSelectableMonth; } + + var isYearFunction = opt.yearSelect && typeof opt.yearSelect === 'function'; + var startDate = opt.startDate ? moment(opt.startDate).add(!opt.singleMonth && month === 'month2' ? 1 : 0, 'month') : false; + var endDate = opt.endDate ? moment(opt.endDate).add(!opt.singleMonth && month === 'month1' ? -1 : 0, 'month') : false; + var range = isYearFunction ? opt.yearSelect(currentYear) : opt.yearSelect.slice(); + + var minSelectableYear = startDate ? Math.max(range[0], startDate.get('year')) : Math.min(range[0], currentYear); + var maxSelectableYear = endDate ? Math.min(range[1], endDate.get('year')) : Math.max(range[1], currentYear); + var minVisibleYear = Math.min(minSelectableYear, currentYear); + var maxVisibleYear = Math.max(maxSelectableYear, currentYear); + + if (minVisibleYear === maxVisibleYear) { return nonSelectableMonth; } + + var selectData = generateSelectData( + { + minSelectable: minSelectableYear, + maxSelectable: maxSelectableYear, + minVisible: minVisibleYear, + maxVisible: maxVisibleYear, + }, + currentYear + ) + return generateSelect('year', selectData); + } + + + function generateSelectData(range, current, valueBeautifier) { + var data = []; + valueBeautifier = valueBeautifier || function(value) { return value; }; + + for (var i = range.minVisible; i <= range.maxVisible; i++) { + data.push({ + value: i, + text: valueBeautifier(i), + selected: i === current, + disabled: ((i < range.minSelectable) || (i > range.maxSelectable)), + }); + } + + return data; + } + + function generateSelect(name, data) { + var select = '
' + current + '
'; + + return select; + } + + function bindEvents() { + box.find('.day').off("click").on('click', function(evt) { + dayClicked($(this)); + }); + + box.find('.day').off("mouseenter").on('mouseenter', function(evt) { + dayHovering($(this)); + }); + + box.find('.day').off("mouseleave").on('mouseleave', function(evt) { + box.find('.date-range-length-tip').hide(); + if (opt.singleDate) { + clearHovering(); + } + }); + + box.find('.week-number').off("click").on('click', function(evt) { + weekNumberClicked($(this)); + }); + + box.find('.month').off("change").on('change', function(evt) { + dateChanged($(this)); + }); + + box.find('.year').off("change").on('change', function(evt) { + dateChanged($(this)); + }); + } + + function showTime(date, name) { + box.find('.' + name).append(getTimeHTML()); + renderTime(name, date); + } + + function nameMonth(m) { + return translate('month-name')[m]; + } + + function getDateString(d) { + return moment(d).format(opt.format); + } + + function showGap() { + showSelectedDays(); + var m1 = parseInt(moment(opt.month1).format('YYYYMM')); + var m2 = parseInt(moment(opt.month2).format('YYYYMM')); + var p = Math.abs(m1 - m2); + var shouldShow = (p > 1 && p != 89); + if (shouldShow) { + box.addClass('has-gap').removeClass('no-gap').find('.gap').css('visibility', 'visible'); + } else { + box.removeClass('has-gap').addClass('no-gap').find('.gap').css('visibility', 'hidden'); + } + var h1 = box.find('table.month1').height(); + var h2 = box.find('table.month2').height(); + box.find('.gap').height(Math.max(h1, h2) + 10); + } + + function closeDatePicker() { + if (opt.alwaysOpen) return; + + var afterAnim = function() { + $(self).data('date-picker-opened', false); + $(self).trigger('datepicker-closed', { + relatedTarget: box + }); + }; + if (opt.customCloseAnimation) { + opt.customCloseAnimation.call(box.get(0), afterAnim); + } else { + $(box).slideUp(opt.duration, afterAnim); + } + $(self).trigger('datepicker-close', { + relatedTarget: box + }); + } + + function redrawDatePicker() { + showMonth(opt.month1, 'month1'); + showMonth(opt.month2, 'month2'); + } + + function compare_month(m1, m2) { + var p = parseInt(moment(m1).format('YYYYMM')) - parseInt(moment(m2).format('YYYYMM')); + if (p > 0) return 1; + if (p === 0) return 0; + return -1; + } + + function compare_day(m1, m2) { + var p = parseInt(moment(m1).format('YYYYMMDD')) - parseInt(moment(m2).format('YYYYMMDD')); + if (p > 0) return 1; + if (p === 0) return 0; + return -1; + } + + function nextMonth(month) { + return moment(month).add(1, 'months').toDate(); + } + + function prevMonth(month) { + return moment(month).add(-1, 'months').toDate(); + } + + function getTimeHTML() { + return '
' + + '' + translate('Time') + ': 00:00' + + '
' + + '
' + + '' + + '
' + + '
' + + '' + + '
'; + } + + function createDom() { + var html = '
'; + + if (opt.showTopbar) { + html += '
'; + + if (opt.customTopBar) { + if (typeof opt.customTopBar == 'function') opt.customTopBar = opt.customTopBar(); + html += '
' + opt.customTopBar + '
'; + } else { + html += '
' + + '' + translate('selected') + ' ...'; + if (!opt.singleDate) { + html += ' ' + opt.separator + ' ... (3 ' + translate('days') + ')'; + } + html += '
'; + html += '
error
' + + '
default
'; + } + + html += ''; + html += '
'; + } + + var _colspan = opt.showWeekNumbers ? 6 : 5; + + var arrowPrev = '<'; + if (opt.customArrowPrevSymbol) arrowPrev = opt.customArrowPrevSymbol; + + var arrowNext = '>'; + if (opt.customArrowNextSymbol) arrowNext = opt.customArrowNextSymbol; + + html += '
' + + '
{l s='Room Image'} {l s='Room Type'} {l s='Duration'}{l s='Occupancy'}{l s='Unit Price (tax excl)'} {l s='Additinal Facilities (tax excl)'} {l s='Total Rooms Price (tax excl)'}
{$data.room_num|escape:'html':'UTF-8'} @@ -58,13 +61,71 @@ {/if} {dateFormat date=$data.date_from} - {dateFormat date=$data.date_to} +
+ +
+
+ + + +
+
{l s='Room - 1'}
+
+
+
+ + +
+
+
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+
+
+
+ +
+
+ {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

+ +

+ {/foreach} + {/if} +
+
+
+
+
+
+
+
+ 		{if $data.feature_price_diff != 0} {assign var=shown_room_type_price value=$data.feature_price_tax_excl} {else} {assign var=shown_room_type_price value=$data.product_price_tax_excl} {/if} - + {if isset($data.extra_demands) && $data.extra_demands} diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl index e67cc63ff..5aa06c218 100644 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin/themes/default/template/controllers/orders/_new_product.tpl @@ -64,7 +64,7 @@ + {if $order->is_occupnacy_provided && $data['children']} +
+ +
+ + {if isset($data['child_ages']) && $data['child_ages']} + {foreach $data['child_ages'] as $childAge} +

+ {l s='Child %s : %s years' sprintf=[$childAge@iteration, $childAge]} +

+ {/foreach} + {/if} +
+
+ {else} + {if $data['adult']}{$data['adult']}{/if} {if $data['adult'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} + {/if} + {if $order->is_occupnacy_provided} + + {else} + + {/if} 		diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index 1d80ec936..209f9495a 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -241,12 +241,13 @@ e.preventDefault(); var cart_row = $(this).closest('tr'); var params = { - id_booking_data: parseInt($(this).attr('data-id-booking-data')), - id_product: parseInt($(this).attr('data-id-product')), - id_room: parseInt($(this).attr('data-id-room')), - date_from: $(this).attr('data-date-from'), - date_to: $(this).attr('data-date-to'), + id_booking_data: parseInt($(cart_row).attr('data-id-booking-data')), + id_product: parseInt($(cart_row).attr('data-id-product')), + id_room: parseInt($(cart_row).attr('data-id-room')), + date_from: $(cart_row).attr('data-date-from'), + date_to: $(cart_row).attr('data-date-to'), price: $(this).val(), + id_cart: id_cart }; updateProductPrice(params, cart_row); }) @@ -272,6 +273,8 @@ } }); }); + + initOccupancyField(); resetBind(); $('#customer').focus(); @@ -334,6 +337,213 @@ }); }); + {literal} + function initOccupancyField() + { + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + if ($(this).hasClass('num_children')) { + var totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + if (totalChilds < max_child_in_room) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + + + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + + var childAgeSelect = '

'; + childAgeSelect += ''; + childAgeSelect += '

'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + + $(document).on('click', '.booking_guest_occupancy', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + let hasErrors = 0; + + let adult = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adult.length || (adult.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adult and children + adult.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } + } + } + }); + + $(document).on('QloApps:updateRoomOccupancy', function (e, occupancy_wrapper) { + e.preventDefault(); + let cart_row = $(occupancy_wrapper).closest('tr'); + let occupancy = getBookingOccupancyDetails(cart_row); + let params = { + id_cart: id_cart, + id_booking_data: parseInt($(cart_row).attr('data-id-booking-data')), + occupancy : occupancy.shift(), + }; + updateProductOccupancy(params, cart_row); + }); + } + function getBookingOccupancyDetails(bookingform) + { + let occupancy; + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + occupancy = []; + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + } + occupancy.push({ + 'adult': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + } + + return occupancy; + } + {/literal} + + function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) + { + var adult = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adult += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adult) + ' '; + if (parseInt(adult) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + // if (parseInt(rooms) > 1) { + // guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + // } else { + // guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; + // } + // console.log($(booking_occupancy_wrapper).siblings('.booking_guest_occupancy > span')); + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); + } + function resetBind() { $('.fancybox').fancybox({ @@ -391,7 +601,6 @@ function updateProductPrice(params, cart_row) { $.extend(params, { - id_cart: id_cart, price: new Number(params.price.replace(",",".")).toFixed(4).toString(), }); @@ -414,6 +623,28 @@ }); } + function updateProductOccupancy(params, cart_row) + { + $.ajax({ + type:"POST", + url: "{$link->getAdminLink('AdminCarts')|addslashes}", + async: true, + dataType: "JSON", + data: { + ajax: "1", + token: "{getAdminToken tab='AdminCarts'}", + tab: "AdminCarts", + action: "updateProductOccupancy", + params: params, + }, + success : function(response) { + updateCartLine(response.curr_booking_info, cart_row); + updateCartSummaryData(response.cart_info); + } + }); + } + + function updateCartLine(data, cart_row) { $(cart_row).find('.cart_line_total_rooms_price').html(data.amt_with_qty); $(cart_row).find('.cart_line_total_price').html(data.total_price); @@ -1687,6 +1918,23 @@ +{strip} + {addJsDef max_child_age=$max_child_age} + {addJsDef max_child_in_room=$max_child_in_room} + {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL} + {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL} + {addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL} + {addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL} + {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL} + {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL} + {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL} + {addJsDefL name='child_txt'}{l s='Child' js=1}{/addJsDefL} + {addJsDefL name='children_txt'}{l s='Children' js=1}{/addJsDefL} + {addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL} + {addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='all_children_txt'}{l s='years' js=1}{/addJsDefL} + {addJsDefL name='invalid_occupancy_txt'}{l s='Invalid occupancy(adults/children) found.' js=1}{/addJsDefL} +{/strip}
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index ea80d46a9..b03f3d1af 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -981,6 +981,7 @@
{l s='Room Type'} {l s='Hotel Name'} {l s='Duration'}{l s='Occupancy'} {l s='Unit Price (Tax excl.)'} {l s='Total Price (Tax incl.)'}
' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + getWeekHead() + + ' ' + + ' ' + + '
' + + ' ' + + arrowPrev + + ' ' + + ' ' + + ' ' + + (opt.singleDate || !opt.stickyMonths ? '' + arrowNext + '' : '') + + '
'; + + if (hasMonth2()) { + html += '
' + getGapHTML() + '
' + + '' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + getWeekHead() + + ' ' + + ' ' + + '
' + + (!opt.stickyMonths ? '' + arrowPrev + '' : '') + + ' ' + + ' ' + + ' ' + arrowNext + '' + + '
'; + + } + //+'
' + html += '
' + + '
' + + '
'; + if (!opt.singleDate) { + html += '
'; + } + html += '
' + + '
' + + '
'; + + html += '
'; + if (opt.showShortcuts) { + html += '
' + translate('shortcuts') + ''; + + var data = opt.shortcuts; + if (data) { + var name; + if (data['prev-days'] && data['prev-days'].length > 0) { + html += ' ' + translate('past'); + for (var i = 0; i < data['prev-days'].length; i++) { + name = data['prev-days'][i]; + name += (data['prev-days'][i] > 1) ? translate('days') : translate('day'); + html += ' ' + name + ''; + } + html += ''; + } + + if (data['next-days'] && data['next-days'].length > 0) { + html += ' ' + translate('following'); + for (var i = 0; i < data['next-days'].length; i++) { + name = data['next-days'][i]; + name += (data['next-days'][i] > 1) ? translate('days') : translate('day'); + html += ' ' + name + ''; + } + html += ''; + } + + if (data.prev && data.prev.length > 0) { + html += ' ' + translate('previous'); + for (var i = 0; i < data.prev.length; i++) { + name = translate('prev-' + data.prev[i]); + html += ' ' + name + ''; + } + html += ''; + } + + if (data.next && data.next.length > 0) { + html += ' ' + translate('next'); + for (var i = 0; i < data.next.length; i++) { + name = translate('next-' + data.next[i]); + html += ' ' + name + ''; + } + html += ''; + } + } + + if (opt.customShortcuts) { + for (var i = 0; i < opt.customShortcuts.length; i++) { + var sh = opt.customShortcuts[i]; + html += ' ' + sh.name + ''; + } + } + html += '
'; + } + + // Add Custom Values Dom + if (opt.showCustomValues) { + html += '
' + (opt.customValueLabel || translate('custom-values')) + ''; + + if (opt.customValues) { + for (var i = 0; i < opt.customValues.length; i++) { + var val = opt.customValues[i]; + html += ' ' + val.name + ''; + } + } + } + + html += '
'; + + + return $(html); + } + + function getApplyBtnClass() { + var klass = ''; + if (opt.autoClose === true) { + klass += ' hide'; + } + if (opt.applyBtnClass !== '') { + klass += ' ' + opt.applyBtnClass; + } + return klass; + } + + function getWeekHead() { + var prepend = opt.showWeekNumbers ? '' + translate('week-number') + '' : ''; + if (opt.startOfWeek == 'monday') { + return prepend + '' + translate('week-1') + '' + + '' + translate('week-2') + '' + + '' + translate('week-3') + '' + + '' + translate('week-4') + '' + + '' + translate('week-5') + '' + + '' + translate('week-6') + '' + + '' + translate('week-7') + ''; + } else { + return prepend + '' + translate('week-7') + '' + + '' + translate('week-1') + '' + + '' + translate('week-2') + '' + + '' + translate('week-3') + '' + + '' + translate('week-4') + '' + + '' + translate('week-5') + '' + + '' + translate('week-6') + ''; + } + } + + function isMonthOutOfBounds(month) { + month = moment(month); + if (opt.startDate && month.endOf('month').isBefore(opt.startDate)) { + return true; + } + if (opt.endDate && month.startOf('month').isAfter(opt.endDate)) { + return true; + } + return false; + } + + function getGapHTML() { + var html = ['
']; + for (var i = 0; i < 20; i++) { + html.push('
' + + '
' + + '
' + + '
' + + '
'); + } + html.push('
'); + return html.join(''); + } + + function hasMonth2() { + return (!opt.singleMonth); + } + + function attributesCallbacks(initialObject, callbacksArray, today) { + var resultObject = $.extend(true, {}, initialObject); + + $.each(callbacksArray, function(cbAttrIndex, cbAttr) { + var addAttributes = cbAttr(today); + for (var attr in addAttributes) { + if (resultObject.hasOwnProperty(attr)) { + resultObject[attr] += addAttributes[attr]; + } else { + resultObject[attr] = addAttributes[attr]; + } + } + }); + + var attrString = ''; + + for (var attr in resultObject) { + if (resultObject.hasOwnProperty(attr)) { + attrString += attr + '="' + resultObject[attr] + '" '; + } + } + + return attrString; + } + + function createMonthHTML(d) { + var days = []; + d.setDate(1); + var lastMonth = new Date(d.getTime() - 86400000); + var now = new Date(); + + var dayOfWeek = d.getDay(); + if ((dayOfWeek === 0) && (opt.startOfWeek === 'monday')) { + // add one week + dayOfWeek = 7; + } + var today, valid; + + if (dayOfWeek > 0) { + for (var i = dayOfWeek; i > 0; i--) { + var day = new Date(d.getTime() - 86400000 * i); + valid = isValidTime(day.getTime()); + if (opt.startDate && compare_day(day, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(day, opt.endDate) > 0) valid = false; + days.push({ + date: day, + type: 'lastMonth', + day: day.getDate(), + time: day.getTime(), + valid: valid + }); + } + } + var toMonth = d.getMonth(); + for (var i = 0; i < 40; i++) { + today = moment(d).add(i, 'days').toDate(); + valid = isValidTime(today.getTime()); + if (opt.startDate && compare_day(today, opt.startDate) < 0) valid = false; + if (opt.endDate && compare_day(today, opt.endDate) > 0) valid = false; + days.push({ + date: today, + type: today.getMonth() == toMonth ? 'toMonth' : 'nextMonth', + day: today.getDate(), + time: today.getTime(), + valid: valid + }); + } + var html = []; + for (var week = 0; week < 6; week++) { + if (days[week * 7].type == 'nextMonth') break; + html.push(''); + + for (var day = 0; day < 7; day++) { + var _day = (opt.startOfWeek == 'monday') ? day + 1 : day; + today = days[week * 7 + _day]; + var highlightToday = moment(today.time).format('L') == moment(now).format('L'); + today.extraClass = ''; + today.tooltip = ''; + if (today.valid && opt.beforeShowDay && typeof opt.beforeShowDay == 'function') { + var _r = opt.beforeShowDay(moment(today.time).toDate()); + today.valid = _r[0]; + today.extraClass = _r[1] || ''; + today.tooltip = _r[2] || ''; + if (today.tooltip !== '') today.extraClass += ' has-tooltip '; + } + + var todayDivAttr = { + time: today.time, + 'data-tooltip': today.tooltip, + 'class': 'day ' + today.type + ' ' + today.extraClass + ' ' + (today.valid ? 'valid' : 'invalid') + ' ' + (highlightToday ? 'real-today' : '') + }; + + if (day === 0 && opt.showWeekNumbers) { + html.push('
' + opt.getWeekNumber(today.date) + '
'); + } + + html.push('
' + showDayHTML(today.time, today.day) + '
'); + } + html.push(''); + } + return html.join(''); + } + + function showDayHTML(time, date) { + if (opt.showDateFilter && typeof opt.showDateFilter == 'function') return opt.showDateFilter(time, date); + return date; + } + + function getLanguages() { + if (opt.language == 'auto') { + var language = navigator.language ? navigator.language : navigator.browserLanguage; + if (!language) { + return $.dateRangePickerLanguages['default']; + } + language = language.toLowerCase(); + if(language in $.dateRangePickerLanguages){ + return $.dateRangePickerLanguages[language]; + } + + return $.dateRangePickerLanguages['default']; + } else if (opt.language && opt.language in $.dateRangePickerLanguages) { + return $.dateRangePickerLanguages[opt.language]; + } else { + return $.dateRangePickerLanguages['default']; + } + } + + /** + * Translate language string, try both the provided translation key, as the lower case version + */ + function translate(translationKey) { + var translationKeyLowerCase = translationKey.toLowerCase(); + console.log(languages); + var result = (translationKey in languages) ? languages[translationKey] : (translationKeyLowerCase in languages) ? languages[translationKeyLowerCase] : null; + var defaultLanguage = $.dateRangePickerLanguages['default']; + if (result == null) result = (translationKey in defaultLanguage) ? defaultLanguage[translationKey] : (translationKeyLowerCase in defaultLanguage) ? defaultLanguage[translationKeyLowerCase] : ''; + console.log(result); + + return result; + } + + function getDefaultTime() { + var defaultTime = opt.defaultTime ? opt.defaultTime : new Date(); + + if (opt.lookBehind) { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = nextMonth(moment(opt.startDate).toDate()); + if (opt.endDate && compare_month(defaultTime, opt.endDate) > 0) defaultTime = moment(opt.endDate).toDate(); + } else { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = moment(opt.startDate).toDate(); + if (opt.endDate && compare_month(nextMonth(defaultTime), opt.endDate) > 0) defaultTime = prevMonth(moment(opt.endDate).toDate()); + } + + if (opt.singleDate) { + if (opt.startDate && compare_month(defaultTime, opt.startDate) < 0) defaultTime = moment(opt.startDate).toDate(); + if (opt.endDate && compare_month(defaultTime, opt.endDate) > 0) defaultTime = moment(opt.endDate).toDate(); + } + + return defaultTime; + } + + function resetMonthsView(time) { + if (!time) { + time = getDefaultTime(); + } + + if (opt.lookBehind) { + showMonth(prevMonth(time), 'month1'); + showMonth(time, 'month2'); + } else { + showMonth(time, 'month1'); + showMonth(nextMonth(time), 'month2'); + } + + if (opt.singleDate) { + showMonth(time, 'month1'); + } + + showSelectedDays(); + showGap(); + } + + function outsideClickClose(evt) { + if (!IsOwnDatePickerClicked(evt, self[0])) { + if (box.is(':visible')) closeDatePicker(); + } + } + + }; +})); diff --git a/js/daterangepicker/jquery.daterangepicker.min.css b/js/daterangepicker/jquery.daterangepicker.min.css new file mode 100644 index 000000000..45d658857 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.min.css @@ -0,0 +1 @@ +.date-picker{width:170px;height:25px;padding:0;border:0;line-height:25px;padding-left:10px;font-size:12px;font-family:Arial,sans-serif;font-weight:700;cursor:pointer;color:#303030;position:relative;z-index:2}.date-picker-wrapper{position:absolute;z-index:1;border:1px solid #bfbfbf;background-color:#efefef;padding:5px 12px;font-size:12px;line-height:20px;color:#aaa;font-family:Arial,sans-serif;-webkit-box-shadow:3px 3px 10px rgba(0,0,0,.5);box-shadow:3px 3px 10px rgba(0,0,0,.5);-webkit-box-sizing:initial;box-sizing:initial}.dp-clearfix{clear:both;height:0;font-size:0}.date-picker-wrapper.inline-wrapper{position:relative;-webkit-box-shadow:none;box-shadow:none;display:inline-block}.date-picker-wrapper.single-date{width:auto}.date-picker-wrapper.no-shortcuts{padding-bottom:12px}.date-picker-wrapper.no-topbar{padding-top:12px}.date-picker-wrapper .footer{font-size:11px;padding-top:3px}.date-picker-wrapper b{color:#666;font-weight:700}.date-picker-wrapper a{color:#6bb4d6;text-decoration:underline}.date-picker-wrapper .month-name{text-transform:uppercase}.date-picker-wrapper .select-wrapper{position:relative;overflow:hidden;display:inline-block;vertical-align:middle}.date-picker-wrapper .select-wrapper:hover{text-decoration:underline}.date-picker-wrapper .month-element{display:inline-block;vertical-align:middle}.date-picker-wrapper .select-wrapper select{position:absolute;margin:0;padding:0;left:0;top:-1px;font-size:inherit;font-style:inherit;font-weight:inherit;text-transform:inherit;color:inherit;cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;border:0;outline:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";filter:alpha(opacity=1);opacity:.01}.date-picker-wrapper .month-wrapper{border:1px solid #bfbfbf;border-radius:3px;background-color:#fff;padding:5px;cursor:default;position:relative;_overflow:hidden}.date-picker-wrapper .month-wrapper table{width:190px;float:left}.date-picker-wrapper .month-wrapper table.month2{width:190px;float:left}.date-picker-wrapper .month-wrapper table td,.date-picker-wrapper .month-wrapper table th{vertical-align:middle;text-align:center;line-height:14px;margin:0;padding:0}.date-picker-wrapper .month-wrapper table .day{padding:5px 0;line-height:1;font-size:12px;margin-bottom:1px;color:#ccc;cursor:default}.date-picker-wrapper .month-wrapper table div.day.lastMonth,.date-picker-wrapper .month-wrapper table div.day.nextMonth{color:#999;cursor:default}.date-picker-wrapper .month-wrapper table .day.checked{background-color:#9cdbf7}.date-picker-wrapper .month-wrapper table .week-name{height:20px;line-height:20px;font-weight:100;text-transform:uppercase}.date-picker-wrapper .month-wrapper table .day.has-tooltip{cursor:help!important}.date-picker-wrapper .month-wrapper table .day.has-tooltip .tooltip{white-space:nowrap}.date-picker-wrapper .time label{white-space:nowrap}.date-picker-wrapper .month-wrapper table .day.toMonth.valid{color:#333;cursor:pointer}.date-picker-wrapper .month-wrapper table .day.toMonth.hovering{background-color:#cdecfa}.date-picker-wrapper .month-wrapper table .day.lastMonth,.date-picker-wrapper .month-wrapper table .day.nextMonth{display:none}.date-picker-wrapper .month-wrapper table .day.real-today{background-color:#ffe684}.date-picker-wrapper .month-wrapper table .day.real-today.checked,.date-picker-wrapper .month-wrapper table .day.real-today.hovering{background-color:#70ccd5}.date-picker-wrapper table .caption{height:40px}.date-picker-wrapper table .caption>th:first-of-type,.date-picker-wrapper table .caption>th:last-of-type{width:27px}.date-picker-wrapper table .caption .next,.date-picker-wrapper table .caption .prev{padding:0 5px;cursor:pointer}.date-picker-wrapper table .caption .next:hover,.date-picker-wrapper table .caption .prev:hover{background-color:#ccc;color:#fff}.date-picker-wrapper .gap{position:relative;z-index:1;width:15px;height:100%;background-color:red;font-size:0;line-height:0;float:left;top:-5px;margin:0 10px -10px;visibility:hidden;height:0}.date-picker-wrapper .gap .gap-lines{height:100%;overflow:hidden}.date-picker-wrapper .gap .gap-line{height:15px;width:15px;position:relative}.date-picker-wrapper .gap .gap-line .gap-1{z-index:1;height:0;border-left:8px solid #fff;border-top:8px solid #eee;border-bottom:8px solid #eee}.date-picker-wrapper .gap .gap-line .gap-2{position:absolute;right:0;top:0;z-index:2;height:0;border-left:8px solid transparent;border-top:8px solid #fff}.date-picker-wrapper .gap .gap-line .gap-3{position:absolute;right:0;top:8px;z-index:2;height:0;border-left:8px solid transparent;border-bottom:8px solid #fff}.date-picker-wrapper .gap .gap-top-mask{width:6px;height:1px;position:absolute;top:-1px;left:1px;background-color:#eee;z-index:3}.date-picker-wrapper .gap .gap-bottom-mask{width:6px;height:1px;position:absolute;bottom:-1px;left:7px;background-color:#eee;z-index:3}.date-picker-wrapper .selected-days{display:none}.date-picker-wrapper .drp_top-bar{line-height:1.4;position:relative;padding:10px 40px 10px 0}.date-picker-wrapper .drp_top-bar .error-top,.date-picker-wrapper .drp_top-bar .normal-top{display:none}.date-picker-wrapper .drp_top-bar .default-top{display:block}.date-picker-wrapper .drp_top-bar.error .default-top{display:none}.date-picker-wrapper .drp_top-bar.error .error-top{display:block;color:red}.date-picker-wrapper .drp_top-bar.normal .default-top{display:none}.date-picker-wrapper .drp_top-bar.normal .normal-top{display:block}.date-picker-wrapper .drp_top-bar.normal .normal-top .selection-top{color:#333}.date-picker-wrapper .drp_top-bar .apply-btn{position:absolute;right:0;top:6px;padding:3px 5px;margin:0;font-size:12px;border-radius:4px;cursor:pointer;color:#d9eef7;border:solid 1px #0076a3;background:#0095cd;background:-moz-linear-gradient(top,#00adee,#0078a5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');color:#fff;line-height:initial}.date-picker-wrapper .drp_top-bar .apply-btn.disabled{cursor:pointer;color:#606060;border:solid 1px #b7b7b7;background:#fff;background:-moz-linear-gradient(top,#fff,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed')}.date-picker-wrapper .time{position:relative}.date-picker-wrapper.single-month .time{display:block}.date-picker-wrapper .time input[type=range]{vertical-align:middle;width:129px;padding:0;margin:0;height:20px}.date-picker-wrapper .time1{width:180px;padding:0 5px;text-align:center}.time2{width:180px;padding:0 5px;text-align:center}.date-picker-wrapper .time1{float:left}.date-picker-wrapper .time2{float:right}.date-picker-wrapper .hour{text-align:right}.minute{text-align:right}.date-picker-wrapper .hide{display:none}.date-picker-wrapper .first-date-selected,.date-picker-wrapper .last-date-selected{background-color:#49e!important;color:#fff!important}.date-picker-wrapper .date-range-length-tip{position:absolute;margin-top:-4px;margin-left:-8px;-webkit-box-shadow:0 0 3px rgba(0,0,0,.3);box-shadow:0 0 3px rgba(0,0,0,.3);display:none;background-color:#ff0;padding:0 6px;border-radius:2px;font-size:12px;line-height:16px;-webkit-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-moz-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-ms-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));-o-filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3));filter:drop-shadow(0 0 3px rgba(0, 0, 0, .3))}.date-picker-wrapper .date-range-length-tip:after{content:'';position:absolute;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ff0;left:50%;margin-left:-4px;bottom:-4px}.date-picker-wrapper.two-months.no-gap .month1 .next,.date-picker-wrapper.two-months.no-gap .month2 .prev{display:none}.date-picker-wrapper .week-number{padding:5px 0;line-height:1;font-size:12px;margin-bottom:1px;color:#999;cursor:pointer}.date-picker-wrapper .week-number.week-number-selected{color:#49e;font-weight:700} \ No newline at end of file diff --git a/js/daterangepicker/jquery.daterangepicker.min.js b/js/daterangepicker/jquery.daterangepicker.min.js new file mode 100755 index 000000000..508ddcce6 --- /dev/null +++ b/js/daterangepicker/jquery.daterangepicker.min.js @@ -0,0 +1,7 @@ +/** + * jquery-date-range-picker + * @version v0.21.1 + * @link https://github.com/longbill/jquery-date-range-picker + * @license MIT + */ +!function(e){"function"==typeof define&&define.amd?define(["jquery","moment"],e):"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery"),require("moment")):e(jQuery,moment)}(function(U,Q){"use strict";U.dateRangePickerLanguages={default:{selected:"Selected:",day:"Day",days:"Days",apply:"Close","week-1":"mo","week-2":"tu","week-3":"we","week-4":"th","week-5":"fr","week-6":"sa","week-7":"su","week-number":"W","month-name":["january","february","march","april","may","june","july","august","september","october","november","december"],shortcuts:"Shortcuts","custom-values":"Custom Values",past:"Past",following:"Following",previous:"Previous","prev-week":"Week","prev-month":"Month","prev-year":"Year",next:"Next","next-week":"Week","next-month":"Month","next-year":"Year","less-than":"Date range should not be more than %d days","more-than":"Date range should not be less than %d days","default-more":"Please select a date range longer than %d days","default-single":"Please select a date","default-less":"Please select a date range less than %d days","default-range":"Please select a date range between %d and %d days","default-default":"Please select a date range",time:"Time",hour:"Hour",minute:"Minute"},id:{selected:"Terpilih:",day:"Hari",days:"Hari",apply:"Tutup","week-1":"sen","week-2":"sel","week-3":"rab","week-4":"kam","week-5":"jum","week-6":"sab","week-7":"min","week-number":"W","month-name":["januari","februari","maret","april","mei","juni","juli","agustus","september","oktober","november","desember"],shortcuts:"Pintas","custom-values":"Nilai yang ditentukan",past:"Yang Lalu",following:"Mengikuti",previous:"Sebelumnya","prev-week":"Minggu","prev-month":"Bulan","prev-year":"Tahun",next:"Selanjutnya","next-week":"Minggu","next-month":"Bulan","next-year":"Tahun","less-than":"Tanggal harus lebih dari %d hari","more-than":"Tanggal harus kurang dari %d hari","default-more":"Jarak tanggal harus lebih lama dari %d hari","default-single":"Silakan pilih tanggal","default-less":"Jarak rentang tanggal tidak boleh lebih lama dari %d hari","default-range":"Rentang tanggal harus antara %d dan %d hari","default-default":"Silakan pilih rentang tanggal",time:"Waktu",hour:"Jam",minute:"Menit"},az:{selected:"Seçildi:",day:" gün",days:" gün",apply:"tətbiq","week-1":"1","week-2":"2","week-3":"3","week-4":"4","week-5":"5","week-6":"6","week-7":"7","month-name":["yanvar","fevral","mart","aprel","may","iyun","iyul","avqust","sentyabr","oktyabr","noyabr","dekabr"],shortcuts:"Qısayollar",past:"Keçmiş",following:"Növbəti",previous:"   ","prev-week":"Öncəki həftə","prev-month":"Öncəki ay","prev-year":"Öncəki il",next:"   ","next-week":"Növbəti həftə","next-month":"Növbəti ay","next-year":"Növbəti il","less-than":"Tarix aralığı %d gündən çox olmamalıdır","more-than":"Tarix aralığı %d gündən az olmamalıdır","default-more":"%d gündən çox bir tarix seçin","default-single":"Tarix seçin","default-less":"%d gündən az bir tarix seçin","default-range":"%d və %d gün aralığında tarixlər seçin","default-default":"Tarix aralığı seçin"},bg:{selected:"Избрано:",day:"Ден",days:"Дни",apply:"Затвори","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","week-number":"С","month-name":["януари","февруари","март","април","май","юни","юли","август","септември","октомври","ноември","декември"],shortcuts:"Преки пътища","custom-values":"Персонализирани стойности",past:"Минал",following:"Следващ",previous:"Предишен","prev-week":"Седмица","prev-month":"Месец","prev-year":"Година",next:"Следващ","next-week":"Седмица","next-month":"Месец","next-year":"Година","less-than":"Периодът от време не трябва да е повече от %d дни","more-than":"Периодът от време не трябва да е по-малко от %d дни","default-more":"Моля изберете период по-дълъг от %d дни","default-single":"Моля изберете дата","default-less":"Моля изберете период по-къс от %d дни","default-range":"Моля изберете период между %d и %d дни","default-default":"Моля изберете период",time:"Време",hour:"Час",minute:"Минута"},cn:{selected:"已选择:",day:"天",days:"天",apply:"确定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"周","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快捷选择",past:"过去",following:"将来",previous:"   ","prev-week":"上周","prev-month":"上个月","prev-year":"去年",next:"   ","next-week":"下周","next-month":"下个月","next-year":"明年","less-than":"所选日期范围不能大于%d天","more-than":"所选日期范围不能小于%d天","default-more":"请选择大于%d天的日期范围","default-less":"请选择小于%d天的日期范围","default-range":"请选择%d天到%d天的日期范围","default-single":"请选择一个日期","default-default":"请选择一个日期范围",time:"时间",hour:"小时",minute:"分钟"},cz:{selected:"Vybráno:",day:"Den",days:"Dny",apply:"Zavřít","week-1":"po","week-2":"út","week-3":"st","week-4":"čt","week-5":"pá","week-6":"so","week-7":"ne","month-name":["leden","únor","březen","duben","květen","červen","červenec","srpen","září","říjen","listopad","prosinec"],shortcuts:"Zkratky",past:"po",following:"následující",previous:"předchozí","prev-week":"týden","prev-month":"měsíc","prev-year":"rok",next:"další","next-week":"týden","next-month":"měsíc","next-year":"rok","less-than":"Rozsah data by neměl být větší než %d dnů","more-than":"Rozsah data by neměl být menší než %d dnů","default-more":"Prosím zvolte rozsah data větší než %d dnů","default-single":"Prosím zvolte datum","default-less":"Prosím zvolte rozsah data menší než %d dnů","default-range":"Prosím zvolte rozsah data mezi %d a %d dny","default-default":"Prosím zvolte rozsah data"},de:{selected:"Auswahl:",day:"Tag",days:"Tage",apply:"Schließen","week-1":"mo","week-2":"di","week-3":"mi","week-4":"do","week-5":"fr","week-6":"sa","week-7":"so","month-name":["januar","februar","märz","april","mai","juni","juli","august","september","oktober","november","dezember"],shortcuts:"Schnellwahl",past:"Vorherige",following:"Folgende",previous:"Vorherige","prev-week":"Woche","prev-month":"Monat","prev-year":"Jahr",next:"Nächste","next-week":"Woche","next-month":"Monat","next-year":"Jahr","less-than":"Datumsbereich darf nicht größer sein als %d Tage","more-than":"Datumsbereich darf nicht kleiner sein als %d Tage","default-more":"Bitte mindestens %d Tage auswählen","default-single":"Bitte ein Datum auswählen","default-less":"Bitte weniger als %d Tage auswählen","default-range":"Bitte einen Datumsbereich zwischen %d und %d Tagen auswählen","default-default":"Bitte ein Start- und Enddatum auswählen",Time:"Zeit",hour:"Stunde",minute:"Minute"},es:{selected:"Seleccionado:",day:"Día",days:"Días",apply:"Cerrar","week-1":"lu","week-2":"ma","week-3":"mi","week-4":"ju","week-5":"vi","week-6":"sa","week-7":"do","month-name":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],shortcuts:"Accesos directos",past:"Pasado",following:"Siguiente",previous:"Anterior","prev-week":"Semana","prev-month":"Mes","prev-year":"Año",next:"Siguiente","next-week":"Semana","next-month":"Mes","next-year":"Año","less-than":"El rango no debería ser mayor de %d días","more-than":"El rango no debería ser menor de %d días","default-more":"Por favor selecciona un rango mayor a %d días","default-single":"Por favor selecciona un día","default-less":"Por favor selecciona un rango menor a %d días","default-range":"Por favor selecciona un rango entre %d y %d días","default-default":"Por favor selecciona un rango de fechas."},fr:{selected:"Sélection:",day:"Jour",days:"Jours",apply:"Fermer","week-1":"lu","week-2":"ma","week-3":"me","week-4":"je","week-5":"ve","week-6":"sa","week-7":"di","month-name":["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],shortcuts:"Raccourcis",past:"Passé",following:"Suivant",previous:"Précédent","prev-week":"Semaine","prev-month":"Mois","prev-year":"Année",next:"Suivant","next-week":"Semaine","next-month":"Mois","next-year":"Année","less-than":"L'intervalle ne doit pas être supérieure à %d jours","more-than":"L'intervalle ne doit pas être inférieure à %d jours","default-more":"Merci de choisir une intervalle supérieure à %d jours","default-single":"Merci de choisir une date","default-less":"Merci de choisir une intervalle inférieure %d jours","default-range":"Merci de choisir une intervalle comprise entre %d et %d jours","default-default":"Merci de choisir une date"},hu:{selected:"Kiválasztva:",day:"Nap",days:"Nap",apply:"Ok","week-1":"h","week-2":"k","week-3":"sz","week-4":"cs","week-5":"p","week-6":"sz","week-7":"v","month-name":["január","február","március","április","május","június","július","augusztus","szeptember","október","november","december"],shortcuts:"Gyorsválasztó",past:"Múlt",following:"Következő",previous:"Előző","prev-week":"Hét","prev-month":"Hónap","prev-year":"Év",next:"Következő","next-week":"Hét","next-month":"Hónap","next-year":"Év","less-than":"A kiválasztás nem lehet több %d napnál","more-than":"A kiválasztás nem lehet több %d napnál","default-more":"Válassz ki egy időszakot ami hosszabb mint %d nap","default-single":"Válassz egy napot","default-less":"Válassz ki egy időszakot ami rövidebb mint %d nap","default-range":"Válassz ki egy %d - %d nap hosszú időszakot","default-default":"Válassz ki egy időszakot"},it:{selected:"Selezionati:",day:"Giorno",days:"Giorni",apply:"Chiudi","week-1":"lu","week-2":"ma","week-3":"me","week-4":"gi","week-5":"ve","week-6":"sa","week-7":"do","month-name":["gennaio","febbraio","marzo","aprile","maggio","giugno","luglio","agosto","settembre","ottobre","novembre","dicembre"],shortcuts:"Scorciatoie",past:"Scorso",following:"Successivo",previous:"Precedente","prev-week":"Settimana","prev-month":"Mese","prev-year":"Anno",next:"Prossimo","next-week":"Settimana","next-month":"Mese","next-year":"Anno","less-than":"L'intervallo non dev'essere maggiore di %d giorni","more-than":"L'intervallo non dev'essere minore di %d giorni","default-more":"Seleziona un intervallo maggiore di %d giorni","default-single":"Seleziona una data","default-less":"Seleziona un intervallo minore di %d giorni","default-range":"Seleziona un intervallo compreso tra i %d e i %d giorni","default-default":"Seleziona un intervallo di date"},ko:{selected:"기간:",day:"일",days:"일간",apply:"닫기","week-1":"월","week-2":"화","week-3":"수","week-4":"목","week-5":"금","week-6":"토","week-7":"일","week-number":"주","month-name":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],shortcuts:"단축키들",past:"지난(오늘기준)",following:"이후(오늘기준)",previous:"이전","prev-week":"1주","prev-month":"1달","prev-year":"1년",next:"다음","next-week":"1주","next-month":"1달","next-year":"1년","less-than":"날짜 범위는 %d 일보다 많을 수 없습니다","more-than":"날짜 범위는 %d 일보다 작을 수 없습니다","default-more":"날짜 범위를 %d 일보다 길게 선택해 주세요","default-single":"날짜를 선택해 주세요","default-less":"%d 일보다 작은 날짜를 선택해 주세요","default-range":"%d와 %d 일 사이의 날짜 범위를 선택해 주세요","default-default":"날짜 범위를 선택해 주세요",time:"시각",hour:"시",minute:"분"},no:{selected:"Valgt:",day:"Dag",days:"Dager",apply:"Lukk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],shortcuts:"Snarveier","custom-values":"Egendefinerte Verdier",past:"Over",following:"Følger",previous:"Forrige","prev-week":"Uke","prev-month":"Måned","prev-year":"År",next:"Neste","next-week":"Uke","next-month":"Måned","next-year":"År","less-than":"Datoperioden skal ikkje være lengre enn %d dager","more-than":"Datoperioden skal ikkje være kortere enn %d dager","default-more":"Vennligst velg ein datoperiode lengre enn %d dager","default-single":"Vennligst velg ein dato","default-less":"Vennligst velg ein datoperiode mindre enn %d dager","default-range":"Vennligst velg ein datoperiode mellom %d og %d dager","default-default":"Vennligst velg ein datoperiode",time:"Tid",hour:"Time",minute:"Minutter"},nl:{selected:"Geselecteerd:",day:"Dag",days:"Dagen",apply:"Ok","week-1":"ma","week-2":"di","week-3":"wo","week-4":"do","week-5":"vr","week-6":"za","week-7":"zo","month-name":["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],shortcuts:"Snelkoppelingen","custom-values":"Aangepaste waarden",past:"Verleden",following:"Komend",previous:"Vorige","prev-week":"Week","prev-month":"Maand","prev-year":"Jaar",next:"Volgende","next-week":"Week","next-month":"Maand","next-year":"Jaar","less-than":"Interval moet langer dan %d dagen zijn","more-than":"Interval mag niet minder dan %d dagen zijn","default-more":"Selecteer een interval langer dan %dagen","default-single":"Selecteer een datum","default-less":"Selecteer een interval minder dan %d dagen","default-range":"Selecteer een interval tussen %d en %d dagen","default-default":"Selecteer een interval",time:"Tijd",hour:"Uur",minute:"Minuut"},ru:{selected:"Выбрано:",day:"День",days:"Дней",apply:"Применить","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"вс","month-name":["январь","февраль","март","апрель","май","июнь","июль","август","сентябрь","октябрь","ноябрь","декабрь"],shortcuts:"Быстрый выбор","custom-values":"Пользовательские значения",past:"Прошедшие",following:"Следующие",previous:"   ","prev-week":"Неделя","prev-month":"Месяц","prev-year":"Год",next:"   ","next-week":"Неделя","next-month":"Месяц","next-year":"Год","less-than":"Диапазон не может быть больше %d дней","more-than":"Диапазон не может быть меньше %d дней","default-more":"Пожалуйста выберите диапазон больше %d дней","default-single":"Пожалуйста выберите дату","default-less":"Пожалуйста выберите диапазон меньше %d дней","default-range":"Пожалуйста выберите диапазон между %d и %d днями","default-default":"Пожалуйста выберите диапазон",time:"Время",hour:"Часы",minute:"Минуты"},uk:{selected:"Вибрано:",day:"День",days:"Днів",apply:"Застосувати","week-1":"пн","week-2":"вт","week-3":"ср","week-4":"чт","week-5":"пт","week-6":"сб","week-7":"нд","month-name":["січень","лютий","березень","квітень","травень","червень","липень","серпень","вересень","жовтень","листопад","грудень"],shortcuts:"Швидкий вибір","custom-values":"Значення користувача",past:"Минулі",following:"Наступні",previous:"   ","prev-week":"Тиждень","prev-month":"Місяць","prev-year":"Рік",next:"   ","next-week":"Тиждень","next-month":"Місяць","next-year":"Рік","less-than":"Діапазон не може бути більш ніж %d днів","more-than":"Діапазон не може бути меньш ніж %d днів","default-more":"Будь ласка виберіть діапазон більше %d днів","default-single":"Будь ласка виберіть дату","default-less":"Будь ласка виберіть діапазон менше %d днів","default-range":"Будь ласка виберіть діапазон між %d та %d днями","default-default":"Будь ласка виберіть діапазон",time:"Час",hour:"Години",minute:"Хвилини"},pl:{selected:"Wybrany:",day:"Dzień",days:"Dni",apply:"Zamknij","week-1":"pon","week-2":"wt","week-3":"śr","week-4":"czw","week-5":"pt","week-6":"so","week-7":"nd","month-name":["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],shortcuts:"Skróty","custom-values":"Niestandardowe wartości",past:"Przeszłe",following:"Następne",previous:"Poprzednie","prev-week":"tydzień","prev-month":"miesiąc","prev-year":"rok",next:"Następny","next-week":"tydzień","next-month":"miesiąc","next-year":"rok","less-than":"Okres nie powinien być dłuższy niż %d dni","more-than":"Okres nie powinien być krótszy niż %d ni","default-more":"Wybierz okres dłuższy niż %d dni","default-single":"Wybierz datę","default-less":"Wybierz okres krótszy niż %d dni","default-range":"Wybierz okres trwający od %d do %d dni","default-default":"Wybierz okres",time:"Czas",hour:"Godzina",minute:"Minuta"},se:{selected:"Vald:",day:"dag",days:"dagar",apply:"godkänn","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lö","week-7":"sö","month-name":["januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december"],shortcuts:"genvägar","custom-values":"Anpassade värden",past:"över",following:"följande",previous:"förra","prev-week":"vecka","prev-month":"månad","prev-year":"år",next:"nästa","next-week":"vecka","next-month":"måned","next-year":"år","less-than":"Datumintervall bör inte vara mindre än %d dagar","more-than":"Datumintervall bör inte vara mer än %d dagar","default-more":"Välj ett datumintervall längre än %d dagar","default-single":"Välj ett datum","default-less":"Välj ett datumintervall mindre än %d dagar","default-range":"Välj ett datumintervall mellan %d och %d dagar","default-default":"Välj ett datumintervall",time:"tid",hour:"timme",minute:"minut"},pt:{selected:"Selecionado:",day:"Dia",days:"Dias",apply:"Fechar","week-1":"seg","week-2":"ter","week-3":"qua","week-4":"qui","week-5":"sex","week-6":"sab","week-7":"dom","week-number":"N","month-name":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],shortcuts:"Atalhos","custom-values":"Valores Personalizados",past:"Passado",following:"Seguinte",previous:"Anterior","prev-week":"Semana","prev-month":"Mês","prev-year":"Ano",next:"Próximo","next-week":"Próxima Semana","next-month":"Próximo Mês","next-year":"Próximo Ano","less-than":"O período selecionado não deve ser maior que %d dias","more-than":"O período selecionado não deve ser menor que %d dias","default-more":"Selecione um período superior a %d dias","default-single":"Selecione uma data","default-less":"Selecione um período inferior a %d dias","default-range":"Selecione um período de %d a %d dias","default-default":"Selecione um período",time:"Tempo",hour:"Hora",minute:"Minuto"},tc:{selected:"已選擇:",day:"天",days:"天",apply:"確定","week-1":"一","week-2":"二","week-3":"三","week-4":"四","week-5":"五","week-6":"六","week-7":"日","week-number":"週","month-name":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],shortcuts:"快速選擇",past:"過去",following:"將來",previous:"   ","prev-week":"上週","prev-month":"上個月","prev-year":"去年",next:"   ","next-week":"下週","next-month":"下個月","next-year":"明年","less-than":"所選日期範圍不能大於%d天","more-than":"所選日期範圍不能小於%d天","default-more":"請選擇大於%d天的日期範圍","default-less":"請選擇少於%d天的日期範圍","default-range":"請選擇%d天到%d天的日期範圍","default-single":"請選擇一個日期","default-default":"請選擇一個日期範圍",time:"日期",hour:"小時",minute:"分鐘"},ja:{selected:"選択しました:",day:"日",days:"日",apply:"確定","week-1":"月","week-2":"火","week-3":"水","week-4":"木","week-5":"金","week-6":"土","week-7":"日","month-name":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],shortcuts:"クイック選択",past:"過去",following:"将来",previous:"   ","prev-week":"先週","prev-month":"先月","prev-year":"昨年",next:"   ","next-week":"来週","next-month":"来月","next-year":"来年","less-than":"日付の範囲は％d日以上にすべきではありません","more-than":"日付の範囲は％d日を下回ってはいけません","default-more":"％d日よりも長い期間を選択してください","default-less":"％d日未満の期間を選択してください","default-range":"％d日と％d日の間の日付範囲を選択してください","default-single":"日付を選択してください","default-default":"日付範囲を選択してください",time:"時間",hour:"時間",minute:"分"},da:{selected:"Valgt:",day:"Dag",days:"Dage",apply:"Luk","week-1":"ma","week-2":"ti","week-3":"on","week-4":"to","week-5":"fr","week-6":"lø","week-7":"sø","month-name":["januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december"],shortcuts:"genveje","custom-values":"Brugerdefinerede værdier",past:"Forbi",following:"Følgende",previous:"Forrige","prev-week":"uge","prev-month":"måned","prev-year":"år",next:"Næste","next-week":"uge","next-month":"måned","next-year":"år","less-than":"Dato interval bør ikke være med end %d dage","more-than":"Dato interval bør ikke være mindre end %d dage","default-more":"Vælg datointerval længere end %d dage","default-single":"Vælg dato","default-less":"Vælg datointerval mindre end %d dage","default-range":"Vælg datointerval mellem %d og %d dage","default-default":"Vælg datointerval",time:"tid",hour:"time",minute:"minut"},fi:{selected:"Valittu:",day:"Päivä",days:"Päivää",apply:"Sulje","week-1":"ma","week-2":"ti","week-3":"ke","week-4":"to","week-5":"pe","week-6":"la","week-7":"su","week-number":"V","month-name":["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],shortcuts:"Pikavalinnat","custom-values":"Mukautetut Arvot",past:"Menneet",following:"Tulevat",previous:"Edellinen","prev-week":"Viikko","prev-month":"Kuukausi","prev-year":"Vuosi",next:"Seuraava","next-week":"Viikko","next-month":"Kuukausi","next-year":"Vuosi","less-than":"Aikajakson tulisi olla vähemmän kuin %d päivää","more-than":"Aikajakson ei tulisi olla vähempää kuin %d päivää","default-more":"Valitse pidempi aikajakso kuin %d päivää","default-single":"Valitse päivä","default-less":"Valitse lyhyempi aikajakso kuin %d päivää","default-range":"Valitse aikajakso %d ja %d päivän väliltä","default-default":"Valitse aikajakso",time:"Aika",hour:"Tunti",minute:"Minuutti"},cat:{selected:"Seleccionats:",day:"Dia",days:"Dies",apply:"Tanca","week-1":"Dl","week-2":"Dm","week-3":"Dc","week-4":"Dj","week-5":"Dv","week-6":"Ds","week-7":"Dg","week-number":"S","month-name":["gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre"],shortcuts:"Dreçeres","custom-values":"Valors personalitzats",past:"Passat",following:"Futur",previous:"Anterior","prev-week":"Setmana","prev-month":"Mes","prev-year":"Any",next:"Següent","next-week":"Setmana","next-month":"Mes","next-year":"Any","less-than":"El període no hauria de ser de més de %d dies","more-than":"El període no hauria de ser de menys de %d dies","default-more":"Perfavor selecciona un període més gran de %d dies","default-single":"Perfavor selecciona una data","default-less":"Perfavor selecciona un període de menys de %d dies","default-range":"Perfavor selecciona un període d'entre %d i %d dies","default-default":"Perfavor selecciona un període",time:"Temps",hour:"Hora",minute:"Minut"},sk:{selected:"Vybrané:",day:"Deň",days:"Dni",apply:"Zavrieť","week-1":"po","week-2":"út","week-3":"st","week-4":"št","week-5":"pi","week-6":"so","week-7":"ne","week-number":"T","month-name":["január","február","marec","apríl","máj","jún","júl","august","september","október","november","december"],shortcuts:"Skratky","custom-values":"Vlastné hodnoty",past:"po",following:"nasledujúci",previous:"predchádzajúci","prev-week":"týždeň","prev-month":"mesiac","prev-year":"rok",next:"ďalší","next-week":"týždeň","next-month":"mesiac","next-year":"rok","less-than":"Rozsah dátumu by nemal byť väčší ako %d dní","more-than":"Rozsah dátumu by nemal byť menší ako %d dní","default-more":"Prosím zvoľte rozsah dlhší ako %d dní","default-single":"Prosím zvoľte dátum","default-less":"Prosím zvoľte rozsah menší ako %d dní","default-range":"Prosím zvoľte rozsah medzi %d a %d dňami","default-default":"Prosím zvoľte rozsah",time:"Čas",hour:"Hodina",minute:"Minúta"}},U.fn.dateRangePicker=function(f){f||(f={}),(f=U.extend(!0,{autoClose:!1,format:"YYYY-MM-DD",separator:" to ",language:"auto",startOfWeek:"sunday",getValue:function(){return U(this).val()},setValue:function(e){U(this).attr("readonly")||U(this).is(":disabled")||e==U(this).val()||U(this).val(e)},startDate:!1,endDate:!1,time:{enabled:!1},minDays:0,maxDays:0,showShortcuts:!1,shortcuts:{},customShortcuts:[],inline:!1,container:"body",alwaysOpen:!1,singleDate:!1,lookBehind:!1,batchMode:!1,duration:200,stickyMonths:!1,dayDivAttrs:[],dayTdAttrs:[],selectForward:!1,selectBackward:!1,applyBtnClass:"",singleMonth:"auto",hoveringTooltip:function(e,t,a){return 1'+f.customTopBar+"
"):(t+='
'+K("selected")+' ...',f.singleDate||(t+=' '+f.separator+' ... (3 '+K("days")+")"),t+="
",t+='
error
default
'),t+='',t+="");var a=f.showWeekNumbers?6:5,n="<";f.customArrowPrevSymbol&&(n=f.customArrowPrevSymbol);var r=">";if(f.customArrowNextSymbol&&(r=f.customArrowNextSymbol),t+='
'+E()+"
'+n+' '+(f.singleDate||!f.stickyMonths?''+r+"":"")+'
",f.singleMonth||(t+='
'+function(){for(var e=['
'],t=0;t<20;t++)e.push('
');return e.push("
"),e.join("")}()+'
'+E()+"
'+(f.stickyMonths?"":''+n+"")+' '+r+'
"),t+='
',f.singleDate||(t+='
'),t+='
',t+='
',f.showShortcuts){t+='
'+K("shortcuts")+"";var s=f.shortcuts;if(s){var o;if(s["prev-days"]&&0'+K("past");for(var i=0;i'+o+"";t+=""}if(s["next-days"]&&0'+K("following");for(var i=0;i'+o+"";t+=""}if(s.prev&&0'+K("previous");for(var i=0;i'+o+"";t+=""}if(s.next&&0'+K("next");for(var i=0;i'+o+"";t+=""}}if(f.customShortcuts)for(var i=0;i'+d.name+""}t+="
"}if(f.showCustomValues&&(t+='
'+(f.customValueLabel||K("custom-values"))+"",f.customValues))for(var i=0;i'+l.name+""}return U(t+="
")}().hide()).append('
'),U(f.container).append(m),f.inline?m.addClass("inline-wrapper"):i();f.alwaysOpen&&m.find(".apply-btn").hide();var e=_();if(G(e),f.time.enabled)if(f.startDate&&f.endDate||f.start&&f.end)Y(Q(f.start||f.startDate).toDate(),"time1"),Y(Q(f.end||f.endDate).toDate(),"time2");else{var a=f.defaultEndTime?f.defaultEndTime:e;Y(e,"time1"),Y(a,"time2")}var n="";n=f.singleDate?K("default-single"):f.minDays&&f.maxDays?K("default-range"):f.minDays?K("default-more"):f.maxDays?K("default-less"):K("default-default");m.find(".default-top").html(n.replace(/\%d/,f.minDays).replace(/\%d/,f.maxDays)),f.singleMonth?m.addClass("single-month"):m.addClass("two-months");setTimeout(function(){l(),s=!0},0),m.on("click",function(e){e.stopPropagation()}),U(document).on("click.datepicker",Z),m.find(".next").on("click",function(){f.stickyMonths?function(e){var t=F(f.month1),a=F(f.month2);if(q(a))return;if(!f.singleDate&&0<=L(t,a))return;O(t,"month1"),O(a,"month2"),C()}():function(e){var t=U(e).parents("table").hasClass("month2"),a=t?f.month2:f.month1;if(a=F(a),!f.singleMonth&&!f.singleDate&&!t&&0<=L(a,f.month2)||q(a))return;O(a,t?"month2":"month1"),I()}(this)}),m.find(".prev").on("click",function(){f.stickyMonths?function(e){var t=R(f.month1),a=R(f.month2);if(q(t))return;if(!f.singleDate&&L(a,t)<=0)return;O(a,"month2"),O(t,"month1"),C()}():function(e){var t=U(e).parents("table").hasClass("month2"),a=t?f.month2:f.month1;if(a=R(a),t&&L(a,f.month1)<=0||q(a))return;O(a,t?"month2":"month1"),I()}(this)}),m.attr("unselectable","on").css("user-select","none").on("selectstart",function(e){return e.preventDefault(),!1}),m.find(".apply-btn").on("click",function(){B();var e=W(new Date(f.start))+f.separator+W(new Date(f.end));U(t).trigger("datepicker-apply",{value:e,date1:new Date(f.start),date2:new Date(f.end)})}),m.find("[custom]").on("click",function(){var e=U(this).attr("custom");f.start=!1,f.end=!1,m.find(".day.checked").removeClass("checked"),f.setValue.call(o,e),M(),S(!0),C(),f.autoClose&&B()}),m.find("[shortcut]").on("click",function(){var e,t=U(this).attr("shortcut"),a=new Date,n=!1;if(-1!=t.indexOf("day")){var r=parseInt(t.split(",",2)[1],10);n=new Date((new Date).getTime()+864e5*r),a=new Date(a.getTime()+864e5*(0f.end){var a=f.end;f.end=v(f.start),f.start=p(a),f.time.enabled&&f.swapTime&&(u("time1",f.start),u("time2",f.end))}f.start=parseInt(f.start),f.end=parseInt(f.end),b(),f.start&&!f.end&&(U(n).trigger("datepicker-first-date-selected",{date1:new Date(f.start)}),y(e)),w(),M(),S(),C(),x()}}function g(e){if(e=parseInt(e,10),f.startDate&&H(e,f.startDate)<0)return!1;if(f.endDate&&0f.maxDays)return!1;if(0f.start)return!1;if(f.beforeShowDay&&"function"==typeof f.beforeShowDay){for(var t=!0,a=e;1f.start&&(a-=864e5),a'+e.attr("data-tooltip")+"";else if(!e.hasClass("invalid"))if(f.singleDate)m.find(".day.hovering").removeClass("hovering"),e.addClass("hovering");else if(m.find(".day").each(function(){var e=parseInt(U(this).attr("time"));f.start,f.end;e==t?U(this).addClass("hovering"):U(this).removeClass("hovering"),f.start&&!f.end&&(f.starte&&t<=e)?U(this).addClass("hovering"):U(this).removeClass("hovering")}),f.start&&!f.end){var n=z(t,f.start);f.hoveringTooltip&&("function"==typeof f.hoveringTooltip?a=f.hoveringTooltip(n,f.start,t):!0===f.hoveringTooltip&&1f.maxDays?(f.start=!1,f.end=!1,m.find(".day").removeClass("checked"),m.find(".drp_top-bar").removeClass("normal").addClass("error").find(".error-top").html(K("less-than").replace("%d",f.maxDays))):f.minDays&&et.getTime()){var n=t;t=e,e=n,n=null}var r=!0;if(f.startDate&&H(e,f.startDate)<0&&(r=!1),f.endDate&&0'+A(a)+"";if(!f.monthSelect)return n;var r=!!f.startDate&&Q(f.startDate).add(f.singleMonth||"month2"!==t?0:1,"month"),s=!!f.endDate&&Q(f.endDate).add(f.singleMonth||"month1"!==t?0:-1,"month"),o=r&&e.isSame(r,"year")?r.get("month"):0,i=s&&e.isSame(s,"year")?s.get("month"):11,d=Math.min(o,a),l=Math.max(i,a);if(d===l)return n;return P("month",V({minSelectable:o,maxSelectable:i,minVisible:d,maxVisible:l},a,function(e){return A(e)}))}(e=Q(e).toDate(),t),n=function(e,t){var a=(e=Q(e)).get("year"),n='
'+a+"
";if(!f.yearSelect)return n;var r=f.yearSelect&&"function"==typeof f.yearSelect,s=!!f.startDate&&Q(f.startDate).add(f.singleMonth||"month2"!==t?0:1,"month"),o=!!f.endDate&&Q(f.endDate).add(f.singleMonth||"month1"!==t?0:-1,"month"),i=r?f.yearSelect(a):f.yearSelect.slice(),d=s?Math.max(i[0],s.get("year")):Math.min(i[0],a),l=o?Math.min(i[1],o.get("year")):Math.max(i[1],a),u=Math.min(d,a),m=Math.max(l,a);if(u===m)return n;return P("year",V({minSelectable:d,maxSelectable:l,minVisible:u,maxVisible:m},a))}(e,t);m.find("."+t+" .month-name").html(a+" "+n),m.find("."+t+" tbody").html(function(e){var t=[];e.setDate(1);new Date(e.getTime()-864e5);var a,n,r=new Date,s=e.getDay();0===s&&"monday"===f.startOfWeek&&(s=7);if(0");for(var i=0;i<7;i++){var m="monday"==f.startOfWeek?i+1:i;a=t[7*u+m];var h=Q(a.time).format("L")==Q(r).format("L");if(a.extraClass="",a.tooltip="",a.valid&&f.beforeShowDay&&"function"==typeof f.beforeShowDay){var c=f.beforeShowDay(Q(a.time).toDate());a.valid=c[0],a.extraClass=c[1]||"",a.tooltip=c[2]||"",""!==a.tooltip&&(a.extraClass+=" has-tooltip ")}var p={time:a.time,"data-tooltip":a.tooltip,class:"day "+a.type+" "+a.extraClass+" "+(a.valid?"valid":"invalid")+" "+(h?"real-today":"")};0===i&&f.showWeekNumbers&&l.push('
'+f.getWeekNumber(a.date)+"
"),l.push("
"+J(a.time,a.day)+"
")}l.push("")}return l.join("")}(e)),f[t]=e,w(),m.find(".day").off("click").on("click",function(e){k(U(this))}),m.find(".day").off("mouseenter").on("mouseenter",function(e){y(U(this))}),m.find(".day").off("mouseleave").on("mouseleave",function(e){m.find(".date-range-length-tip").hide(),f.singleDate&&b()}),m.find(".week-number").off("click").on("click",function(e){var t,a,n,r;t=U(this),r=parseInt(t.attr("data-start-time"),10),f.startWeek?(m.find(".week-number-selected").removeClass("week-number-selected"),a=new Date(re.maxSelectable});return n}function P(e,t){for(var a,n='
"+a+"
"}function Y(e,t){m.find("."+t).append("
"+K("Time")+': 00:00
'),u(t,e)}function A(e){return K("month-name")[e]}function W(e){return Q(e).format(f.format)}function I(){C();var e=parseInt(Q(f.month1).format("YYYYMM")),t=parseInt(Q(f.month2).format("YYYYMM")),a=Math.abs(e-t);1"+K("week-number")+"":"";return"monday"==f.startOfWeek?e+""+K("week-1")+""+K("week-2")+""+K("week-3")+""+K("week-4")+""+K("week-5")+""+K("week-6")+""+K("week-7")+"":e+""+K("week-7")+""+K("week-1")+""+K("week-2")+""+K("week-3")+""+K("week-4")+""+K("week-5")+""+K("week-6")+""}function q(e){return e=Q(e),!(!f.startDate||!e.endOf("month").isBefore(f.startDate))||!(!f.endDate||!e.startOf("month").isAfter(f.endDate))}function $(e,t,r){var s=U.extend(!0,{},e);U.each(t,function(e,t){var a=t(r);for(var n in a)s.hasOwnProperty(n)?s[n]+=a[n]:s[n]=a[n]});var a="";for(var n in s)s.hasOwnProperty(n)&&(a+=n+'="'+s[n]+'" ');return a}function J(e,t){return f.showDateFilter&&"function"==typeof f.showDateFilter?f.showDateFilter(e,t):t}function K(e){var t=e.toLowerCase(),a=e in r?r[e]:t in r?r[t]:null,n=U.dateRangePickerLanguages.default;return null==a&&(a=e in n?n[e]:t in n?n[t]:""),a}function _(){var e=f.defaultTime?f.defaultTime:new Date;return f.lookBehind?(f.startDate&&L(e,f.startDate)<0&&(e=F(Q(f.startDate).toDate())),f.endDate&&0>>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', + customArrowNextSymbol: '', + getValue: function() + { + return $(this).find('span').html(); + }, + setValue: function(s, s1, s2) { + if (s) { + $(this).find('span').html(s.replace('to', '  ')); + } else { + $(this).find('span').html( + RangePickerCheckin + '    ' + RangePickerCheckout + ); + } + } + } + $.each(opt, function(index) { + delete custom_opt[index]; + }); + + $.extend(true, opt, custom_opt); + + } + + var args = Array.prototype.slice.call(arguments,0); + return dateRangePickerOrg.apply(this, args); + } +})(jQuery); \ No newline at end of file diff --git a/js/validate.js b/js/validate.js index 85b041fbb..b8c011e0e 100644 --- a/js/validate.js +++ b/js/validate.js @@ -184,9 +184,7 @@ function validate_field(that) var selector = '#id_country'; if ($(that).attr('name') == 'postcode_invoice') selector += '_invoice'; - var id_country = $(selector + ' option:selected').val(); - if (typeof(countriesNeedZipCode[id_country]) != 'undefined' && typeof(countries[id_country]) != 'undefined') var result = window['validate_'+$(that).attr('data-validate')]($(that).val(), countriesNeedZipCode[id_country], countries[id_country]['iso_code']); } diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js index d92610635..a355d77bc 100644 --- a/modules/blockcart/ajax-cart.js +++ b/modules/blockcart/ajax-cart.js @@ -134,26 +134,28 @@ var ajaxCart = { var dateFrom = $(this).attr('cat_rm_check_in'); var dateTo = $(this).attr('cat_rm_check_out'); - + var occupancy = getBookingOccupancyDetails($(this).closest('.booking_room_fields')); /* By Webkul * Note : In our case minimalQuantity is taken from Qty. field */ // var minimalQuantity = parseInt($(this).data('minimal_quantity')); - var minimalQuantity = parseInt($(this).data('minimal_quantity')); - var minimalQuantity = $("#cat_quantity_wanted_" + idProduct).val(); - if (!minimalQuantity) - minimalQuantity = 1; - if ($(this).prop('disabled') != 'disabled') - ajaxCart.add(idProduct, idProductAttribute, false, this, minimalQuantity, null, dateFrom, dateTo); + // var minimalQuantity = parseInt($(this).data('minimal_quantity')); + // var minimalQuantity = $("#quantity_wanted_" + idProduct).val(); + // if (!minimalQuantity) + // minimalQuantity = 1; + if ($(this).prop('disabled') != 'disabled' && occupancy) + ajaxCart.add(idProduct, idProductAttribute, false, this, occupancy, null, dateFrom, dateTo); }); //for product page 'add' button... if ($('.cart_block').length) { - $(document).off('click', '#add_to_cart button').on('click', '#add_to_cart button', function(e) { + $(document).off('click', '#add_to_cartadd_to_cart button').on('click', '#add_to_cart button', function(e) { e.preventDefault(); - var date_from = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - var date_to = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); - ajaxCart.add($('#product_page_product_id').val(), $('#idCombination').val(), true, null, $('#quantity_wanted').val(), null, date_from, date_to); - + var date_from = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_in').val())); + var date_to = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_out').val())); + var occupancy = getBookingOccupancyDetails($(this).closest('.booking_room_fields')); + if (occupancy) { + ajaxCart.add($('#product_page_product_id').val(), $('#idCombination').val(), true, null, occupancy, null, date_from, date_to); + } }); } @@ -214,8 +216,8 @@ var ajaxCart = { /*by webkul*/ if (pagename == 'product') { - dateFrom = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - dateTo = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); + dateFrom = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_in').val())); + dateTo = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_out').val())); } else if (pagename == 'category') { dateFrom = $('#check_in_time').val(); dateTo = $('#check_out_time').val(); @@ -319,7 +321,7 @@ var ajaxCart = { // close fancybox updateFancyBox: function() {}, // add a product in the cart via ajax - add: function(idProduct, idCombination, addedFromProductPage, callerElement, quantity, whishlist, dateFrom, dateTo) { + add: function(idProduct, idCombination, addedFromProductPage, callerElement, occupancy, whishlist, dateFrom, dateTo) { if (addedFromProductPage && !checkCustomizations()) { if (contentOnly) { @@ -346,8 +348,9 @@ var ajaxCart = { if (addedFromProductPage) { $('#add_to_cart button').prop('disabled', 'disabled').addClass('disabled'); $('.filled').removeClass('filled'); - } else + } else { $(callerElement).prop('disabled', 'disabled'); + } if ($('.cart_block_list').hasClass('collapsed')) this.expand(); @@ -365,7 +368,7 @@ var ajaxCart = { async: true, cache: false, dataType: "json", - data: 'controller=cart&add=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&roomDemands=' + JSON.stringify(roomDemands) + '&token=' + static_token + ((parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination) : '' + '&id_customization=' + ((typeof customizationId !== 'undefined') ? customizationId : 0)), + data: 'controller=cart&add=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&ajax=true&occupancy=' + JSON.stringify(occupancy) + '&id_product=' + idProduct + '&roomDemands=' + JSON.stringify(roomDemands) + '&token=' + static_token + ((parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination) : '' + '&id_customization=' + ((typeof customizationId !== 'undefined') ? customizationId : 0)), success: function(jsonData, textStatus, jqXHR) { /*by webkul checking and setting availability of rooms*/ /*for product page add to cart quantity management*/ @@ -375,7 +378,7 @@ var ajaxCart = { } else { $('.num_quantity_alert').hide(); } - $("#max_avail_type_qty").val(jsonData.avail_rooms); + $(".max_avail_type_qty").val(jsonData.avail_rooms); $(".num_searched_avail_rooms").text(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { @@ -388,18 +391,17 @@ var ajaxCart = { if (pagename == 'category') { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $(callerElement).closest(".room_cont").find(".rm_left").show(); } else { - $("cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $(callerElement).closest(".room_cont").find(".rm_left").hide(); } /*for category page add to cart quantity management*/ - - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); + $(callerElement).closest(".room_cont").find(".remain_rm_qty").text(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').hide(); + $(callerElement).closest(".room_cont").hide(); } - //$('#cat_quantity_wanted_'+idProduct).val(1); + //$('#quantity_wanted_'+idProduct).val(1); } @@ -416,22 +418,27 @@ var ajaxCart = { if (jsonData.crossSelling) $('.crossseling').html(jsonData.crossSelling); - if (idCombination) - $(jsonData.products).each(function() { - if (this.id != undefined && this.id == parseInt(idProduct) && this.idCombination == parseInt(idCombination)) - if (contentOnly) - window.parent.ajaxCart.updateLayer(this); - else - ajaxCart.updateLayer(this); - }); - else - $(jsonData.products).each(function() { - if (this.id != undefined && this.id == parseInt(idProduct)) - if (contentOnly) - window.parent.ajaxCart.updateLayer(this); - else - ajaxCart.updateLayer(this); - }); + // if (idCombination) + // $(jsonData.products).each(function() { + // if (this.id != undefined && this.id == parseInt(idProduct) && this.idCombination == parseInt(idCombination)) + // if (contentOnly) + // window.parent.ajaxCart.updateLayer(this); + // else + // ajaxCart.updateLayer(this); + // }); + // else + // $(jsonData.products).each(function() { + // if (this.id != undefined && this.id == parseInt(idProduct)) + // if (contentOnly) + // window.parent.ajaxCart.updateLayer(this); + // else { + // ajaxCart.updateLayer(this); + // } + // }); + if (jsonData.last_added_product) { + ajaxCart.updateLayer(jsonData.last_added_product); + + } if (contentOnly) parent.$.fancybox.close(); } else { @@ -444,7 +451,9 @@ var ajaxCart = { else $(callerElement).removeProp('disabled'); } - + if (!addedFromProductPage) { + resetOccupancyField($(callerElement).closest('.booking_room_fields').find('.booking_occupancy_wrapper')); + } emptyCustomizations(); }, @@ -505,8 +514,8 @@ var ajaxCart = { /*by webkul checking and setting availability of rooms*/ /*for product page add to cart quantity management*/ if (pagename == 'product') { - var date_checkIn = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_in').val())); - var date_checkOut = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate(ajaxCart.dateFormat, $('#room_check_out').val())); + var date_checkIn = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_in').val())); + var date_checkOut = $.datepicker.formatDate('yy-mm-dd', $.datepicker.parseDate('yy-mm-dd', $('#room_check_out').val())); var product_page_id_product = $('#product_page_product_id').val(); if (idProduct == product_page_id_product && dateFrom < date_checkOut && dateTo >= date_checkIn) { if (jsonData.avail_rooms <= room_warning_num) { @@ -514,7 +523,7 @@ var ajaxCart = { } else { $('.num_quantity_alert').hide(); } - $("#max_avail_type_qty").val(jsonData.avail_rooms); + $(".max_avail_type_qty").val(jsonData.avail_rooms); $(".num_searched_avail_rooms").text(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { @@ -529,18 +538,18 @@ var ajaxCart = { if (pagename == 'category') { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $(".room_cont").find('[data-id-product="'+idProduct+'"] .rm_left').show(); } else { - $("cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $("room_cont").find('[data-id-product="'+idProduct+'"] .rm_left').hide(); } /*for category page add to cart quantity management*/ - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); + $(".room_cont").find('[data-id-product="'+idProduct+'"] .remain_rm_qty').text(jsonData.avail_rooms); if (jsonData.avail_rooms == 0) { - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').hide(); + $(".room_cont").find('[data-id-product="'+idProduct+'"]').hide(); } - //$('#cat_quantity_wanted_'+idProduct).val(1); + //$('#quantity_wanted_'+idProduct).val(1); } ajaxCart.updateCart(jsonData); @@ -628,28 +637,27 @@ var ajaxCart = { data: 'controller=cart&delete=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&id_product=' + idProduct + '&ipa=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&id_address_delivery=' + idAddressDelivery + '&token=' + static_token + '&ajax=true', success: function(jsonData) { if (pagename == 'product') { - if (jsonData.avail_rooms <= room_warning_num) { - $('.num_quantity_alert').show(); - } else { - $('.num_quantity_alert').hide(); - } + // if (jsonData.avail_rooms <= room_warning_num) { + // $('.num_quantity_alert').show(); + // } else { + // $('.num_quantity_alert').hide(); + // } - $("#max_avail_type_qty").val(jsonData.avail_rooms); - $(".num_searched_avail_rooms").text(jsonData.avail_rooms); - $('.sold_out_alert').hide(); - disableRoomTypeDemands(0); - $('.unvail_rooms_cond_display').show(); + // $(".max_avail_type_qty").val(jsonData.avail_rooms); + // $(".num_searched_avail_rooms").text(jsonData.avail_rooms); + // $('.sold_out_alert').hide(); + // disableRoomTypeDemands(0); + // $('.unvail_rooms_cond_display').show(); } if (pagename == 'category') { // for category page.... - $(".cat_remain_rm_qty_" + idProduct).text(jsonData.avail_rooms); - - $(".cat_remain_rm_qty_" + idProduct).closest('.room_cont').show(0, function() { + $('.room_cont[data-id-product="'+idProduct+'"]').find(".remain_rm_qty").text(jsonData.avail_rooms); + $('.room_cont[data-id-product="'+idProduct+'"]').show(0, function() { if (jsonData.avail_rooms <= room_warning_num) { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').show(); + $('.room_cont[data-id-product="'+idProduct+'"]').find('.rm_left').show(); } else { - $(".cat_remain_rm_qty_" + idProduct).closest('.rm_left').hide(); + $('.room_cont[data-id-product="'+idProduct+'"]').find('.rm_left').hide(); } }); } @@ -1037,17 +1045,20 @@ var ajaxCart = { $('#layer_cart_product_price').text(product.price); //by webkul has to work on it more.. - if (pagename == 'product') { - $('#layer_cart_product_time_duration').text($('#room_check_in').val() + ' - ' + $('#room_check_out').val()); - $('#layer_cart_product_quantity').text($('#quantity_wanted').val()); - $('#quantity_wanted').val(1); - } - if (pagename == 'category') { - $('#layer_cart_product_time_duration').text($('#check_in_time').val() + ' - ' + $('#check_out_time').val()); - $('#layer_cart_product_quantity').text($('#cat_quantity_wanted_' + product.id).val()); - $('#cat_quantity_wanted_' + product.id).val(1); + $('#layer_cart_product_time_duration').text( + product.date_from + ' - ' + product.date_to + ); - } + let rooms = 0; + let adult = 0; + let children = 0; + $.each(product.occupancy, function(index, val) { + rooms++; + adult += parseInt(val.adult); + children += parseInt(val.children); + + }); + $('#layer_cart_product_quantity').text(getRoomTypeGuestOccupancyFormated(adult, children, rooms)); $('.layer_cart_img').html('' + product.name + ''); @@ -1216,4 +1227,48 @@ function getRoomsExtraDemands() }); return roomDemands; +} + +function getBookingOccupancyDetails(bookingform) +{ + let occupancy; + if (occupancy_wise_booking) { + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + occupancy = []; + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + return false; + } + } + occupancy.push({ + 'adult': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + return false; + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open') + occupancy = false; + } + } else { + occupancy = parseInt($(bookingform).find(".quantity_wanted").val()); + } + + return occupancy; } \ No newline at end of file diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 2ad83363e..c011e9992 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -195,6 +195,52 @@ class Blockcart extends Module 1 ); + $addedProduct = false; + // get currently added product if exists + if (!empty($params['cookie']->currentAddedProduct)) { + $addedProduct = json_decode($params['cookie']->currentAddedProduct, true); + $objProduct = new Product($addedProduct['id_product'], false, $this->context->language->id); + + $addedProduct['name'] = $objProduct->name; + $addedProduct['link'] = $this->context->link->getProductLink( + $objProduct->id, + $objProduct->link_rewrite, + $objProduct->category, + null, + null, + $this->context->cart->id_shop + ); + $image = Product::getCover($objProduct->id); + $image['id_product'] = $objProduct->id; + // Product::defineProductImage(array(Product::getCover($objProduct->id)['id_image']/), $this->id_lang) + $addedProduct['image'] = $this->context->link->getImageLink( + $objProduct->link_rewrite, + Product::defineProductImage($image, $this->context->language->id), + 'home_default' + ); + $addedProduct['image_cart'] = $this->context->link->getImageLink( + $objProduct->link_rewrite, + Product::defineProductImage($image, $this->context->language->id), + 'cart_default' + ); + $price = $addedProduct['price'] = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $objProduct->id, + $addedProduct['date_from'], + $addedProduct['date_to'], + $addedProduct['req_rm'] + ); + + if ($priceDisplayMethod == PS_TAX_EXC) { + $addedProduct['price'] = Tools::displayPrice($price['total_price_tax_incl']); + } else { + $addedProduct['price'] = Tools::displayPrice($price['total_price_tax_excl']); + } + $addedProduct['date_from'] = Tools::displayDate($addedProduct['date_from']); + $addedProduct['date_to'] = Tools::displayDate($addedProduct['date_to']); + + unset($this->context->cookie->currentAddedProduct); + } + $response = array( 'products' => $products, 'customizedDatas' => Product::getAllCustomizedDatas((int) ($params['cart']->id)), @@ -218,7 +264,7 @@ class Blockcart extends Module 'static_token' => Tools::getToken(false), 'free_shipping' => Tools::displayPrice($total_free_shipping), 'free_shipping_float' => $total_free_shipping, - + 'last_added_product' => $addedProduct, 'cart_booking_data' => $htlCartData, 'total_rooms_in_cart' => $totalRooms, ); diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index 6192288d3..f5ec9906f 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -24,7 +24,7 @@ *} {if isset($blockcart_top) && $blockcart_top} -
+
{/if}
@@ -67,11 +67,6 @@ {$product.name|truncate:30:'...':true|escape:'html':'UTF-8'}
- -
- {l s='Capacity' mod='blockcart'}: -  {$cart_booking_data[$data_k]['adult']} {l s='Adults' mod='blockcart'} & {$cart_booking_data[$data_k]['children']} {l s='Children' mod='blockcart'} -
{if isset($product.attributes_small)}
@@ -118,7 +113,7 @@ {foreach from=$cart_booking_data[$data_k]['date_diff'] key=data_k1 item=data_v} - {$data_v['data_form']|date_format:"%d %b %Y"} - {$data_v['data_to']|date_format:"%d %b %Y"} + {$data_v['data_form']|date_format:"%d-%m-%Y"} - {$data_v['data_to']|date_format:"%d-%m-%Y"} {$data_v['num_rm']} {convertPrice price=$data_v['amount']} @@ -271,11 +266,11 @@
- {l s='Rooms Quantity Added' mod='blockcart'}  -  + {if isset($occupancy_wise_booking) && $occupancy_wise_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms Quantity Added' mod='blockcart'}{/if}  - 
- {l s='Total Cart Cost of This Room Type' mod='blockcart'}  -  + {l s='Room Type Cost' mod='blockcart'}  - 
diff --git a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php index 547daedfa..4aaaf9f5a 100644 --- a/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php +++ b/modules/blockcart/controllers/front/checkroomavailabilityajaxprocess.php @@ -31,20 +31,16 @@ class BlockcartCheckRoomAvailabilityAjaxProcessModuleFrontController extends Mod )) { if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($idProduct)) { if ($idHotel = $roomTypeInfo['id_hotel']) { - if ($hotelRoomData = $objBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $idHotel, - $idProduct, - 1, - 0, - 0, - -1, - 0, - 0, - $idCart, - $idGuest - )) { + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $idHotel, + 'id_room_type' => $idProduct, + 'only_search_data' => 1, + 'id_cart' => $idCart, + 'id_guest' => $idGuest, + ); + if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) { $totalAvailRooms = $hotelRoomData['stats']['num_avail']; } } diff --git a/modules/hotelreservationsystem/classes/HotelBookingDemands.php b/modules/hotelreservationsystem/classes/HotelBookingDemands.php index c5f71cce6..6a162db59 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDemands.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDemands.php @@ -86,7 +86,7 @@ class HotelBookingDemands extends ObjectModel $idCurrency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); } $totalDemandsPrice = 0; - $sql = 'SELECT hb.`id_room`, hd.* FROM `'._DB_PREFIX_.'htl_booking_demands` hd + $sql = 'SELECT hb.`id_room`, hb.`adult`, hb.`children`, hd.* FROM `'._DB_PREFIX_.'htl_booking_demands` hd LEFT JOIN `'._DB_PREFIX_.'htl_booking_detail` hb ON (hd.`id_htl_booking` = hb.`id`) WHERE hd.`id_htl_booking` IN (SELECT `id` FROM `'._DB_PREFIX_.'htl_booking_detail` @@ -132,6 +132,8 @@ class HotelBookingDemands extends ObjectModel $demand['extra_demands_tax_label'] = $moduleObj->l('No tax', 'HotelBookingDemands'); } $roomDemands[$demand['id_room']]['id_room'] = $demand['id_room']; + $roomDemands[$demand['id_room']]['adult'] = $demand['adult']; + $roomDemands[$demand['id_room']]['children'] = $demand['children']; $roomDemands[$demand['id_room']]['extra_demands'][] = $demand; } unset($taxTemp); diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 3f020f1ff..38b01065b 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -60,6 +60,7 @@ class HotelBookingDetail extends ObjectModel public $room_num; public $adult; public $children; + public $child_ages; public $date_add; public $date_upd; @@ -72,6 +73,14 @@ class HotelBookingDetail extends ObjectModel const ALLOTMENT_AUTO = 1; const ALLOTMENT_MANUAL = 2; + // Search algorithm: Exact room types reults, All room types + const SEARCH_EXACT_ROOM_TYPE_ALGO = 1; + const SEARCH_ALL_ROOM_TYPE_ALGO = 2; + + // Search TYpe: Occupancy wise search, Normal search + const SEARCH_TYPE_OWS = 1; + const SEARCH_TYPE_NORMAL = 2; + public static $definition = array( 'table' => 'htl_booking_detail', 'primary' => 'id', @@ -111,6 +120,7 @@ class HotelBookingDetail extends ObjectModel 'check_out_time' => array('type' => self::TYPE_STRING, 'required' => true), 'adult' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'children' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), + 'child_ages' => array('type' => self::TYPE_STRING), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -154,20 +164,14 @@ class HotelBookingDetail extends ObjectModel public function getBookingDataParams($params) { - if (!isset($params['room_type'])) { - $params['room_type'] = 0; + if (!isset($params['id_room_type'])) { + $params['id_room_type'] = 0; } - if (!isset($params['adult'])) { - $params['adult'] = 0; + if (!isset($params['id_cart'])) { + $params['id_cart'] = 0; } - if (!isset($params['children'])) { - $params['children'] = 0; - } - if (!isset($params['num_rooms'])) { - $params['num_rooms'] = 1; - } - if (!isset($params['for_calendar'])) { - $params['for_calendar'] = 0; + if (!isset($params['id_guest'])) { + $params['id_guest'] = 0; } if (!isset($params['search_available'])) { $params['search_available'] = 1; @@ -181,21 +185,34 @@ class HotelBookingDetail extends ObjectModel if (!isset($params['search_unavai'])) { $params['search_unavai'] = 1; } - if (!isset($params['id_cart'])) { - $params['id_cart'] = 0; - } - if (!isset($params['id_guest'])) { - $params['id_guest'] = 0; - } if (!isset($params['search_cart_rms'])) { $params['search_cart_rms'] = 0; } + if (!isset($params['only_active_roomtype'])) { $params['only_active_roomtype'] = 1; } if (!isset($params['only_active_hotel'])) { $params['only_active_hotel'] = 1; } + if (!isset($params['occupancy'])) { + $params['occupancy'] = array(); + } + + if (!isset($params['ratting'])) { + $params['ratting'] = -1; + } + if (!isset($params['amenities'])) { + $params['amenities'] = 0; + } + if (!isset($params['price'])) { + $params['price'] = 0; + } + + if (!isset($params['only_search_data'])) { + $params['only_search_data'] = 0; + } + return $params; } @@ -204,12 +221,9 @@ class HotelBookingDetail extends ObjectModel * * @param [type] $date_from [Start date of booking] * @param [type] $date_to [End date of booking] - * @param [type] $hotel_id [Id of the hotel to which the room belongs] - * @param [type] $room_type [Id of the product to which the room belongs] - * @param int $adult [] - * @param int $children [] + * @param int $hotel_id [Id of the hotel to which the room belongs] + * @param int $id_room_type [Id of the product to which the room belongs] * @param int $num_rooms [Number of rooms booked for the period $date_from to $date_to] - * @param int $for_calendar [Used for calender and also for getting stats of rooms] * @param int $search_available [If you want only data information for available rooms] * @param int $search_partial [If you want only data information for partial rooms] * @param int $search_booked [If you want only data information for booked rooms] @@ -217,422 +231,1020 @@ class HotelBookingDetail extends ObjectModel * @param int $id_cart [Id of the cart to which the room belongs at the time of booking] * @param int $id_guest [Id guest of the customer Who booked the rooms] * @param int $search_cart_rms [If you want data of the current cart in the admin office] + * @param array $occupancy [search occupancy for room] * * @return [array] [Returns Array of rooms data ] * - * Note: Adult and children both are used for front category page only in available rooms - * Note :: $for_calendar is used both for calender and also for getting stats of rooms */ public function getBookingData($params) { $this->context = Context::getContext(); + // extract all keys and values of the array [$params] into variables and values extract($this->getBookingDataParams($params)); + if ($date_from && $date_to && $hotel_id) { $date_from = date('Y-m-d H:i:s', strtotime($date_from)); + $stayStartDate = date('Y-m-d', strtotime($date_from)); $date_to = date('Y-m-d H:i:s', strtotime($date_to)); - $obj_room_info = new HotelRoomInformation(); - $obj_rm_type = new HotelRoomType(); + $objRoomType = new HotelRoomType(); + $lengthOfStay = $this->getNumberOfDays($date_from, $date_to); - if ($room_types = $obj_rm_type->getIdProductByHotelId( + // Check LOS restriction for back-office + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + + if ($room_types = $objRoomType->getIdProductByHotelId( $hotel_id, - $room_type, + $id_room_type, $only_active_roomtype, $only_active_hotel )) { - $total_rooms = 0; - $num_booked = 0; - $num_unavail = 0; - $num_avail = 0; - $num_part_avai = 0; - $num_cart = 0; - $new_part_arr = array(); - $booking_data = array(); - $applyLosRestriction = true; + $allowedIdRoomTypes = implode(",", array_column($room_types, 'id_product')); + // Unavailable Rooms + if ($search_unavai) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + 'applyLosRestriction' => $applyLosRestriction, + ); + $unavailRoomTypes = $this->getSearchUnavailableRooms($params); + } + + // Cart Rooms + if ($search_cart_rms) { + $params = array( + 'idHotel' => $hotel_id, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + $cartRoomTypes = $this->getSearchCartRooms($params); + } + + // Available Rooms + if ($search_available) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'searchOccupancy' => $occupancy, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + 'applyLosRestriction' => $applyLosRestriction, + ); + $availableRoomTypes = $this->getSearchAvailableRooms($params); + if ($availableRoomTypes['unavailableRoomTypes'] && $search_unavai) { + foreach ($availableRoomTypes['unavailableRoomTypes'] as $idProduct => $roomTypeDetail) { + if (!isset($unavailRoomTypes[$idProduct])) { + $unavailRoomTypes[$idProduct] = array(); + } + + // FYI: used array_merge because we have int index + $unavailRoomTypes[$idProduct] = array_merge($unavailRoomTypes[$idProduct], $roomTypeDetail); + } + } + + $availableRoomTypes = $availableRoomTypes['availableRoomTypes']; + } + + // Booked Rooms + if ($search_booked) { + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idRoomType' => $id_room_type, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + $bookedRoomTypes = $this->getSearchBookedRooms($params); + } + + // Partially available Rooms if ($search_partial) { - $this->partAvaiDates = array(); - $this->allReqDates = $this->createDateRangeArray($date_from, $date_to, 1); + $params = array( + 'idHotel' => $hotel_id, + 'dateFrom' => $date_from, + 'dateTo' => $date_to, + 'idCart' => $id_cart, + 'idGuest' => $id_guest, + 'idRoomType' => $id_room_type, + 'searchOccupancy' => $occupancy, + 'allowedIdRoomTypes' => $allowedIdRoomTypes, + ); + + $partiallyAvailRoomTypes = $this->getSearchPartiallyAvailRooms($params); + + if ($partiallyAvailRoomTypes['unavailableRoomTypes'] && $search_unavai) { + foreach ($partiallyAvailRoomTypes['unavailableRoomTypes'] as $idProduct => $roomTypeDetail) { + if (!isset($unavailRoomTypes[$idProduct])) { + $unavailRoomTypes[$idProduct] = array(); + } + + // FYI: used array_merge because we have int index + $unavailRoomTypes[$idProduct] = array_merge($unavailRoomTypes[$idProduct], $roomTypeDetail); + } + } + + $partiallyAvailRoomsCount = $partiallyAvailRoomTypes['partiallyAvailRoomsCount']; + $partiallyAvailRoomTypes = $partiallyAvailRoomTypes['partiallyAvailRooms']; } - if (isset(Context::getContext()->employee->id)) { - if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { - $applyLosRestriction = false; - } - } + $roomTypesDetail = $objRoomType->getRoomTypeDetailByRoomTypeIds($allowedIdRoomTypes); + if ($roomTypesDetail) { + // Formate data for response + $finalSearchResponse = array( + 'rm_data' => array(), + 'stats' => array( + 'total_room_type' => count($room_types), + 'total_rooms' => 0, + 'max_avail_occupancy' => 0 + ), + ); + foreach ($roomTypesDetail as $roomTypeDetail) { + $finalSearchResponse['stats']['total_rooms'] += $roomTypeDetail['numberOfRooms']; + $idProduct = $roomTypeDetail['id_product']; - foreach ($room_types as $key => $room_type) { - if ($search_partial) { - $this->dltDates = array(); - } - - $total_rooms += $obj_room_info->getHotelRoomInfo($room_type['id_product'], $hotel_id, 1); - - // Get min & max LOS - $objRoomTypeRestriction = new HotelRoomTypeRestrictionDateRange(); - $losRestriction = $objRoomTypeRestriction->getRoomTypeLengthOfStay($room_type['id_product'], $date_from); - - $obj_product = new Product((int) $room_type['id_product']); - $product_name = $obj_product->name[Configuration::get('PS_LANG_DEFAULT')]; - - if ($search_cart_rms) { - if ($id_cart && $id_guest) { - $sql = 'SELECT cbd.`id_product`, cbd.`id_room`, cbd.`id_hotel`, cbd.`booking_type`, cbd.`comment`, rf.`room_num`, cbd.`date_from`, cbd.`date_to` - FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = cbd.`id_room`) - WHERE cbd.`id_hotel`='.(int)$hotel_id.' AND cbd.`id_product` ='.(int)$room_type['id_product'].' AND cbd.`id_cart` = '.(int)$id_cart.' AND cbd.`id_guest` ='.(int)$id_guest.' AND cbd.`is_refunded` = 0 AND cbd.`is_back_order` = 0'; - $cart_rooms = Db::getInstance()->executeS($sql); - } else { - $cart_rooms = array(); - } - $num_cart += count($cart_rooms); - } - - if ($search_booked) { - $sql = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment`, rf.`room_num`, bd.`date_from`, bd.`date_to` - FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) - WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product` ='.(int)$room_type['id_product'].' AND bd.`is_refunded` = 0 AND bd.`is_back_order` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\', bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.date_to >= \''.pSQL($date_to).'\')'; - - $booked_rooms = Db::getInstance()->executeS($sql); - - foreach ($booked_rooms as $booked_k => $booked_v) { - $booked_rooms[$booked_k]['detail'][] = array( - 'date_from' => $booked_v['date_from'], - 'date_to' => $booked_v['date_to'], - 'id_customer' => $booked_v['id_customer'], - 'booking_type' => $booked_v['booking_type'], - 'booking_status' => $booked_v['booking_status'], - 'comment' => $booked_v['comment'], - ); - - unset($booked_rooms[$booked_k]['date_from']); - unset($booked_rooms[$booked_k]['date_to']); - unset($booked_rooms[$booked_k]['id_customer']); - unset($booked_rooms[$booked_k]['booking_type']); - unset($booked_rooms[$booked_k]['booking_status']); - unset($booked_rooms[$booked_k]['comment']); - } - - $num_booked += count($booked_rooms); - } - - if ($search_unavai) { - $sql1 = 'SELECT `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` - FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product` ='.(int)$room_type['id_product'].' AND (`id_status` = '. HotelRoomInformation::STATUS_INACTIVE; - if ($applyLosRestriction) { - $sql1 .= ' OR ( DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') < '.(int)$losRestriction['min_los']; - if ((int)$losRestriction['max_los']) { - $sql1 .= ' OR DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') > '.(int)$losRestriction['max_los']; - } - $sql1 .= ')'; - } - $sql1 .= ')'; - - $sql2 = 'SELECT hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd. id_room = hri.`id`) - WHERE hri.`id_hotel`='.$hotel_id.' AND hri.`id_product` ='.$room_type['id_product'].' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND hrdd.`date_from` <= \''.pSql($date_from).'\' AND hrdd.`date_to` >= \''.pSql($date_to).'\''; - - $sql = $sql1.' UNION '.$sql2; - - $unavail_rooms = Db::getInstance()->executeS($sql); - $num_unavail += count($unavail_rooms); - } - - if ($search_available) { - $exclude_ids = 'SELECT `id_room` - FROM `'._DB_PREFIX_.'htl_booking_detail` - WHERE `is_back_order` = 0 AND `is_refunded` = 0 AND IF(`id_status` = '. self::STATUS_CHECKED_OUT.', ( - (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") <= \''.PSQL($date_to).'\') AND ( - (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.PSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `check_out` > \''.pSQL($date_from).'\' AND `check_out` <= \''.pSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `check_out` >= \''.pSQL($date_to).'\') OR - (`date_from` <= \''.pSQL($date_from).'\' AND `check_out` >= \''.pSQL($date_to).'\') - ) - ), ( - (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` > \''.pSQL($date_from).'\' AND `date_to` <= \''.PSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_to` <= \''.pSQL($date_to).'\') OR - (`date_from` >= \''.pSQL($date_from).'\' AND `date_from` < \''.pSQL($date_to).'\' AND `date_to` >= \''.pSQL($date_to).'\') OR - (`date_from` <= \''.pSQL($date_from).'\' AND `date_to` >= \''.pSQL($date_to).'\') - ))'; - - if (!empty($id_cart) && !empty($id_guest)) { - $exclude_ids .= ' UNION - SELECT `id_room` - FROM `'._DB_PREFIX_.'htl_cart_booking_data` - WHERE id_cart='.(int)$id_cart.' AND id_guest='.(int)$id_guest.' AND is_refunded = 0 AND is_back_order = 0 AND ((date_from <= \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_from).'\' AND date_to <= \''.pSQL($date_to).'\') OR (date_from > \''.pSQL($date_from).'\' AND date_to < \''.pSQL($date_to).'\') OR (date_from >= \''.pSQL($date_from).'\' AND date_from < \''.pSQL($date_to).'\' AND date_to >= \''.pSQL($date_to).'\') OR (date_from < \''.pSQL($date_from).'\' AND date_to > \''.pSQL($date_to).'\'))'; - } - - // For excludes temporary disable rooms - $exclude_ids .= ' UNION - SELECT hri.`id` AS id_room - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$room_type['id_product'].' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` <= \''.pSql($date_to).'\' AND hrdd.`date_to` >= \''.pSql($date_from).'\')'; - - $selectAvailRoomSearch = 'SELECT ri.`id` AS `id_room`, ri.`id_product`, ri.`id_hotel`, ri.`room_num`, ri.`comment` AS `room_comment`'; - - $joinAvailRoomSearch = ''; - - $whereAvailRoomSearch = 'WHERE ri.`id_hotel`='.(int)$hotel_id.' AND ri.`id_product`='.(int)$room_type['id_product'].' AND ri.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE; - - // Check min & max LOS restrictions - if ($applyLosRestriction) { - $whereAvailRoomSearch .= ' AND DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') >= '.(int)$losRestriction['min_los']; - // check max LOS restriction is greater than zero - if ((int)$losRestriction['max_los']) { - $whereAvailRoomSearch .= ' AND DATEDIFF(\''.$date_to.'\', \''.$date_from.'\') <= '.(int)$losRestriction['max_los']; - } - } - - $whereAvailRoomSearch .= ' AND ri.`id` NOT IN ('.$exclude_ids.')'; - - $groupByAvailRoomSearch = ''; - $orderByAvailRoomSearch = ''; - $orderWayAvailRoomSearch = ''; - - Hook::exec('actionAvailRoomSearchSqlModifier', - array( - 'select' => &$selectAvailRoomSearch, - 'join' => &$joinAvailRoomSearch, - 'where' => &$whereAvailRoomSearch, - 'group_by' => &$groupByAvailRoomSearch, - 'order_by' => &$orderByAvailRoomSearch, - 'order_way' => &$orderWayAvailRoomSearch, - 'params' => array( - 'id_hotel' => $hotel_id, - 'id_product' => $room_type['id_product'], - 'date_from' => $date_from, - 'date_to' => $date_to - ) - ) + $roomTypeSearchData = array( + 'name' => (new Product((int) $idProduct, false, $this->context->cookie->id_lang))->name, + 'id_product' => $idProduct, + 'adult' => $roomTypeDetail['adult'], + 'children' => $roomTypeDetail['children'], + 'max_adults' => $roomTypeDetail['max_adults'], + 'max_children' => $roomTypeDetail['max_children'], + 'max_guests' => $roomTypeDetail['max_guests'], + 'data' => array(), ); - $sql = $selectAvailRoomSearch; - $sql .= ' FROM `'._DB_PREFIX_.'htl_room_information` AS ri'; - $sql .= ' '.$joinAvailRoomSearch; - $sql .= ' '.$whereAvailRoomSearch; - $sql .= ' '.$groupByAvailRoomSearch; - $sql .= ' '.$orderByAvailRoomSearch; - $sql .= ' '.$orderWayAvailRoomSearch; + if ($search_unavai) { + $roomTypeSearchData['data']['unavailable'] = isset($unavailRoomTypes[$idProduct]) ? $unavailRoomTypes[$idProduct] : array(); - $avai_rooms = Db::getInstance()->executeS($sql); - $num_avail += count($avai_rooms); - } - - if ($search_partial) { - $sql1 = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`check_out`, bd.`date_to`) AS `date_to` - FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd - INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) - WHERE bd.`id_hotel`='.(int)$hotel_id.' AND bd.`id_product`='.(int)$room_type['id_product'].' AND rf.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE .' AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', ( - (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($date_from).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") < \''.PSQL($date_to).'\') AND ( - (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` >= \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`check_out` > \''.pSQL($date_from).'\' AND bd.`check_out` < \''.pSQL($date_to).'\') - ) - ), ( - (bd.`date_from` <= \''.pSQL($date_from).'\' AND bd.`date_to` > \''.pSQL($date_from).'\' AND bd.`date_to` < \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` >= \''.pSQL($date_to).'\') OR - (bd.`date_from` > \''.pSQL($date_from).'\' AND bd.`date_from` < \''.pSQL($date_to).'\' AND bd.`date_to` < \''.pSQL($date_to).'\') - ))'; - - $sql2 = 'SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, 0 AS `id_customer`, 0 AS `booking_type`, 0 AS `booking_status`, 0 AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to` - FROM `'._DB_PREFIX_.'htl_room_information` AS hri - INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product`='.(int)$room_type['id_product'].' AND - hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND ( - (hrdd.`date_from` <= \''.pSQL($date_from).'\' AND hrdd.`date_to` > \''.pSQL($date_from).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\') OR - (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` >= \''.pSQL($date_to).'\') OR - (hrdd.`date_from` > \''.pSQL($date_from).'\' AND hrdd.`date_from` < \''.pSQL($date_to).'\' AND hrdd.`date_to` < \''.pSQL($date_to).'\') - )'; - // $part_arr2 = Db::getInstance()->executeS($sql2); - // $part_arr = array_merge($part_arr1 ? $part_arr1 : array(), $part_arr2 ? $part_arr2 : array()); - - $sql = $sql1.' UNION '.$sql2; - // NOTE:: Before code if written to use "ORDER BY" with union - $sql = 'SELECT s.* - FROM ('.$sql.') AS s - ORDER BY s.`id_room`'; - $part_arr = Db::getInstance()->executeS($sql); - - $partial_avai_rooms = array(); - foreach ($part_arr as $pr_val) { - $partial_avai_rooms[$pr_val['id_room']]['id_product'] = $pr_val['id_product']; - $partial_avai_rooms[$pr_val['id_room']]['id_room'] = $pr_val['id_room']; - $partial_avai_rooms[$pr_val['id_room']]['id_hotel'] = $pr_val['id_hotel']; - $partial_avai_rooms[$pr_val['id_room']]['room_num'] = $pr_val['room_num']; - - if ($pr_val['id_customer']) { - $partial_avai_rooms[$pr_val['id_room']]['booked_dates'][] = array( - 'date_from' => $pr_val['date_from'], - 'date_to' => $pr_val['date_to'], - 'id_customer' => $pr_val['id_customer'], - 'booking_type' => $pr_val['booking_type'], - 'booking_status' => $pr_val['booking_status'], - 'comment' => $pr_val['room_comment'] - ); - } - - if (!isset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'])) { - if (($pr_val['date_from'] <= $date_from) && ($pr_val['date_to'] > $date_from) && ($pr_val['date_to'] < $date_to)) { - // from lower to middle range - - $forRange = $this->createDateRangeArray($pr_val['date_to'], $date_to, 0, $pr_val['id_room']); - $available_dates = $this->getPartialRange($forRange, $pr_val['id_room'], $key); - } elseif (($pr_val['date_from'] > $date_from) && ($pr_val['date_from'] < $date_to) && ($pr_val['date_to'] >= $date_to)) { - // from middle to higher range - - $forRange = $this->createDateRangeArray($date_from, $pr_val['date_from'], 0, $pr_val['id_room']); - $available_dates = $this->getPartialRange($forRange, $pr_val['id_room'], $key); - } elseif (($pr_val['date_from'] > $date_from) && ($pr_val['date_from'] < $date_to) && ($pr_val['date_to'] > $date_from) && ($pr_val['date_to'] < $date_to)) { - // between range - - $forRange1 = $this->createDateRangeArray($date_from, $pr_val['date_from'], 0, $pr_val['id_room']); - $init_range = $this->getPartialRange($forRange1, $pr_val['id_room'], $key); - - $forRange2 = $this->createDateRangeArray($pr_val['date_to'], $date_to, 0, $pr_val['id_room']); - $last_range = $this->getPartialRange($forRange2, $pr_val['id_room'], $key); - - $available_dates = $init_range + $last_range; - } - - $partial_avai_rooms[$pr_val['id_room']]['avai_dates'] = $available_dates; - } else { - /* - * Note :: createDateRangeArray function check and unset dates from allReqDates(array) but below it will only return array of date because dates already been removed from "if" condition - */ - $bk_dates = $this->createDateRangeArray($pr_val['date_from'], $pr_val['date_to'], 0, 0, 0); - if (count($bk_dates) >= 2) { - for ($i = 0; $i < count($bk_dates) - 1; ++$i) { - $dateJoin = strtotime($bk_dates[$i]); - - if (isset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'][$dateJoin])) { - if (isset($this->dltDates[$pr_val['id_room']]) && $this->dltDates[$pr_val['id_room']]) { - $this->allReqDates[] = $bk_dates[$i]; - } - unset($partial_avai_rooms[$pr_val['id_room']]['avai_dates'][$dateJoin]); - unset($this->partAvaiDates[$pr_val['id_room'].$dateJoin]); - } - } - } + if (!isset($finalSearchResponse['stats']['num_unavail'])) { + $finalSearchResponse['stats']['num_unavail'] = 0; } + $finalSearchResponse['stats']['num_unavail'] += count($roomTypeSearchData['data']['unavailable']); } - $rm_part_avai = count($partial_avai_rooms); - $num_part_avai += $rm_part_avai; - } - - // if (!$for_calendar) - // { - $booking_data['rm_data'][$key]['name'] = $product_name; - $booking_data['rm_data'][$key]['id_product'] = (int) $room_type['id_product']; - - if ($search_available) { - $booking_data['rm_data'][$key]['data']['available'] = $avai_rooms; - } - - if ($search_unavai) { - $booking_data['rm_data'][$key]['data']['unavailable'] = $unavail_rooms; - } - - if ($search_booked) { - $booking_data['rm_data'][$key]['data']['booked'] = $booked_rooms; - } - - if ($search_partial) { - $booking_data['rm_data'][$key]['data']['partially_available'] = $partial_avai_rooms; - } - - if ($search_cart_rms) { - $booking_data['rm_data'][$key]['data']['cart_rooms'] = $cart_rooms; - } - // } - } - - if ($search_partial) { - foreach ($booking_data['rm_data'] as $bk_data_key => $bk_data_val) { - foreach ($bk_data_val['data']['partially_available'] as $part_rm_key => $part_rm_val) { - if (empty($part_rm_val['avai_dates'])) { - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['avai_dates']); - - $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['detail'] = $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']); - - if ($search_booked) { - $booking_data['rm_data'][$bk_data_key]['data']['booked'] = array_merge($booking_data['rm_data'][$bk_data_key]['data']['booked'], array($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key])); - $num_booked += 1; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]); - } - $num_part_avai -= 1; - } elseif (!empty($this->allReqDates)) { - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['avai_dates']); - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['booked_dates']); - if ($search_unavai) { - $booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]['room_comment'] = ''; - $booking_data['rm_data'][$bk_data_key]['data']['unavailable'] = array_merge($booking_data['rm_data'][$bk_data_key]['data']['unavailable'], array($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key])); - - $num_unavail += 1; - - unset($booking_data['rm_data'][$bk_data_key]['data']['partially_available'][$part_rm_key]); - } - $num_part_avai -= 1; - } - } - - // Remove Cart Rooms from Partial available rooms if ($search_cart_rms) { - foreach ($bk_data_val['data']['cart_rooms'] as $cart_key => $cart_val) { - if (isset($this->partAvaiDates[$cart_val['id_room'].strtotime($cart_val['date_from'])])) { - $rm_data_key = $this->partAvaiDates[$cart_val['id_room'].strtotime($cart_val['date_from'])]['rm_data_key']; + $roomTypeSearchData['data']['cart_rooms'] = isset($cartRoomTypes[$idProduct]) ? $cartRoomTypes[$idProduct] : array(); - unset($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]['avai_dates'][strtotime($cart_val['date_from'])]); - - if (empty($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]['avai_dates'])) { - unset($booking_data['rm_data'][$rm_data_key]['data']['partially_available'][$cart_val['id_room']]); - $num_part_avai -= 1; - } - } + if (!isset($finalSearchResponse['stats']['num_cart'])) { + $finalSearchResponse['stats']['num_cart'] = 0; } - - unset($this->partAvaiDates); + $finalSearchResponse['stats']['num_cart'] += count($roomTypeSearchData['data']['cart_rooms']); } + + if ($search_booked) { + $roomTypeSearchData['data']['booked'] = isset($bookedRoomTypes[$idProduct]) ? $bookedRoomTypes[$idProduct] : array(); + + if (!isset($finalSearchResponse['stats']['num_booked'])) { + $finalSearchResponse['stats']['num_booked'] = 0; + } + $finalSearchResponse['stats']['num_booked'] += count($roomTypeSearchData['data']['booked']); + } + + if ($search_available) { + $roomTypeSearchData['data']['available'] = array(); + if (!isset($finalSearchResponse['stats']['num_avail'])) { + $finalSearchResponse['stats']['num_avail'] = 0; + } + if (isset($availableRoomTypes['roomTypes'][$idProduct])) { + + $roomTypeSearchData['data']['available'] = $availableRoomTypes['roomTypes'][$idProduct]['rooms']; + + $finalSearchResponse['stats']['num_avail'] += count($roomTypeSearchData['data']['available']); + + $finalSearchResponse['stats']['max_avail_occupancy'] += count($roomTypeSearchData['data']['available']) * (int)$availableRoomTypes['roomTypes'][$idProduct]['maxOccupancy']; + } + } + + if ($search_partial) { + $roomTypeSearchData['data']['partially_available'] = isset($partiallyAvailRoomTypes[$idProduct]) ? $partiallyAvailRoomTypes[$idProduct] : array(); + + $finalSearchResponse['stats']['num_part_avai'] = $partiallyAvailRoomsCount; + } + + $finalSearchResponse['rm_data'][$idProduct] = $roomTypeSearchData; } + unset($roomTypesDetail); + + return $finalSearchResponse; } - - if ($for_calendar) { - unset($booking_data['rm_data']); - } - - $booking_data['stats']['total_rooms'] = $total_rooms; - - if ($search_booked) { - $booking_data['stats']['num_booked'] = $num_booked; - } - - if ($search_unavai) { - $booking_data['stats']['num_unavail'] = $num_unavail; - } - - if ($search_available) { - $booking_data['stats']['num_avail'] = $num_avail; - } - - if ($search_partial) { - $booking_data['stats']['num_part_avai'] = $num_part_avai; - } - - if ($search_partial) { - $booking_data['stats']['num_cart'] = $num_cart; - } - - return $booking_data; } } + + return array(); + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * 'applyLosRestriction' => ..., + * ); + */ + protected function getSearchUnavailableRooms($params) + { + $this->context = Context::getContext(); + // Check LOS restriction for back-office + if (!isset($params['applyLosRestriction'])) { + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + } + + extract($params); + + $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo); + $stayStartDate = date('Y-m-d', strtotime($dateFrom)); + + // Room status inactive + $sql1 = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` + WHERE `id_hotel`='.(int)$idHotel.' AND `id_status` = '. HotelRoomInformation::STATUS_INACTIVE.' AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + // if ($idRoomType) { + // $sql1 .= ' AND `id_product` ='.(int)$idRoomType; + // } + + // check room is temperory inactive + $sql2 = 'SELECT hri.`id` AS `id_room`, hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd. id_room = hri.`id`) + WHERE hri.`id_hotel`='.$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND hrdd.`date_from` < \''.pSql($dateTo).'\' AND hrdd.`date_to` > \''.pSql($dateFrom).'\' AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql1.' UNION '.$sql2; + + if ($applyLosRestriction) { + $sql3 = 'SELECT hri.`id` AS `id_room`, hri.`id_product`, hri.`id_hotel`, hri.`room_num`, hri.`comment` AS `room_comment` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_restriction_date_range` AS hrtr ON (hrt.`id_product` = hrtr.`id_product` AND (hrtr.`date_from` <= \''.pSQL($stayStartDate).'\' AND hrtr.`date_to` > \''.pSQL($stayStartDate).'\')) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND (IFNULL(hrtr.`min_los`, hrt.`min_los`) >'. (int)$lengthOfStay.' OR IF(IFNULL(hrtr.`max_los`, hrt.`max_los`) > 0, IFNULL(hrtr.`max_los`, hrt.`max_los`) < '.(int)$lengthOfStay.', 0)) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql.' UNION '.$sql3; + } + + $unavailRoomTypes = array(); + if ($unavailRooms = Db::getInstance()->executeS($sql)) { + foreach ($unavailRooms as $unavailRoomDetail) { + $unavailRoomTypes[$unavailRoomDetail['id_product']][] = $unavailRoomDetail; + } + } + + return $unavailRoomTypes; + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchCartRooms($params) + { + extract($params); + + $cartRoomTypes = array(); + if ($idCart && $idGuest) { + $sql = 'SELECT cbd.`id_product`, cbd.`id_room`, cbd.`id_hotel`, cbd.`booking_type`, cbd.`comment`, rf.`room_num`, cbd.`date_from`, cbd.`date_to` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` AS cbd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = cbd.`id_room`) + WHERE cbd.`id_hotel`= '.(int)$idHotel.' AND cbd.`id_cart` = '.(int)$idCart.' AND cbd.`id_guest` ='.(int)$idGuest.' AND cbd.`is_refunded` = 0 AND cbd.`is_back_order` = 0 AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + if ($cartRooms = Db::getInstance()->executeS($sql)) { + foreach ($cartRooms as $cartRoomDetail) { + $cartRoomTypes[$cartRoomDetail['id_product']][] = $cartRoomDetail; + } + } + } + + return $cartRoomTypes; + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'searchOccupancy' => ..., + * 'allowedIdRoomTypes' => ..., + * 'applyLosRestriction' => ..., + * ); + */ + protected function getSearchAvailableRooms($params) + { + $this->context = Context::getContext(); + // Check LOS restriction for back-office + if (!isset($params['applyLosRestriction'])) { + $applyLosRestriction = true; + if (isset($this->context->employee->id)) { + if (!Configuration::get('PS_LOS_RESTRICTION_BO')) { + $applyLosRestriction = false; + } + } + } + + extract($params); + + $stayStartDate = date('Y-m-d', strtotime($dateFrom)); + $lengthOfStay = $this->getNumberOfDays($dateFrom, $dateTo); + + if (isset($this->context->employee->id)) { + $QLO_OWS_SEARCH_ALGO_TYPE = Configuration::get('PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE'); + $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE'); + } else { + $QLO_OWS_SEARCH_ALGO_TYPE = Configuration::get('PS_FRONT_OWS_SEARCH_ALGO_TYPE'); + $QLO_SEARCH_TYPE = Configuration::get('PS_FRONT_SEARCH_TYPE'); + } + + // Exculde Booked rooms + $exclude_ids = 'SELECT `id_room` + FROM `'._DB_PREFIX_.'htl_booking_detail` + WHERE `id_hotel` = '.(int)$idHotel.' AND `is_back_order` = 0 AND `is_refunded` = 0 AND IF(`id_status` = '. self::STATUS_CHECKED_OUT.', ( + (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($dateFrom).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") <= \''.PSQL($dateTo).'\') AND ( + (`date_from` <= \''.pSQL($dateFrom).'\' AND `check_out` > \''.pSQL($dateFrom).'\' AND `check_out` <= \''.PSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `check_out` > \''.pSQL($dateFrom).'\' AND `check_out` <= \''.pSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `check_out` >= \''.pSQL($dateTo).'\') OR + (`date_from` <= \''.pSQL($dateFrom).'\' AND `check_out` >= \''.pSQL($dateTo).'\') + ) + ), ( + (`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateFrom).'\' AND `date_to` <= \''.PSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_to` <= \''.pSQL($dateTo).'\') OR + (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `date_to` >= \''.pSQL($dateTo).'\') OR + (`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` >= \''.pSQL($dateTo).'\') + )) AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + // We have removed cart rooms after finally getting available rooms from booking + // Exclude temporary disable rooms + $exclude_ids .= ' UNION + SELECT hri.`id` AS id_room + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` < \''.pSql($dateTo).'\' AND hrdd.`date_to` > \''.pSql($dateFrom).'\') AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + // LOS Restriction. Also, Remember to check max LOS restriction is greater than zero + if ($applyLosRestriction) { + $exclude_ids .= ' UNION + SELECT hri.`id` AS `id_room` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + LEFT JOIN `'._DB_PREFIX_.'htl_room_type_restriction_date_range` AS hrtr ON (hrt.`id_product` = hrtr.`id_product` AND (hrtr.`date_from` <= \''.pSQL($stayStartDate).'\' AND hrtr.`date_to` > \''.pSQL($stayStartDate).'\')) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND (IFNULL(hrtr.`min_los`, hrt.`min_los`) >'. (int)$lengthOfStay.' OR IF(IFNULL(hrtr.`max_los`, hrt.`max_los`) > 0, IFNULL(hrtr.`max_los`, hrt.`max_los`) < '.(int)$lengthOfStay.', 0)) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + } + + $selectAvailRoomSearch = 'SELECT ri.`id` AS `id_room`, ri.`id_product`, ri.`id_hotel`, ri.`room_num`, ri.`comment` AS `room_comment`, hrt.`max_adults` AS max_adult, hrt.`max_children`, hrt.`max_guests` AS max_occupancy'; + + $joinAvailRoomSearch = 'INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = ri.`id_product`)'; + + $whereAvailRoomSearch = 'WHERE ri.`id_hotel`='.(int)$idHotel.' AND ri.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE.' AND ri.`id` NOT IN ('.$exclude_ids.') AND IF('.(int)$idRoomType.' > 0, ri.`id_product` = '.(int)$idRoomType.', 1) AND ri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $groupByAvailRoomSearch = ''; + $orderByAvailRoomSearch = ''; + $orderWayAvailRoomSearch = ''; + + Hook::exec('actionAvailRoomSearchSqlModifier', + array( + 'select' => $selectAvailRoomSearch, + 'join' => &$joinAvailRoomSearch, + 'where' => &$whereAvailRoomSearch, + 'group_by' => &$groupByAvailRoomSearch, + 'order_by' => &$orderByAvailRoomSearch, + 'order_way' => &$orderWayAvailRoomSearch, + 'params' => array( + 'id_hotel' => $idHotel, + 'id_product' => $idRoomType, + 'date_from' => $dateFrom, + 'date_to' => $dateTo + ) + ) + ); + + $sql = $selectAvailRoomSearch; + $sql .= ' FROM `'._DB_PREFIX_.'htl_room_information` AS ri'; + $sql .= ' '.$joinAvailRoomSearch; + $sql .= ' '.$whereAvailRoomSearch; + $sql .= ' '.$groupByAvailRoomSearch; + $sql .= ' '.$orderByAvailRoomSearch; + $sql .= ' '.$orderWayAvailRoomSearch; + + $availableRoomTypes = array(); + $unavailableRoomTypes = array(); + + $avai_rooms = Db::getInstance()->executeS($sql); + if ($avai_rooms) { + $availableRoomTypes = array( + 'roomTypes' => array(), + 'maxTotalOccupancy' => 0, + // 'totalRooms' => 0, + ); + foreach ($avai_rooms as $avaiRoom) { + if(!isset($availableRoomTypes['roomTypes'][$avaiRoom['id_product']])) { + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']] = array( + 'rooms' => array(), + 'maxAdult' => 0, + 'maxChildren' => 0, + 'maxOccupancy' => 0, + 'roomCount' => 0, + ); + } + + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['rooms'][$avaiRoom['id_room']] = $avaiRoom; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxAdult'] = $avaiRoom['max_adult']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxChildren'] = $avaiRoom['max_children']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['maxOccupancy'] = $avaiRoom['max_occupancy']; + $availableRoomTypes['roomTypes'][$avaiRoom['id_product']]['roomCount'] += 1; + + $availableRoomTypes['maxTotalOccupancy'] += (int)$avaiRoom['max_occupancy']; + // $availableRoomTypes['totalRooms'] += 1; + } + + if ($QLO_SEARCH_TYPE == HotelBookingDetail::SEARCH_TYPE_OWS && $searchOccupancy) { + $availableRoomTypes = $this->getAvailableRoomSatisfingOccupancy($searchOccupancy, $availableRoomTypes, $QLO_OWS_SEARCH_ALGO_TYPE); + $unavailableRoomTypes = $availableRoomTypes['unavailableRoomTypes']; + $availableRoomTypes = $availableRoomTypes['availableRoomTypes']; + } + + if ($availableRoomTypes && !empty($idCart) && !empty($idGuest)) { + $sql = 'SELECT `id_product`, `id_room` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_hotel` = '.(int)$idHotel.' AND `id_cart` = '.(int)$idCart.' AND `id_guest` = '.(int)$idGuest.' AND `is_refunded` = 0 AND `is_back_order` = 0 AND ((`date_from` <= \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateFrom).'\' AND `date_to` <= \''.pSQL($dateTo).'\') OR (`date_from` > \''.pSQL($dateFrom).'\' AND `date_to` < \''.pSQL($dateTo).'\') OR (`date_from` >= \''.pSQL($dateFrom).'\' AND `date_from` < \''.pSQL($dateTo).'\' AND `date_to` >= \''.pSQL($dateTo).'\') OR (`date_from` < \''.pSQL($dateFrom).'\' AND `date_to` > \''.pSQL($dateTo).'\')) AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + $availCartRooms = Db::getInstance()->executeS($sql); + // Also, don't forget to remove cart rooms, because we didn't remove cart rooms from sql query + if ($availCartRooms) { + foreach ($availCartRooms as $cartRoomDetail) { + unset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]['rooms'][$cartRoomDetail['id_room']]); + + if (isset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]) && !$availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]['rooms']) { + unset($availableRoomTypes['roomTypes'][$cartRoomDetail['id_product']]); + } + } + unset($availCartRooms); + } + } + + // there might be a change maxTotalOccupancy will give wrong information + // because of all process might have changed the available roooms data/count + // So further it is no use for us + unset($availableRoomTypes['maxTotalOccupancy']); + } + + return array( + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'availableRoomTypes' => $availableRoomTypes, + ); + } + + protected function getAvailableRoomSatisfingOccupancy($searchOccupancy, $availableRoomTypes, $QLO_OWS_SEARCH_ALGO_TYPE, $cartRooms = array()) + { + $unavailableRoomTypes = array(); + if ($searchOccupancy && $availableRoomTypes) { + // TODO: Try to merge with the next loop + $totalReqOccupancy = 0; + foreach ($searchOccupancy as $reqRoomOccupancy) { + $totalReqOccupancy += (int)$reqRoomOccupancy['adult'] + (int)$reqRoomOccupancy['children']; + } + + // Check total required occupancy must be <= hotel total available occupancy + if ($totalReqOccupancy > $availableRoomTypes['maxTotalOccupancy']) { + // This means hotel cannot take the booking of uncoming no. of guest + // Move all the rooms to unavailable rooms and show no available room on front + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + } + + // if total Required Occupancy can be fulfilled by hotel. So, now following step need to check + // step 1: First, assign room type according to the respective required occupancy + // Step 2: required occupancy with minimum available room type will be selected first for assiging room type + // and if multiple required occupancies have same no. of available room types then we will take the weightage of maxOccupancy + // Step 3: After sorting and selecting req occupancy in ascending order according to step 2, + // now we need to select which available room type should be selected in case multiple room types are satisfing required occupancy + // So, for this the weightage which have less MaxOccupancy allowred and having more rooms available if maximumOccupancy is also same. + // Also, for better understanding we have writen step no. where they are executed. + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + $reqOccupancies = array(); + + $eligibleRoomTypes = array(); + $ineligibleRoomTypes = array(); + + foreach ($searchOccupancy as $reqRoomOccupancy) { + if (!isset($reqRoomOccupancy['roomTypes'])) { + $reqRoomOccupancy['roomTypes'] = array(); + } + + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomsDetail) { + // below is STEP 1 + if (($reqRoomOccupancy['adult'] <= $roomsDetail['maxAdult']) && + ($reqRoomOccupancy['children'] <= $roomsDetail['maxChildren']) && + ((int)$reqRoomOccupancy['adult'] + (int)$reqRoomOccupancy['children'] <= $roomsDetail['maxOccupancy'])) { + + // below is STEP 3 + $reqRoomOccupancy['roomTypes'][$idProduct] = ($roomsDetail['maxOccupancy']*100 - $roomsDetail['roomCount']); + + $eligibleRoomTypes[$idProduct] = $idProduct; + if (isset($ineligibleRoomTypes[$idProduct])) { + unset($ineligibleRoomTypes[$idProduct]); + } + } else { + if (!isset($eligibleRoomTypes[$idProduct])) { + $ineligibleRoomTypes[$idProduct] = $idProduct; + } + } + } + + // Sort accordind to weight + asort($reqRoomOccupancy['roomTypes']); + + if ($reqRoomOccupancy['roomTypes']) { + // Room occupancy weight index will tell us which required occupancy (search) should be selected first for assigning roomtype + // below is STEP 2 + $reqRoomOccupancyWt = $this->generateRoomOccupancyWeight( + count($reqRoomOccupancy['roomTypes']), + (int)$reqRoomOccupancy['adult'] + (int)$reqRoomOccupancy['children'], + $reqRoomOccupancy['adult'], + $reqRoomOccupancy['children'] + ); + + // In case avail rooms, required adult and required childers are same + // then to overcome the loose of required occupancy array + while (isset($reqOccupancies[$reqRoomOccupancyWt])) { + $reqRoomOccupancyWt += 1; + } + + $reqOccupancies[$reqRoomOccupancyWt] = $reqRoomOccupancy; + } else { + // In case no room type satisfies specific occupancy + // check if exact search, move all room types to unavailable and break loop + if ($QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + break; + } + } + } + unset($eligibleRoomTypes); + + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + // Sort accordind to weight + ksort($reqOccupancies); + + $usedRoomTypeQty = array(); + foreach ($reqOccupancies as &$reqRoomOccupancy) { + while (count($reqRoomOccupancy['roomTypes']) > 0) { + $selectedRoomTypeId = key($reqRoomOccupancy['roomTypes']); + unset($reqRoomOccupancy['roomTypes'][$selectedRoomTypeId]); + + if (!isset($usedRoomTypeQty[$selectedRoomTypeId])) { + $usedRoomTypeQty[$selectedRoomTypeId] = 0; + } + + if (((int)$availableRoomTypes['roomTypes'][$selectedRoomTypeId]['roomCount'] - (int)$usedRoomTypeQty[$selectedRoomTypeId]) > 0) { + $reqRoomOccupancy['selectedRoomType'] = $selectedRoomTypeId; + $usedRoomTypeQty[$selectedRoomTypeId] += 1; + break; + } + } + + // if no room type is selected, that means we cannot fulfill the the guest requiremtn if exact search + if (!isset($reqRoomOccupancy['selectedRoomType'])) { + + // if exact search, move all room types to unavailable and break loop + if ($QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO) { + foreach ($availableRoomTypes['roomTypes'] as $idProduct => $roomTypeDetail) { + $unavailableRoomTypes[$idProduct] = $roomTypeDetail['rooms']; + } + + // instead of unset each room type index, we will completely override the array to empty + $availableRoomTypes = array(); + break; + } + + } + } + unset($usedRoomTypeQty); + } + } + + // If we are here than hotel can fulfill the required rooms with there respective occupancies + // So, formate according to output data + // but first check HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO, + // if true, then only return rooms which satisfy search requirment + if ($availableRoomTypes && $QLO_OWS_SEARCH_ALGO_TYPE == HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO && count($ineligibleRoomTypes) > 0) { + foreach ($ineligibleRoomTypes as $idProduct) { + // Move ineligibleRoomTypes to unavailable rooms + if (!isset($unavailableRoomTypes[$idProduct])) { + $unavailableRoomTypes[$idProduct] = array(); + } + $unavailableRoomTypes[$idProduct] = $availableRoomTypes['roomTypes'][$idProduct]['rooms']; + + unset($availableRoomTypes['roomTypes'][$idProduct]); + } + } + unset($ineligibleRoomTypes); + } + + return array( + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'availableRoomTypes' => $availableRoomTypes && isset($availableRoomTypes['roomTypes']) ? $availableRoomTypes : array(), + ); + } + + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idCart' => ..., + * 'idGuest' => ..., + * 'idRoomType' => ..., + * 'searchOccupancy' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchPartiallyAvailRooms($params) + { + extract($params); + + $sql1 = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment` AS `room_comment`, rf.`room_num`, bd.`date_from`, IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`check_out`, bd.`date_to`) AS `date_to`, hrt.`max_adults` AS `max_adult`, hrt.`max_children`, hrt.`max_guests` AS `max_occupancy` + FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = rf.`id_product`) + WHERE bd.`id_hotel`='.(int)$idHotel.' AND rf.`id_status` != '. HotelRoomInformation::STATUS_INACTIVE .' AND bd.`is_back_order` = 0 AND bd.`is_refunded` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', ( + (DATE_FORMAT(`check_out`, "%Y-%m-%d") > \''.pSQL($dateFrom).'\' AND DATE_FORMAT(`check_out`, "%Y-%m-%d") < \''.PSQL($dateTo).'\') AND ( + (bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`check_out` > \''.pSQL($dateFrom).'\' AND bd.`check_out` < \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`check_out` >= \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`check_out` > \''.pSQL($dateFrom).'\' AND bd.`check_out` < \''.pSQL($dateTo).'\') + ) + ), ( + (bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`date_to` > \''.pSQL($dateFrom).'\' AND bd.`date_to` < \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`date_to` >= \''.pSQL($dateTo).'\') OR + (bd.`date_from` > \''.pSQL($dateFrom).'\' AND bd.`date_from` < \''.pSQL($dateTo).'\' AND bd.`date_to` < \''.pSQL($dateTo).'\') + )) AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql2 = 'SELECT hri.`id_product`, hrdd.`id_room`, hri.`id_hotel`, 0 AS `id_customer`, 0 AS `booking_type`, 0 AS `booking_status`, 0 AS `room_comment`, hri.`room_num`, hrdd.`date_from`, hrdd.`date_to`, hrt.`max_adults` AS `max_adult`, hrt.`max_children`, hrt.`max_guests` AS `max_occupancy` + FROM `'._DB_PREFIX_.'htl_room_information` AS hri + INNER JOIN `'._DB_PREFIX_.'htl_room_type` AS hrt ON (hrt.`id_product` = hri.`id_product`) + INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) + WHERE hri.`id_hotel`='.(int)$idHotel.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND ( + (hrdd.`date_from` <= \''.pSQL($dateFrom).'\' AND hrdd.`date_to` > \''.pSQL($dateFrom).'\' AND hrdd.`date_to` < \''.pSQL($dateTo).'\') OR + (hrdd.`date_from` > \''.pSQL($dateFrom).'\' AND hrdd.`date_from` < \''.pSQL($dateTo).'\' AND hrdd.`date_to` >= \''.pSQL($dateTo).'\') OR + (hrdd.`date_from` > \''.pSQL($dateFrom).'\' AND hrdd.`date_from` < \''.pSQL($dateTo).'\' AND hrdd.`date_to` < \''.pSQL($dateTo).'\') + ) AND IF('.(int)$idRoomType.' > 0, hri.`id_product` = '.(int)$idRoomType.', 1) AND hri.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $sql = $sql1.' UNION '.$sql2; + $part_arr = Db::getInstance()->executeS($sql); + + // Get date wise available rooms + $dateWiseRoomTypes = array(); + + // Below variables will be used for formating + $partialAvailRoomType = array(); + $partialRoomsList = array(); + + + $unavailableRoomTypes = array(); + + if ($part_arr) { + // Occupancy Wise Search OR Normal Search + if (isset($this->context->employee->id)) { + $QLO_SEARCH_TYPE = Configuration::get('PS_BACKOFFICE_SEARCH_TYPE'); + } else { + $QLO_SEARCH_TYPE = Configuration::get('PS_FRONT_SEARCH_TYPE'); + } + + $period = new DatePeriod( + new DateTime($dateFrom), + new DateInterval('P1D'), + new DateTime($dateTo) + ); + + // FYI:: Last date not included + // Get all dates to be covered in booking + $searchDates = array(); + foreach ($period as $objDate) { + $searchDates[$objDate->getTimestamp()] = array( + 'date_from' => $objDate->format('Y-m-d'), + 'date_to' => $objDate->modify('+1 day')->format('Y-m-d'), + ); + } + + $partiallyAvailRooms = array(); + foreach ($part_arr as $roomDetail) { + if (!isset($partiallyAvailRooms[$roomDetail['id_room']])) { + $availableDates = $searchDates; + } else { + $availableDates = $partiallyAvailRooms[$roomDetail['id_room']]['availableDates']; + } + + $period = new DatePeriod( + new DateTime($roomDetail['date_from']), + new DateInterval('P1D'), + new DateTime($roomDetail['date_to']) + ); + foreach ($period as $objDate) { + if (isset($availableDates[$objDate->getTimestamp()])) { + unset($availableDates[$objDate->getTimestamp()]); + } + } + + // If room is available for booking + if ($availableDates) { + if (!isset($partiallyAvailRooms[$roomDetail['id_room']])) { + $partiallyAvailRooms[$roomDetail['id_room']] = array( + 'id_product' => $roomDetail['id_product'], + 'id_room' => $roomDetail['id_room'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'max_adult' => $roomDetail['max_adult'], + 'max_children' => $roomDetail['max_children'], + 'max_occupancy' => $roomDetail['max_occupancy'], + // 'booked_dates' => array(), + ); + } + $partiallyAvailRooms[$roomDetail['id_room']]['availableDates'] = $availableDates; + + // FYI:: For backward compatibility (will help in formating) + // $partiallyAvailRooms[$roomDetail['id_room']]['avai_dates'] = $availableDates; + // $partiallyAvailRooms[$roomDetail['id_room']]['booked_dates'][] = array( + // 'date_from' => $roomDetail['date_from'], + // 'date_to' => $roomDetail['date_to'], + // 'id_customer' => $roomDetail['id_customer'], + // 'booking_type' => $roomDetail['booking_type'], + // 'booking_status' => $roomDetail['booking_status'], + // 'comment' => $roomDetail['room_comment'], + // ); + } else { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + + if (isset($partiallyAvailRooms[$roomDetail['id_room']])) { + unset($partiallyAvailRooms[$roomDetail['id_room']]); + } + } + } + + // will be used to check all dates are covered by partially avail rooms + $datesToCover = $searchDates; + + // Will be used to generate query to find partially avail rooms in cart + $timeStampWiseRooms = array(); + + // Arrange available rooms, date wise + $datetimeObj = new DateTime(); + foreach ($partiallyAvailRooms as $idRoom => &$roomDetail) { + foreach ($roomDetail['availableDates'] as $dateTimeStamp => $dateOnRoomAvail) { + unset($datesToCover[$dateTimeStamp]); + + $timeStampWiseRooms[$dateTimeStamp][] = $idRoom; + + if (!isset($dateWiseRoomTypes[$dateTimeStamp])) { + $dateWiseRoomTypes[$dateTimeStamp] = array( + // 'date' => $dateOnRoomAvail, + 'dateFrom' => $datetimeObj->setTimestamp($dateTimeStamp)->format('Y-m-d'), + 'dateTo' => $datetimeObj->modify('+1 day')->format('Y-m-d'), + 'roomTypes' => array(), + 'maxTotalOccupancy' => 0, + // 'roomTotalCount' => 0 + ); + } + if (!isset($dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']])) { + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']] = array( + 'rooms' => array(), + 'maxAdult' => 0, + 'maxChildren' => 0, + 'maxOccupancy' => 0, + 'roomCount' => 0, + ); + } + // not needed any further + unset($roomDetail['availableDates']); + + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['rooms'][$idRoom] = $roomDetail; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxAdult'] = $roomDetail['max_adult']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxChildren'] = $roomDetail['max_children']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['maxOccupancy'] = $roomDetail['max_occupancy']; + $dateWiseRoomTypes[$dateTimeStamp]['roomTypes'][$roomDetail['id_product']]['roomCount'] += 1; + + $dateWiseRoomTypes[$dateTimeStamp]['maxTotalOccupancy'] += $roomDetail['max_occupancy']; + // $dateWiseRoomTypes[$dateTimeStamp]['roomTotalCount'] += 1; + } + } + unset($datetimeObj); + + // If all dates rae covered + if (!$datesToCover) { + // array in ascending order of dates + ksort($dateWiseRoomTypes); + + $dateWiseCartRooms = array(); + // get cart partially available rooms + if (!empty($idCart) && !empty($idGuest)) { + $sql = 'SELECT `id_product`, `id_room`, `date_from` + FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_hotel` = '.(int)$idHotel.' AND `id_cart` = '.(int)$idCart.' AND `id_guest` = '.(int)$idGuest.' AND `is_refunded` = 0 AND `is_back_order` = 0 AND IF('.(int)$idRoomType.' > 0, `id_product` = '.(int)$idRoomType.', 1) AND `id_product` IN ('.$allowedIdRoomTypes.')'; + + $datetimeObj = new DateTime(); + foreach ($timeStampWiseRooms as $timeStamp => $roomList) { + $datetimeObj->setTimestamp($timeStamp); + $partialDateFrom = $datetimeObj->format('Y-m-d H:i:s'); + + $datetimeObj->modify('+1 day'); + $partialDateTo = $datetimeObj->format('Y-m-d H:i:s'); + + $sql .= ' AND (`date_from` = \''.pSQL($partialDateFrom).'\' AND `date_to` = \''.pSQL($partialDateTo).'\' AND `id_room` IN ('.implode(",", $roomList).'))'; + } + unset($datetimeObj); + + $partiallyAvailCartRooms = Db::getInstance()->executeS($sql); + if ($partiallyAvailCartRooms) { + foreach ($partiallyAvailCartRooms as $cartRoomDetail) { + $dateWiseCartRooms[strtotime($cartRoomDetail['date_from'])][] = array( + 'id_product' => $cartRoomDetail['id_product'], + 'id_room' => $cartRoomDetail['id_room'] + ); + } + } + } + + foreach ($dateWiseRoomTypes as $timeStamp => &$roomTypeDetail) { + if ($QLO_SEARCH_TYPE == HotelBookingDetail::SEARCH_TYPE_OWS && $searchOccupancy) { + $dateWiseAvailableRooms = $this->getAvailableRoomSatisfingOccupancy( + $searchOccupancy, + $roomTypeDetail, + HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO // All options for partial rooms + ); + + // Case: Unavailables rooms should be check, if they are available for anyother date range + // Above case is not needed to be checked for now beacuse either the date is completely unavailable for booking + // or we will get available rooms because of "HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO" variable) + + if ($dateWiseAvailableRooms['availableRoomTypes'] && isset($dateWiseAvailableRooms['availableRoomTypes']['roomTypes'])) { + $roomTypeDetail = $dateWiseAvailableRooms['availableRoomTypes']; + + // there might be a change maxTotalOccupancy will give wrong information + // because of all process might have changed the available roooms data/count + // So further it is no use for us + unset($roomTypeDetail['maxTotalOccupancy']); + } else { + // Partial rooms are not availble for this date + // Move all the rooms to unavailable rooms + // Break the loop + foreach ($partiallyAvailRooms as $roomDetail) { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + // $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = $roomDetail; + } + + $partiallyAvailRooms = array(); + $dateWiseRoomTypes = array(); + break; + } + } + + // Don't forget to remove cart rooms + if ($roomTypeDetail['roomTypes'] && $dateWiseCartRooms && isset($dateWiseCartRooms[$timeStamp])) { + foreach ($dateWiseCartRooms[$timeStamp] as $cartRoomDetail) { + unset($roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]['rooms'][$cartRoomDetail['id_room']]); + + if (!$roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]['rooms']) { + unset($roomTypeDetail['roomTypes'][$cartRoomDetail['id_product']]); + } + } + } + } + // free space + unset($roomTypeDetail); + + // Return room type wise instead of date wise + foreach ($dateWiseRoomTypes as $timeStamp => $dateWiseDetail) { + foreach ($dateWiseDetail['roomTypes'] as $idProduct => $roomTypeDetail) { + $partialAvailRoomType[$idProduct][$timeStamp] = array( + 'date_from' => $dateWiseDetail['dateFrom'], + 'date_to' => $dateWiseDetail['dateTo'], + 'rooms' => $roomTypeDetail['rooms'], + ); + $partialRoomsList = array_unique(array_merge($partialRoomsList, array_keys($roomTypeDetail['rooms'])), SORT_NUMERIC); + } + } + } else { + // If all dates are not covered then move all partially available room types to unavailable + foreach ($partiallyAvailRooms as $roomDetail) { + if (!isset($unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']])) { + $unavailableRoomTypes[$roomDetail['id_product']][$roomDetail['id_room']] = array( + 'id_room' => $roomDetail['id_room'], + 'id_product' => $roomDetail['id_product'], + 'id_hotel' => $roomDetail['id_hotel'], + 'room_num' => $roomDetail['room_num'], + 'room_comment' => '' + ); + } + } + + $partiallyAvailRooms = array(); + $dateWiseRoomTypes = array(); + } + unset($datesToCover); + unset($timeStampWiseRooms); + unset($partiallyAvailRooms); + } + + return array( + 'partiallyAvailRooms' => $dateWiseRoomTypes ? $partialAvailRoomType : $dateWiseRoomTypes, + 'unavailableRoomTypes' => $unavailableRoomTypes, + 'partiallyAvailRoomsCount' => count($partialRoomsList), + ); + } + + /** + * $params = array( + * 'idHotel' => ..., + * 'dateFrom' => ..., + * 'dateTo' => ..., + * 'idRoomType' => ..., + * 'allowedIdRoomTypes' => ..., + * ); + */ + protected function getSearchBookedRooms($params) + { + extract($params); + + $sql = 'SELECT bd.`id_product`, bd.`id_room`, bd.`id_hotel`, bd.`id_customer`, bd.`booking_type`, bd.`id_status` AS booking_status, bd.`comment`, rf.`room_num`, bd.`date_from`, bd.`date_to` + FROM `'._DB_PREFIX_.'htl_booking_detail` AS bd + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS rf ON (rf.`id` = bd.`id_room`) + WHERE bd.`id_hotel`='.(int)$idHotel.' AND bd.`is_refunded` = 0 AND bd.`is_back_order` = 0 AND IF(bd.`id_status` = '. self::STATUS_CHECKED_OUT .', bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.`check_out` >= \''.pSQL($dateTo).'\', bd.`date_from` <= \''.pSQL($dateFrom).'\' AND bd.date_to >= \''.pSQL($dateTo).'\') AND IF('.(int)$idRoomType.' > 0, rf.`id_product` = '.(int)$idRoomType.', 1) AND rf.`id_product` IN ('.$allowedIdRoomTypes.')'; + + $bookedRoomTypes = array(); + if ($booked_rooms = Db::getInstance()->executeS($sql)) { + foreach ($booked_rooms as $booked_k => $booked_v) { + if (!isset($bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']])) { + $bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']] = array( + 'id_product' => $booked_v['id_product'], + 'id_room' => $booked_v['id_room'], + 'id_hotel' => $booked_v['id_hotel'], + 'room_num' => $booked_v['room_num'], + 'detail' => array() + ); + } + $bookedRoomTypes[$booked_v['id_product']][$booked_v['id_room']]['detail'][] = array( + 'date_from' => $booked_v['date_from'], + 'date_to' => $booked_v['date_to'], + 'id_customer' => $booked_v['id_customer'], + 'booking_type' => $booked_v['booking_type'], + 'booking_status' => $booked_v['booking_status'], + 'comment' => $booked_v['comment'], + ); + } + unset($booked_rooms); + } + + return $bookedRoomTypes; } // This function algo is same as available rooms algo and it not similar to booked rooms algo. @@ -765,6 +1377,11 @@ class HotelBookingDetail extends ObjectModel return $daysDifference; } + public function generateRoomOccupancyWeight($availRoomTypeCount, $totalOccupancy, $totalAdult, $totalChildren) + { + return (10000000*(int)$availRoomTypeCount - (100000*(int)$totalOccupancy + 1000*(int)$totalAdult + 10*$totalChildren)); + } + /** * [getBookingDataByOrderId :: To get booking information by id order]. * @@ -829,13 +1446,13 @@ class HotelBookingDetail extends ObjectModel } /** - * [DataForFrontSearch ]. + * [dataForFrontSearch ]. * * @param [date] $date_from [Start date of the booking] * @param [date] $date_to [End date of the booking] * @param [int] $id_hotel [Id of the Hotel] * @param [int] $id_product [ID of the product] - * @param [int] $for_room_type [used for product page and category page for block cart] + * @param [int] $only_search_data [used for product page and category page for block cart] * @param [int] $adult [] * @param [int] $children [] * @param [] $ratting [description] @@ -845,9 +1462,9 @@ class HotelBookingDetail extends ObjectModel * @param [int] $id_guest [Id of the guest] * * @return [array] [Returns true if successfully updated else returns false] - * Note:: $for_room_type is used for product page and category page for block cart + * Note:: $only_search_data is used for product page and category page for block cart */ - public function DataForFrontSearch($date_from, $date_to, $id_hotel, $id_product = 0, $for_room_type = 0, $adult = 0, $children = 0, $ratting = -1, $amenities = 0, $price = 0, $id_cart = 0, $id_guest = 0) + public function dataForFrontSearch($bookingParams) { if (Module::isInstalled('productcomments')) { require_once _PS_MODULE_DIR_.'productcomments/ProductComment.php'; @@ -855,31 +1472,22 @@ class HotelBookingDetail extends ObjectModel $this->context = Context::getContext(); - $bookingParams = array(); - $bookingParams['date_from'] = $date_from; - $bookingParams['date_to'] = $date_to; - $bookingParams['hotel_id'] = $id_hotel; - $bookingParams['room_type'] = $id_product; - $bookingParams['adult'] = $adult; - $bookingParams['children'] = $children; - $bookingParams['num_rooms'] = 0; - $bookingParams['for_calendar'] = 0; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 0; $bookingParams['search_booked'] = 0; $bookingParams['search_unavai'] = 0; - $bookingParams['id_cart'] = $id_cart; - $bookingParams['id_guest'] = $id_guest; - $booking_data = $this->getBookingData($bookingParams); + $bookingData = $this->getBookingData($bookingParams); - if (!$for_room_type) { - if (!empty($booking_data)) { - $obj_rm_type = new HotelRoomType(); + extract($this->getBookingDataParams($bookingParams)); - foreach ($booking_data['rm_data'] as $key => $value) { + if (!$only_search_data) { + if (!empty($bookingData)) { + $objRoomType = new HotelRoomType(); + + foreach ($bookingData['rm_data'] as $key => $value) { if (empty($value['data']['available'])) { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } else { if (Module::isInstalled('productcomments')) { $prod_ratting = ProductComment::getAverageGrade($value['id_product'])['grade']; @@ -889,7 +1497,7 @@ class HotelBookingDetail extends ObjectModel } if ($prod_ratting < $ratting && $ratting != -1) { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } else { $product = new Product($value['id_product'], false, $this->context->language->id); @@ -907,7 +1515,7 @@ class HotelBookingDetail extends ObjectModel } } if (!empty($prod_amen)) { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } } @@ -925,37 +1533,46 @@ class HotelBookingDetail extends ObjectModel $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'home_default'); } - $room_left = count($booking_data['rm_data'][$key]['data']['available']); + $room_left = count($bookingData['rm_data'][$key]['data']['available']); - $rm_dtl = $obj_rm_type->getRoomTypeInfoByIdProduct($value['id_product']); + $rm_dtl = $objRoomType->getRoomTypeInfoByIdProduct($value['id_product']); - $booking_data['rm_data'][$key]['name'] = $product->name; - $booking_data['rm_data'][$key]['image'] = $cover_img; - $booking_data['rm_data'][$key]['description'] = $product->description_short; - $booking_data['rm_data'][$key]['feature'] = $product_feature; - $booking_data['rm_data'][$key]['price'] = $prod_price; - $booking_data['rm_data'][$key]['price_without_reduction'] = $productPriceWithoutReduction; - $booking_data['rm_data'][$key]['feature_price'] = $productFeaturePrice; - $booking_data['rm_data'][$key]['feature_price_diff'] = $productPriceWithoutReduction - $productFeaturePrice; + $bookingData['rm_data'][$key]['name'] = $product->name; + $bookingData['rm_data'][$key]['image'] = $cover_img; + $bookingData['rm_data'][$key]['description'] = $product->description_short; + $bookingData['rm_data'][$key]['feature'] = $product_feature; + $bookingData['rm_data'][$key]['price'] = $prod_price; + $bookingData['rm_data'][$key]['price_without_reduction'] = $productPriceWithoutReduction; + $bookingData['rm_data'][$key]['feature_price'] = $productFeaturePrice; + $bookingData['rm_data'][$key]['feature_price_diff'] = $productPriceWithoutReduction - $productFeaturePrice; // if ($room_left <= (int)Configuration::get('WK_ROOM_LEFT_WARNING_NUMBER')) - $booking_data['rm_data'][$key]['room_left'] = $room_left; + $bookingData['rm_data'][$key]['room_left'] = $room_left; - $booking_data['rm_data'][$key]['adult'] = $rm_dtl['adult']; - $booking_data['rm_data'][$key]['children'] = $rm_dtl['children']; + $bookingData['rm_data'][$key]['adult'] = $rm_dtl['adult']; + $bookingData['rm_data'][$key]['children'] = $rm_dtl['children']; - $booking_data['rm_data'][$key]['ratting'] = $prod_ratting; + $bookingData['rm_data'][$key]['ratting'] = $prod_ratting; if (Module::isInstalled('productcomments')) { - $booking_data['rm_data'][$key]['num_review'] = ProductComment::getCommentNumber($value['id_product']); + $bookingData['rm_data'][$key]['num_review'] = ProductComment::getCommentNumber($value['id_product']); + } + + // create URL with the parameters from URL + $urlData = array ('date_from' => $date_from, 'date_to' => $date_to); + if (!isset($occupancy)) { + $occupancy = Tools::getValue('occupancy'); + } + if ($occupancy) { + $urlData['occupancy'] = $occupancy; } if (Configuration::get('PS_REWRITING_SETTINGS')) { - $booking_data['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'?date_from='.$date_from.'&date_to='.$date_to; + $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'?'.http_build_query($urlData); } else { - $booking_data['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'&date_from='.$date_from.'&date_to='.$date_to; + $bookingData['rm_data'][$key]['product_link'] = $this->context->link->getProductLink($product).'&'.http_build_query($urlData); } } else { - unset($booking_data['rm_data'][$key]); + unset($bookingData['rm_data'][$key]); } } } @@ -964,7 +1581,7 @@ class HotelBookingDetail extends ObjectModel } } - return $booking_data; + return $bookingData; } /** @@ -972,12 +1589,12 @@ class HotelBookingDetail extends ObjectModel * * @param [date] $date_from[Start date of booking of the room to be swapped with available rooms] * @param [date] $date_to [End date of booking of the room to be swapped with available rooms] - * @param [int] $room_type [Id of the product to which the room belongs to be swapped] + * @param [int] $id_room_type [Id of the product to which the room belongs to be swapped] * @param [int] $hotel_id [Id of the Hotel to which the room belongs to be swapped] * * @return [array|false] [Returs array of the available rooms for swapping if rooms found else returnss false] */ - public function getAvailableRoomsForReallocation($date_from, $date_to, $room_type, $hotel_id) + public function getAvailableRoomsForReallocation($date_from, $date_to, $id_room_type, $hotel_id) { if (isset($_COOKIE['wk_id_cart'])) { $current_admin_cart_id = $_COOKIE['wk_id_cart']; @@ -989,14 +1606,14 @@ class HotelBookingDetail extends ObjectModel SELECT hri.`id` AS id_room FROM `'._DB_PREFIX_.'htl_room_information` AS hri INNER JOIN `'._DB_PREFIX_.'htl_room_disable_dates` AS hrdd ON (hrdd.`id_room_type` = hri.`id_product` AND hrdd.`id_room` = hri.`id`) - WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$room_type.' + WHERE hri.`id_hotel`='.(int)$hotel_id.' AND hri.`id_product` ='.(int)$id_room_type.' AND hri.`id_status` = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .' AND (hrdd.`date_from` <= \''.pSql($date_to).'\' AND hrdd.`date_to` >= \''.pSql($date_from).'\')'; if (isset($current_admin_cart_id) && $current_admin_cart_id) { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` NOT IN ('.$exclude_ids.') AND `id` NOT IN (SELECT `id_room` FROM `'._DB_PREFIX_.'htl_cart_booking_data` WHERE `id_cart`='. @@ -1004,7 +1621,7 @@ class HotelBookingDetail extends ObjectModel } else { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` NOT IN ('.$exclude_ids.')'; } @@ -1025,11 +1642,11 @@ class HotelBookingDetail extends ObjectModel * * @return [array|false] [Returs array of the available rooms for swapping if rooms found else returnss false] */ - public function getAvailableRoomsForSwapping($date_from, $date_to, $room_type, $hotel_id, $id_room) + public function getAvailableRoomsForSwapping($date_from, $date_to, $id_room_type, $hotel_id, $id_room) { $sql = 'SELECT `id` AS `id_room`, `id_product`, `id_hotel`, `room_num`, `comment` AS `room_comment` FROM `'._DB_PREFIX_.'htl_room_information` - WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$room_type.' + WHERE `id_hotel`='.(int)$hotel_id.' AND `id_product`='.(int)$id_room_type.' AND (id_status = '. HotelRoomInformation::STATUS_ACTIVE .' or id_status = '. HotelRoomInformation::STATUS_TEMPORARY_INACTIVE .') AND `id` IN ( SELECT `id_room` FROM `'._DB_PREFIX_.'htl_booking_detail` @@ -1074,7 +1691,7 @@ class HotelBookingDetail extends ObjectModel 'date_from' => $date_from, 'date_to' => $date_to, ) - ); + ); return true; } return false; @@ -1138,7 +1755,7 @@ class HotelBookingDetail extends ObjectModel 'date_from' => $date_from, 'date_to' => $date_to, ) - ); + ); return true; } return false; @@ -1244,6 +1861,7 @@ class HotelBookingDetail extends ObjectModel $old_date_to, $new_date_from, $new_date_to, + $occupancy, $new_total_price = null ) { $rowByIdOrderIdRoom = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_room`='.(int)$id_room.' AND `id_order`='.(int)$id_order); @@ -1290,6 +1908,9 @@ class HotelBookingDetail extends ObjectModel 'date_from' => $new_date_from, 'date_to' => $new_date_to, 'quantity' => $newNumDays, + 'adult' => $occupancy['adult'], + 'children' => $occupancy['children'], + 'child_ages' => json_encode($occupancy['child_ages']), ), ); @@ -1301,6 +1922,9 @@ class HotelBookingDetail extends ObjectModel 'total_price_tax_excl' => $newTotalPriceTE, 'total_price_tax_incl' => $newTotalPriceTI, 'total_paid_amount' => $totalPaidAmount, + 'adult' => $occupancy['adult'], + 'children' => $occupancy['children'], + 'child_ages' => json_encode($occupancy['child_ages']), ), ); @@ -1372,6 +1996,8 @@ class HotelBookingDetail extends ObjectModel $order_detail_data[$key]['feature_price_diff'] = (float)($order_detail_data[$key]['unit_price_without_reduction_tax_incl'] - $order_detail_data[$key]['paid_unit_price_tax_incl']); + $order_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); + // Check if this booking as any refund history then enter refund data if ($refundInfo = OrderReturnCore::getOrdersReturnDetail($id_order, 0, $value['id'])) { $order_detail_data[$key]['refund_info'] = reset($refundInfo); @@ -1630,8 +2256,8 @@ class HotelBookingDetail extends ObjectModel $date_to = date("Y-m-d", strtotime($params['date_to'])); $id_product = $params['id_room_type']; - $obj_booking_dtl = new HotelBookingDetail(); - $num_day = $obj_booking_dtl->getNumberOfDays($date_from, $date_to); //quantity of product + $objBookingDetail = new HotelBookingDetail(); + $num_day = $objBookingDetail->getNumberOfDays($date_from, $date_to); //quantity of product $product = new Product($id_product, false, Configuration::get('PS_LANG_DEFAULT')); $obj_room_type = new HotelRoomType(); $room_info_by_id_product = $obj_room_type->getRoomTypeInfoByIdProduct($id_product); @@ -1650,8 +2276,17 @@ class HotelBookingDetail extends ObjectModel } } /*END*/ - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, $id_product, 1, 0, 0, -1, 0, 0, $id_cart, $this->context->cookie->id_guest); + $objBookingDetail = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $this->context->cookie->id_guest, + ); + $hotel_room_data = $objBookingDetail->dataForFrontSearch($bookingParams); $total_available_rooms = $hotel_room_data['stats']['num_avail']; if ($total_available_rooms < $params['req_qty']) { @@ -1676,7 +2311,7 @@ class HotelBookingDetail extends ObjectModel $id_customer = $this->context->cart->id_customer; $id_currency = $this->context->cart->id_currency; - $hotel_room_info_arr = $hotel_room_data['rm_data'][0]['data']['available']; + $hotel_room_info_arr = $hotel_room_data['rm_data'][$id_product]['data']['available']; $chkQty = 0; foreach ($hotel_room_info_arr as $key_hotel_room_info => $val_hotel_room_info) { if ($chkQty < $params['req_qty']) { @@ -1933,4 +2568,4 @@ class HotelBookingDetail extends ObjectModel Configuration::get('PS_OS_ERROR'), )); } -} +} \ No newline at end of file diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index dd0fb2cf8..cbd52b4ff 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -36,6 +36,9 @@ class HotelCartBookingData extends ObjectModel public $is_back_order; public $date_from; public $date_to; + public $adult; + public $children; + public $child_ages; public $extra_demands; public $date_add; public $date_upd; @@ -59,6 +62,9 @@ class HotelCartBookingData extends ObjectModel 'is_back_order' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'date_from' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_to' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), + 'adult' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'children' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'child_ages' => array('type' => self::TYPE_STRING), 'extra_demands' => array('type' => self::TYPE_STRING), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -246,6 +252,25 @@ class HotelCartBookingData extends ObjectModel } } + /** + * [getLastAddedData :: To get booking information of the cart by cart id]. + * + * @param [int] $cart_id [Id of the cart] + * + * @return [array|false] [If data found Returns the array containing the information of the cart of the passed cart id else returns false] + */ + public function getLastAddedData($cart_id) + { + if ($cart_id) { + return Db::getInstance()->getRow(' + SELECT * FROM `'._DB_PREFIX_.'htl_cart_booking_data` + WHERE `id_cart`='.$cart_id.' ORDER BY `date_add` DESC + '); + } + + return false; + } + /** * [getCartCurrentDataByCartId :: To get booking information of the cart by Order id]. * @@ -411,6 +436,150 @@ class HotelCartBookingData extends ObjectModel return true; } + public function addCartBookingData( + $id_product, + $occupancy, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $roomsAvailableList, + $id_cart + ) { + $chkQty = 0; + $num_days = HotelHelper::getNumberOfDays($date_from, $date_to); + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + $roomsRequired = count($occupancy); + } else { + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); + $roomsRequired = $occupancy; + } + if (Validate::isLoadedObject($objCart = new Cart($id_cart))) { + foreach ($roomsAvailableList as $hotelRoomInfo) { + if ($chkQty < $roomsRequired) { + + $obj_htl_cart_booking_data = new HotelCartBookingData(); + $obj_htl_cart_booking_data->id_cart = $objCart->id; + $obj_htl_cart_booking_data->id_guest = $objCart->id_guest; + $obj_htl_cart_booking_data->id_customer = $objCart->id_customer; + $obj_htl_cart_booking_data->id_currency = $objCart->id_currency; + $obj_htl_cart_booking_data->id_product = $id_product; + $obj_htl_cart_booking_data->id_room = $hotelRoomInfo['id_room']; + $obj_htl_cart_booking_data->id_hotel = $id_hotel; + $obj_htl_cart_booking_data->booking_type = 1; + $obj_htl_cart_booking_data->quantity = $num_days; + $obj_htl_cart_booking_data->extra_demands = $roomDemand; + $obj_htl_cart_booking_data->date_from = $date_from; + $obj_htl_cart_booking_data->date_to = $date_to; + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + $room_occupancy = array_shift($occupancy); + $obj_htl_cart_booking_data->adult = $room_occupancy['adult']; + $obj_htl_cart_booking_data->children = $room_occupancy['children']; + $obj_htl_cart_booking_data->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $obj_htl_cart_booking_data->adult = $roomTypeInfo['adult']; + $obj_htl_cart_booking_data->children = $roomTypeInfo['children']; + $obj_htl_cart_booking_data->child_ages = json_encode(array()); + } + $obj_htl_cart_booking_data->save(); + ++$chkQty; + } else { + break; + } + } + return $objCart->updateQty((int)($roomsRequired * $num_days), $id_product); + } else { + return false; + } + } + + public function updateRoomCartBookingData( + $id_product, + $occupancy, + $operator, + $id_hotel = false, + $date_from = false, + $date_to = false, + $roomDemand = array(), + $id_cart = false, + $id_guest = false + ) { + $context = Context::getContext(); + if (!$id_cart) { + $id_cart = $context->cart->id; + } + if (!$id_guest) { + $id_guest = $context->cart->id_guest; + } + + if ($operator == 'up') { + if (!$date_from && !$date_to) { + return false; + } + + if (!$id_hotel) { + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product)) { + if (!$id_hotel = $roomTypeInfo['id_hotel']) { + return false; + } + } + } + $objBookingDtl = new HotelBookingDetail(); + $bookingParams = array( + 'date_from' => $date_from, + 'date_to' => $date_to, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, + 'id_cart' => $id_cart, + 'id_guest' => $id_guest, + ); + + if (Configuration::get('PS_FRONT_OCCUPANCY_WISE_BOOKING')) { + $roomsRequired = count($occupancy); + } else { + $roomsRequired = $occupancy; + } + + if ($hotelRoomData = $objBookingDtl->dataForFrontSearch($bookingParams)) { + if (isset($hotelRoomData['stats']['num_avail'])) { + $totalAvailableRooms = $hotelRoomData['stats']['num_avail']; + if ($operator == 'up') { + if ($totalAvailableRooms >= $roomsRequired) { + // add rooms to cart + $roomsAvailableList = $hotelRoomData['rm_data'][$id_product]['data']['available']; + return $this->addCartBookingData( + $id_product, + $occupancy, + $id_hotel, + $date_from, + $date_to, + $roomDemand, + $roomsAvailableList, + $id_cart + ); + } else { + return false; + } + } + } else { + return false; + } + } else { + return false; + } + } else { + return $this->deleteCartBookingData( + $id_cart, + $id_product, + 0, + $date_from, + $date_to + ); + } + } /** * [checkExistanceOfRoomInCurrentCart :: To check Whether a room for a date range(which start date is $date_from and End date is $date_to) in current cart is already exists for a customer whose guest id is $id_guest]. * @@ -643,6 +812,8 @@ class HotelCartBookingData extends ObjectModel $cart_detail_data[$key]['date_from'] = $value['date_from']; $cart_detail_data[$key]['date_to'] = $value['date_to']; + $cart_detail_data[$key]['child_ages'] = json_decode($value['child_ages']); + $unit_price = Product::getPriceStatic($value['id_product'], true); $unit_price_tax_excl = Product::getPriceStatic($value['id_product'], false); $productPriceWithoutReduction = $productObj->getPriceWithoutReduct(false); @@ -939,7 +1110,6 @@ class HotelCartBookingData extends ObjectModel $cartHotelData[$prodKey]['hotel_info'] = $hotelInfo; } } - if (isset($context->customer->id)) { $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( $context->cart->id, @@ -953,6 +1123,7 @@ class HotelCartBookingData extends ObjectModel $product['id_product'] ); } + if (isset($cartBookingDetails) && $cartBookingDetails) { foreach ($cartBookingDetails as $data_k => $data_v) { $dateJoin = strtotime($data_v['date_from']).strtotime($data_v['date_to']); @@ -970,8 +1141,12 @@ class HotelCartBookingData extends ObjectModel $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] += $demandPrice; $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] += 1; $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['adult'] += $data_v['adult']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['children'] += $data_v['children']; + if (is_array($data_v['child_ages'])) { + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'] = array_merge($cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'], json_decode($data_v['child_ages'])); + } $varQty = (int) $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm']; - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $product['id_product'], $data_v['date_from'], @@ -996,6 +1171,10 @@ class HotelCartBookingData extends ObjectModel strtotime($data_v['date_to']) ); $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['adult'] = $data_v['adult']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['children'] = $data_v['children']; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['child_ages'] = json_decode($data_v['child_ages']); + $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( $product['id_product'], $data_v['date_from'], @@ -1041,7 +1220,6 @@ class HotelCartBookingData extends ObjectModel } } } - return $cartHotelData; } diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 44b43a517..2c0c5ed31 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -217,6 +217,9 @@ class HotelHelper Configuration::updateValue('WK_ADVANCED_PAYMENT_GLOBAL_MIN_AMOUNT', 10); Configuration::updateValue('WK_ADVANCED_PAYMENT_INC_TAX', 1); + Configuration::updateValue('WK_GLOBAL_CHILD_MAX_AGE', 15); + Configuration::updateValue('WK_GLOBAL_MAX_CHILD_IN_ROOM', 3); + Configuration::updateValue( 'MAX_GLOBAL_BOOKING_DATE', date('d-m-Y', strtotime(date('Y-m-d', time()).' + 1 year')) @@ -248,6 +251,14 @@ class HotelHelper Configuration::updateValue('WK_HTL_TAG_LINE', $WK_HTL_TAG_LINE); Configuration::updateValue('WK_HTL_SHORT_DESC', $WK_HTL_SHORT_DESC); + // Search Fields + Configuration::updateValue('PS_FRONT_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS); + Configuration::updateValue('PS_FRONT_OWS_SEARCH_ALGO_TYPE', HotelBookingDetail::SEARCH_EXACT_ROOM_TYPE_ALGO); + Configuration::updateValue('PS_FRONT_OCCUPANCY_WISE_BOOKING', true); + Configuration::updateValue('PS_BACKOFFICE_SEARCH_TYPE', HotelBookingDetail::SEARCH_TYPE_OWS); + Configuration::updateValue('PS_BACKOFFICE_OWS_SEARCH_ALGO_TYPE', HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO); + Configuration::updateValue('PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING', true); + return true; } @@ -513,6 +524,10 @@ class HotelHelper $htl_rm_type->id_hotel = $id_hotel; $htl_rm_type->adult = 2; $htl_rm_type->children = 2; + $htl_rm_type->max_adults = 2; + $htl_rm_type->max_children = 2; + $htl_rm_type->max_guests = 4; + $htl_rm_type->save(); // Add features to the product @@ -721,4 +736,31 @@ class HotelHelper } return $randZipCode; } + + /** + * Get Super Admin Of Prestashop + * @return int Super Admin Employee ID + */ + public static function getSupperAdmin() + { + if ($data = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'employee` ORDER BY `id_employee`')) { + foreach ($data as $emp) { + $employee = new Employee($emp['id_employee']); + if ($employee->isSuperAdmin()) { + return $emp['id_employee']; + } + } + } + + return false; + } + + public static function getNumberOfDays($dateFrom, $dateTo) + { + $startDate = new DateTime($dateFrom); + $endDate = new DateTime($dateTo); + $daysDifference = $startDate->diff($endDate)->days; + + return $daysDifference; + } } diff --git a/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php b/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php index 3d490af2c..ddef4d3ff 100644 --- a/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php +++ b/modules/hotelreservationsystem/classes/HotelOrderRestrictDate.php @@ -85,7 +85,7 @@ class HotelOrderRestrictDate extends ObjectModel foreach ($cartProducts as $product) { if ($product['active']) { $objCartBookingData = new HotelCartBookingData(); - $obj_htl_bk_dtl = new HotelBookingDetail(); + $objBookingDetail = new HotelBookingDetail(); $obj_rm_type = new HotelRoomType(); if ($cart_bk_data = $objCartBookingData->getOnlyCartBookingData( @@ -115,11 +115,18 @@ class HotelOrderRestrictDate extends ObjectModel $cart_data[$date_join]['id_rms'][] = $data['id_room']; } foreach ($cart_data as $cl_key => $cl_val) { - $avai_rm = $obj_htl_bk_dtl->DataForFrontSearch($cl_val['date_from'], $cl_val['date_to'], $cl_val['id_hotel'], $product['id_product'], 1); + $bookingParams = array( + 'date_from' => $cl_val['date_from'], + 'date_to' => $cl_val['date_to'], + 'hotel_id' => $cl_val['id_hotel'], + 'id_room_type' => $product['id_product'], + 'only_search_data' => 1, + ); + $avai_rm = $objBookingDetail->dataForFrontSearch($bookingParams); $isRmBooked = 0; - if (count($avai_rm['rm_data'][0]['data']['available']) < count($cl_val['id_rms'])) { + if (count($avai_rm['rm_data'][$product['id_product']]['data']['available']) < count($cl_val['id_rms'])) { foreach ($cl_val['id_rms'] as $cr_key => $cr_val) { - if($isRmBooked = $obj_htl_bk_dtl->chechRoomBooked($cr_val, $cl_val['date_from'], $cl_val['date_to'])){ + if($isRmBooked = $objBookingDetail->chechRoomBooked($cr_val, $cl_val['date_from'], $cl_val['date_to'])){ break; } } diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index c88ff1324..2d214b62e 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -27,8 +27,11 @@ class HotelReservationSystemDb `id` int(11) NOT NULL AUTO_INCREMENT, `id_product` int(11) NOT NULL, `id_hotel` int(11) NOT NULL, - `adult` smallint(6) NOT NULL, - `children` smallint(6) NOT NULL, + `adult` smallint(6) NOT NULL DEFAULT '2', + `children` smallint(6) NOT NULL DEFAULT '0', + `max_adults` smallint(6) NOT NULL DEFAULT '2', + `max_children` smallint(6) NOT NULL DEFAULT '0', + `max_guests` smallint(6) NOT NULL DEFAULT '2', `min_los` smallint(6) NOT NULL DEFAULT '1', `max_los` smallint(6) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, @@ -128,6 +131,9 @@ class HotelReservationSystemDb `extra_demands` text NOT NULL, `date_from` datetime NOT NULL, `date_to` datetime NOT NULL, + `adult` smallint(6) NOT NULL, + `children` smallint(6) NOT NULL, + `child_ages` text NOT NULL, `is_refunded` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, @@ -167,6 +173,7 @@ class HotelReservationSystemDb `room_num` varchar(225) DEFAULT NULL, `adult` smallint(6) NOT NULL DEFAULT '0', `children` smallint(6) NOT NULL DEFAULT '0', + `child_ages` text NOT NULL, `is_refunded` tinyint(1) NOT NULL DEFAULT '0', -- `available_for_order` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, diff --git a/modules/hotelreservationsystem/classes/HotelRoomType.php b/modules/hotelreservationsystem/classes/HotelRoomType.php index 49cde494f..f48b00f45 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomType.php +++ b/modules/hotelreservationsystem/classes/HotelRoomType.php @@ -25,6 +25,9 @@ class HotelRoomType extends ObjectModel public $id_hotel; public $adult; public $children; + public $max_adults; + public $max_children; + public $max_guests; public $min_los; public $max_los; public $date_add; @@ -38,6 +41,9 @@ class HotelRoomType extends ObjectModel 'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'adult' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), 'children' => array('type' => self::TYPE_INT, 'validate' => 'isInt'), + 'max_adults' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 2), + 'max_children' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'max_guests' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 2), 'min_los' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 1), 'max_los' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'default' => 0), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), @@ -220,8 +226,7 @@ class HotelRoomType extends ObjectModel if (!$idLang) { $idLang = Context::getContext()->language->id; } - - $sql = 'SELECT hrt.`id`,hrt.`id_hotel`, hrt.`adult`, hrt.`children`, hbl.`hotel_name`, hrt.`min_los`, hrt.`max_los` + $sql = 'SELECT hrt.*, hbl.`hotel_name` FROM `'._DB_PREFIX_.'htl_room_type` AS hrt INNER JOIN `'._DB_PREFIX_.'htl_branch_info_lang` AS hbl ON (hbl.`id` = hrt.`id_hotel` AND hbl.`id_lang` = '.(int)$idLang.') @@ -268,26 +273,40 @@ class HotelRoomType extends ObjectModel return Db::getInstance()->executeS($sql); } + /** + * @param [int] $roomTypesList: string of idRoomTypes seperated by "," + */ + public function getRoomTypeDetailByRoomTypeIds($roomTypesList) + { + $sql = 'SELECT COUNT(hri.`id`) AS `numberOfRooms`, hrt.`id_product`, `adult`, `children`, `max_adults`, `max_children`, `max_guests` + FROM `'._DB_PREFIX_.'htl_room_type` AS `hrt` + INNER JOIN `'._DB_PREFIX_.'htl_room_information` AS `hri` ON (hri.`id_product` = hrt.`id_product`) + WHERE hrt.`id_product` IN ('.$roomTypesList.') + GROUP BY hrt.`id_product`'; + + return Db::getInstance()->executeS($sql); + } + /** * [getIdProductByHotelId :: if (0) * { - * returns array containing all rooms types information belongs to the hotel which id is passed as $hotel_id + * returns array containing all rooms types information belongs to the hotel which id is passed as $idHotel * } * else * { - * returns array containing rooms type information which produt_id=$room_type belongs to the hotel which id is passed as $hotel_id + * returns array containing rooms type information which produt_id=$idRoomType belongs to the hotel which id is passed as $idHotel * }]. * - * @param [type] $hotel_id [Id of the hotel ] - * @param [int] $room_type [ + * @param [type] $idHotel [Id of the hotel ] + * @param [int] $idRoomType [ * Id of the product * if (0) * { - * returns array containing all rooms types information belongs to the hotel which id is passed as $hotel_id + * returns array containing all rooms types information belongs to the hotel which id is passed as $idHotel * } * else * { - * returns array containing rooms type information which produt_id=$room_type belongs to the hotel which id is passed as $hotel_id + * returns array containing rooms type information which produt_id=$idRoomType belongs to the hotel which id is passed as $idHotel * } * ] * @param [1|0] $onlyActiveProd [1 for only active products data and 0 for all products data] @@ -295,10 +314,10 @@ class HotelRoomType extends ObjectModel * * @return [array|false] [If data found returns array containing information of the room types else returns false ] */ - public function getIdProductByHotelId($hotel_id, $room_type = 0, $onlyActiveProd = 0, $onlyActiveHotel = 0) + public function getIdProductByHotelId($idHotel, $idRoomType = 0, $onlyActiveProd = 0, $onlyActiveHotel = 0) { - $sql = 'SELECT DISTINCT hrt.`id_product`, hrt.`adult`, hrt.`children`, hrt.`id` FROM `'._DB_PREFIX_. - 'htl_room_type` AS hrt '; + $sql = 'SELECT DISTINCT hrt.`id_product`, hrt.`adult`, hrt.`children`, hrt.`id` + FROM `'._DB_PREFIX_.'htl_room_type` AS hrt '; if ($onlyActiveHotel) { $sql .= 'INNER JOIN `'._DB_PREFIX_.'htl_branch_info` AS hti ON (hti.id = hrt.id_hotel AND hti.active = 1)'; @@ -306,24 +325,21 @@ class HotelRoomType extends ObjectModel if ($onlyActiveProd) { $sql .= 'INNER JOIN `'._DB_PREFIX_.'product` AS pp ON (hrt.id_product = pp.id_product AND pp.active = 1)'; } - $sql .= 'WHERE hrt.`id_hotel`='.$hotel_id; + $sql .= 'WHERE hrt.`id_hotel`='. (int)$idHotel; - if ($room_type) { - $sql .= ' AND hrt.`id_product` ='.$room_type; + if ($idRoomType) { + $sql .= ' AND hrt.`id_product` = '. (int)$idRoomType; } - $rm_type = Db::getInstance()->executeS($sql); - if ($rm_type) { - return $rm_type; - } - return false; + return Db::getInstance()->executeS($sql); } + /** - * [getMaxAdults :: To get Maximum number of adults can be in a room type for a hotel]. + * [getMaxAdults :: To get Maximum number of adult can be in a room type for a hotel]. * - * @param [int] $id_hotel [Id of the hotel for Maximum number of adults data you want] + * @param [int] $id_hotel [Id of the hotel for Maximum number of adult data you want] * - * @return [int|false] [If data found returns number of maximum adults can be in a room type for hotel else returns false ] + * @return [int|false] [If data found returns number of maximum adult can be in a room type for hotel else returns false ] */ public static function getMaxAdults($id_hotel) { diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index e5d235806..9d49185bc 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -269,18 +269,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $currentDate = date('Y-m-d', $date); $nextDayDate = date('Y-m-d', strtotime('+1 day', strtotime($currentDate))); if ($id_product) { - $roomTypeAvailabilityInfo = $objBookingDetail->DataForFrontSearch( - $currentDate, - $nextDayDate, - $id_hotel, - $id_product, - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $currentDate, + 'date_to' => $nextDayDate, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $objBookingDetail->dataForFrontSearch($bookingParams); if (isset($roomTypeAvailabilityInfo['stats']['num_avail'])) { $totalAvailableRooms = $roomTypeAvailabilityInfo['stats']['num_avail']; } else { @@ -302,18 +298,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $currentDate, $nextDayDate ); - $roomTypeAvailabilityInfo = $objBookingDetail->DataForFrontSearch( - $currentDate, - $nextDayDate, - $id_hotel, - $product['id_product'], - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $currentDate, + 'date_to' => $nextDayDate, + 'hotel_id' => $id_hotel, + 'id_room_type' => $product['id_product'], + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $objBookingDetail->dataForFrontSearch($bookingParams); if (isset($roomTypeAvailabilityInfo['stats']['num_avail'])) { $totalAvailableRooms = $roomTypeAvailabilityInfo['stats']['num_avail']; } else { @@ -454,18 +446,14 @@ class HotelRoomTypeFeaturePricing extends ObjectModel $roomTypeInfo = $hotelRoomType->getRoomTypeInfoByIdProduct($id_product); $id_hotel = $roomTypeInfo['id_hotel']; if ($id_hotel) { - $roomTypeAvailabilityInfo = $hotelBookingDetail->DataForFrontSearch( - $dateFrom, - $dateTo, - $id_hotel, - $id_product, - 1, - 0, - 0, - -1, - 0, - 0 + $bookingParams = array( + 'date_from' => $dateFrom, + 'date_to' => $dateTo, + 'hotel_id' => $id_hotel, + 'id_room_type' => $id_product, + 'only_search_data' => 1, ); + $roomTypeAvailabilityInfo = $hotelBookingDetail->dataForFrontSearch($bookingParams); $bookedRoomsInfo = $hotelRoomInformation->getRoomTypeBookedRoomsForDateRange( $id_hotel, $id_product, diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index db62b4f9f..62142f2f7 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -201,6 +201,7 @@ class AdminAddHotelController extends ModuleAdminController $longitude = Tools::getValue('loclongitude'); $map_formated_address = Tools::getValue('locformatedAddr'); $map_input_text = Tools::getValue('googleInputField'); + // check if field is atleast in default language. Not available in default prestashop $defaultLangId = Configuration::get('PS_LANG_DEFAULT'); $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php index cd8bab0df..3d4e7aae8 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php @@ -365,6 +365,8 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController $this->errors[] = $this->l('Invalid value of impact value.'); } } + + if (!count($this->errors)) { if ($idFeaturePrice) { $objFeaturePricing = new HotelRoomTypeFeaturePricing($idFeaturePrice); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index 1670454bf..96280681b 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -83,6 +83,31 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'title' => $this->l('Save'), ), ), + 'occupancypanel' => array( + 'icon' => 'icon-users', + 'title' => $this->l('Occupancy Setting'), + 'fields' => array( + // max age of child + 'WK_GLOBAL_CHILD_MAX_AGE' => array( + 'title' => $this->l('Consider guest as child below age'), + 'type' => 'text', + 'required' => true, + 'validation' => 'isUnsignedInt', + 'hint' => $this->l('Enter the age of the guest, which that guest will be considered as child.'), + ), + 'WK_GLOBAL_MAX_CHILD_IN_ROOM' => array( + 'title' => $this->l('Maximum children allowed in a room'), + 'type' => 'text', + 'required' => true, + 'validation' => 'isUnsignedInt', + 'hint' => $this->l('Enter number of the child allowed in a room.'), + 'desc' => $this->l('Set as 0 if you do not want to limit children in a room.') + ), + ), + 'submit' => array( + 'title' => $this->l('Save'), + ), + ), 'generalsetting' => array( 'title' => $this->l('Configuration'), 'fields' => array( @@ -260,6 +285,13 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); $languages = Language::getLanguages(false); + // Validation for the occupancy settings + // max age of infant after which guest will considered as child // below 18 + $globalChildMaxAge = Tools::getValue('WK_GLOBAL_CHILD_MAX_AGE'); + $globalMaxChildInRoom = Tools::getValue('WK_GLOBAL_MAX_CHILD_IN_ROOM'); + + // End occupancy fields validation + if (!trim(Tools::getValue('WK_HTL_CHAIN_NAME_'.$defaultLangId))) { $this->errors[] = $this->l('Hotel chain name is required at least in ').$objDefaultLanguage['name']; } else { diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 6fb2a1dea..88b3ec4f6 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -112,7 +112,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $all_room_type = array(); $rms_in_cart = 0; $hotel_id = 0; - $room_type = 0; + $id_room_type = 0; $booking_data = false; $id_cart = $this->context->cart->id; $id_guest = $this->context->cookie->id_guest; @@ -173,20 +173,27 @@ class AdminHotelRoomsBookingController extends ModuleAdminController } } if (Tools::getValue('id_rt')) { - $room_type = Tools::getValue('id_rt'); + $id_room_type = Tools::getValue('id_rt'); + } + if (Tools::getValue('sr_occupancy')) { + $occupancy = Tools::getValue('sr_occupancy'); + } else { + $occupancy = array(); } $formAction = ''; if (Tools::isSubmit('search_hotel_list')) { $date_from = Tools::getValue('from_date'); $date_to = Tools::getValue('to_date'); $hotel_id = Tools::getValue('hotel_id'); - $room_type = Tools::getValue('room_type'); - + $occupancy = Tools::getValue('occupancy'); + $id_room_type = Tools::getValue('room_type'); $formAction = $this->context->link->getAdminLink('AdminHotelRoomsBooking'). - '&dt_f='.$date_from.'&dt_t='.$date_to.'&id_htl='.$hotel_id.'&id_rt='.$room_type; + '&dt_f='.$date_from.'&dt_t='.$date_to.'&id_htl='.$hotel_id.'&id_rt='.$id_room_type. + '&'.http_build_query(array('sr_occupancy' => $occupancy)); Tools::redirectAdmin($formAction); } + if ($date_from == '') { $this->errors[] = $this->l('Date from is required field.'); } @@ -206,9 +213,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $date_from, $date_to, $hotel_id, - $room_type, - $adult, - $children, + $id_room_type, + $occupancy, $num_rooms, $id_cart, $id_guest @@ -220,11 +226,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams = array(); $bookingParams['hotel_id'] = $hotel_id; - $bookingParams['room_type'] = $room_type; + $bookingParams['id_room_type'] = $id_room_type; $bookingParams['adult'] = $adult; $bookingParams['children'] = $children; $bookingParams['num_rooms'] = $num_rooms; - $bookingParams['for_calendar'] = 1; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 1; $bookingParams['search_booked'] = 1; @@ -238,7 +243,6 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $cal_date_to = date('Y-m-d', strtotime('+1 day', strtotime($cal_date_from))); $bookingParams['date_from'] = $cal_date_from; $bookingParams['date_to'] = $cal_date_to; - $booking_calendar_data[$cal_date_from] = $obj_booking_dtl->getBookingData($bookingParams); $start_date = date('Y-m-d', strtotime('+1 day', strtotime($start_date))); } @@ -268,12 +272,14 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $currency = new Currency((int)Configuration::get('PS_CURRENCY_DEFAULT')); // booking allotment types $allotmentTypes = HotelBookingDetail::getAllAllotmentTypes(); + $this->tpl_view_vars = array( 'check_calender_var' => $check_calender_var, 'date_from' => $date_from, 'date_to' => $date_to, 'hotel_id' => $hotel_id, - 'room_type' => $room_type, + 'occupancies' => $occupancy, + 'room_type' => $id_room_type, 'adult' => $adult, 'children' => $children, 'num_rooms' => $num_rooms, @@ -286,7 +292,19 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'allotment_types' => $allotmentTypes, 'rms_in_cart' => $rms_in_cart, 'formAction' => $formAction, + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'), ); + $this->tpl_view_vars['occupancy_wise_booking'] = Configuration::get('PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING'); + + if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS ) { + $this->tpl_view_vars['occupancy_adults'] = array_sum(array_column($occupancy, 'adult')); + $this->tpl_view_vars['occupancy_children'] = array_sum(array_column($occupancy, 'children')); + $this->tpl_view_vars['occupancy_child_ages'] = array_sum(array_column($occupancy, 'child_ages')); + $this->tpl_view_vars['occupancy_wise_search'] = true; + } else { + $this->tpl_view_vars['occupancy_wise_search'] = false; + } return parent::renderView(); } @@ -310,6 +328,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $id_product = Tools::getValue('id_prod'); $date_from = Tools::getValue('date_from'); $date_to = Tools::getValue('date_to'); + $occupancy = Tools::getValue('occupancy'); $date_from = date("Y-m-d", strtotime($date_from)); $date_to = date("Y-m-d", strtotime($date_to)); @@ -356,6 +375,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $obj_cart_book_data = new HotelCartBookingData(); $total_amount = $this->context->cart->getOrderTotal(); if ($opt) { + if (!Configuration::get('PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING')) { + $objRoomType = new HotelRoomType(); + $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product); + } $obj_cart_book_data->id_cart = $id_cart; $obj_cart_book_data->id_guest = $id_guest; $obj_cart_book_data->id_product = $id_product; @@ -367,6 +390,16 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $obj_cart_book_data->comment = $comment; $obj_cart_book_data->date_from = $date_from; $obj_cart_book_data->date_to = $date_to; + if (Configuration::get('PS_BACKOFFICE_OCCUPANCY_WISE_BOOKING')) { + $room_occupancy = array_shift($occupancy); + $obj_cart_book_data->adult = $room_occupancy['adult']; + $obj_cart_book_data->children = $room_occupancy['children']; + $obj_cart_book_data->child_ages = $room_occupancy['children'] ? json_encode($room_occupancy['child_ages']) : json_encode(array()); + } else { + $obj_cart_book_data->adult = $roomTypeInfo['adult']; + $obj_cart_book_data->children = $roomTypeInfo['children']; + $obj_cart_book_data->child_ages = json_encode(array()); + } $obj_cart_book_data->save(); $obj_rm_info = new HotelRoomInformation($id_room); @@ -377,11 +410,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_from'] = $search_date_from; $bookingParams['date_to'] = $search_date_to; $bookingParams['hotel_id'] = $id_hotel; - $bookingParams['room_type'] = $search_id_prod; + $bookingParams['id_room_type'] = $search_id_prod; $bookingParams['adult'] = 0; $bookingParams['children'] = 0; $bookingParams['num_rooms'] = 1; - $bookingParams['for_calendar'] = 1; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 1; $bookingParams['search_booked'] = 0; @@ -428,11 +460,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_from'] = $search_date_from; $bookingParams['date_to'] = $search_date_to; $bookingParams['hotel_id'] = $id_hotel; - $bookingParams['room_type'] = $search_id_prod; + $bookingParams['id_room_type'] = $search_id_prod; $bookingParams['adult'] = 0; $bookingParams['children'] = 0; $bookingParams['num_rooms'] = 1; - $bookingParams['for_calendar'] = 1; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 1; $bookingParams['search_booked'] = 0; @@ -461,8 +492,10 @@ class AdminHotelRoomsBookingController extends ModuleAdminController ); // No use of adult, child, num_rooms - $adult = 0; - $children = 0; + // $adult = 0; + // $children = 0; + // @todo shreesh + $occupancy = array(); $num_rooms = 1; $booking_data = array(); @@ -472,8 +505,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $search_date_to, $id_hotel, $search_id_prod, - $adult, - $children, + $occupancy, $num_rooms, $id_cart, $id_guest @@ -511,7 +543,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $start_date = date('Y-m-01', strtotime($query_date)); // hard-coded '01' for first day $last_day_this_month = date('Y-m-t', strtotime($query_date)); $hotel_id = 1; - $room_type = 0; + $id_room_type = 0; $adult = 1; $children = 0; $num_rooms = 1; @@ -520,7 +552,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams = array(); $bookingParams['hotel_id'] = $hotel_id; - $bookingParams['room_type'] = $room_type; + $bookingParams['id_room_type'] = $id_room_type; $bookingParams['adult'] = $adult; $bookingParams['children'] = $children; $bookingParams['num_rooms'] = $num_rooms; @@ -616,9 +648,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $date_from, $date_to, $hotel_id, - $room_type, - $adult, - $children, + $id_room_type, + $occupancy, $num_rooms, $id_cart, $id_guest @@ -630,11 +661,9 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['date_from'] = $date_from; $bookingParams['date_to'] = $date_to; $bookingParams['hotel_id'] = $hotel_id; - $bookingParams['room_type'] = $room_type; - $bookingParams['adult'] = $adult; - $bookingParams['children'] = $children; + $bookingParams['id_room_type'] = $id_room_type; + $bookingParams['occupancy'] = $occupancy; $bookingParams['num_rooms'] = $num_rooms; - $bookingParams['for_calendar'] = 0; $bookingParams['search_available'] = 1; $bookingParams['search_partial'] = 1; $bookingParams['search_booked'] = 1; @@ -644,8 +673,11 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams['search_cart_rms'] = 1; $booking_data = $obj_booking_dtl->getBookingData($bookingParams); + if ($booking_data) { + $objHotelRoomType = new HotelRoomType(); foreach ($booking_data['rm_data'] as $key_bk_data => $value_bk_data) { + $booking_data['rm_data'][$key_bk_data]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value_bk_data['id_product']); if (isset($value_bk_data['data']['booked']) && $value_bk_data['data']['booked']) { foreach ($value_bk_data['data']['booked'] as $booked_k1 => $booked_v1) { if (isset($booked_v1['detail']) && $booked_v1['detail']) { diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js index 0f14cd5b4..47cc95cd5 100644 --- a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js +++ b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js @@ -109,7 +109,7 @@ var GoogleMapsManager = { that.autocomplete.addListener('place_changed', function() { that.clearAllMarkers(); var place = that.autocomplete.getPlace(); - + if (place.geometry.viewport) { that.map.fitBounds(place.geometry.viewport); } else { @@ -136,7 +136,7 @@ var GoogleMapsManager = { e.preventDefault(); } }); - + if(cb && typeof cb === 'function') { cb(); } @@ -583,7 +583,8 @@ $(document).ready(function() { } }); - $('body').on('click', '.avai_add_cart', function() { + $('body').on('click', '.avai_add_cart', function(e) { + e.preventDefault(); $current_btn = $(this); $current_btn.attr('disabled', 'disabled'); var search_id_prod = $("#search_id_prod").val(); @@ -598,60 +599,114 @@ $(document).ready(function() { var booking_type = $("input[name='bk_type_" + id_room + "']:checked").val(); var comment = $("#comment_" + id_room).val(); var btn = $(this); + $(this).closest('tr').find('.booking_occupancy_wrapper').parent().removeClass('open'); - $.ajax({ - url: rooms_booking_url, - type: 'POST', - dataType: 'json', - data: { - ajax: true, - action: 'addDataToCart', - id_prod: id_prod, - id_room: id_room, - id_hotel: id_hotel, - date_from: date_from, - date_to: date_to, - booking_type: booking_type, - comment: comment, - search_id_prod: search_id_prod, - search_date_from: search_date_from, - search_date_to: search_date_to, - opt: 1, - }, - success: function(result) { - if (result) { - if (result.rms_in_cart) { - $(".cart_booking_btn").removeAttr('disabled'); - $current_btn.removeAttr('disabled'); + var occupancy = getBookingOccupancyDetails($(this).closest('tr').find('.booking_occupancy')); + + if (occupancy) { + $.ajax({ + url: rooms_booking_url, + type: 'POST', + dataType: 'json', + data: { + ajax: true, + action: 'addDataToCart', + id_prod: id_prod, + id_room: id_room, + id_hotel: id_hotel, + date_from: date_from, + date_to: date_to, + occupancy: occupancy, + booking_type: booking_type, + comment: comment, + search_id_prod: search_id_prod, + search_date_from: search_date_from, + search_date_to: search_date_to, + opt: 1, + }, + success: function(result) { + if (result) { + if (result.rms_in_cart) { + $(".cart_booking_btn").removeAttr('disabled'); + $current_btn.removeAttr('disabled'); + } + + btn.removeClass('btn-primary').removeClass('avai_add_cart').addClass('btn-danger').addClass('avai_delete_cart_data').html(remove); + + btn.attr('data-id-cart', result.id_cart); + btn.attr('data-id-cart-book-data', result.id_cart_book_data); + html = ""; + html += "" + result.room_num + ""; + html += "" + result.room_type + ""; + html += "" + result.date_from + " - " + result.date_to + ""; + html += "" + result.amount + ""; + html += ""; + html += ""; + + $('.cart_tbody').append(html); + + $('#cart_total_amt').html(result.total_amount); + // $('#cart_record').html(result.rms_in_cart); + + // For Stats + $('#cart_record').html(result.booking_stats.stats.num_cart); + $("#num_avail").html(result.booking_stats.stats.num_avail); + $('#cart_stats').html(result.booking_stats.stats.num_cart); } - - btn.removeClass('btn-primary').removeClass('avai_add_cart').addClass('btn-danger').addClass('avai_delete_cart_data').html(remove); - - btn.attr('data-id-cart', result.id_cart); - btn.attr('data-id-cart-book-data', result.id_cart_book_data); - html = ""; - html += "" + result.room_num + ""; - html += "" + result.room_type + ""; - html += "" + result.date_from + " - " + result.date_to + ""; - html += "" + result.amount + ""; - html += ""; - html += ""; - - $('.cart_tbody').append(html); - - $('#cart_total_amt').html(result.total_amount); - // $('#cart_record').html(result.rms_in_cart); - - // For Stats - $('#cart_record').html(result.booking_stats.stats.num_cart); - $("#num_avail").html(result.booking_stats.stats.num_avail); - $('#cart_stats').html(result.booking_stats.stats.num_cart); } - } - }); + }); + } else { + $current_btn.attr('disabled', false); + setRoomTypeGuestOccupancy($(this).closest('tr').find('.booking_occupancy_wrapper')); + } }); - $('body').on('click', '.par_add_cart', function() { + function getBookingOccupancyDetails(bookingform) + { + let occupancy; + if (occupancy_wise_booking) { + let selected_occupancy = $(bookingform).find(".occupancy_info_block.selected") + if (selected_occupancy.length) { + occupancy = []; + $(selected_occupancy).each(function(ind, element) { + if (parseInt($(element).find('.num_adults').val())) { + let child_ages = []; + $(element).find('.guest_child_age').each(function(index) { + if ($(this).val() > -1) { + child_ages.push($(this).val()); + } + }); + if ($(element).find('.num_children').val()) { + if (child_ages.length != $(element).find('.num_children').val()) { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + } + occupancy.push({ + 'adult': $(element).find('.num_adults').val(), + 'children': $(element).find('.num_children').val(), + 'child_ages': child_ages + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + return false; + } + }); + } else { + $(bookingform).find('.booking_occupancy_wrapper').parent().addClass('open'); + occupancy = false; + } + } else { + return true; + } + + return occupancy; + } + + $('body').on('click', '.par_add_cart', function(e) { + e.preventDefault(); $current_btn = $(this); $current_btn.attr('disabled', 'disabled'); var search_id_prod = $("#search_id_prod").val(); @@ -668,58 +723,67 @@ $(document).ready(function() { var booking_type = $("input[name='bk_type_" + id_room + "_" + sub_key + "']:checked").val(); var comment = $("#comment_" + id_room + "_" + sub_key).val(); var btn = $(this); + $(this).closest('tr').find('.booking_occupancy_wrapper').parent().removeClass('open'); - $.ajax({ - url: rooms_booking_url, - type: 'POST', - dataType: 'json', - data: { - ajax: true, - action: 'addDataToCart', - id_prod: id_prod, - id_room: id_room, - id_hotel: id_hotel, - date_from: date_from, - date_to: date_to, - booking_type: booking_type, - comment: comment, - search_id_prod: search_id_prod, - search_date_from: search_date_from, - search_date_to: search_date_to, - opt: 1, - }, - success: function(result) { - if (result) { - if (result.rms_in_cart) { - $(".cart_booking_btn").removeAttr('disabled'); - $current_btn.removeAttr('disabled'); + var occupancy = getBookingOccupancyDetails($(this).closest('tr').find('.booking_occupancy')); + + if (occupancy) { + $.ajax({ + url: rooms_booking_url, + type: 'POST', + dataType: 'json', + data: { + ajax: true, + action: 'addDataToCart', + id_prod: id_prod, + id_room: id_room, + id_hotel: id_hotel, + date_from: date_from, + date_to: date_to, + occupancy: occupancy, + booking_type: booking_type, + comment: comment, + search_id_prod: search_id_prod, + search_date_from: search_date_from, + search_date_to: search_date_to, + opt: 1, + }, + success: function(result) { + if (result) { + if (result.rms_in_cart) { + $(".cart_booking_btn").removeAttr('disabled'); + $current_btn.removeAttr('disabled'); + } + + btn.removeClass('btn-primary').removeClass('par_add_cart').addClass('btn-danger').addClass('part_delete_cart_data').html(remove); + + btn.attr('data-id-cart', result.id_cart); + btn.attr('data-id-cart-book-data', result.id_cart_book_data); + + html = ""; + html += "" + result.room_num + ""; + html += "" + result.room_type + ""; + html += "" + result.date_from + " - " + result.date_to + ""; + html += "" + result.amount + ""; + html += ""; + html += ""; + + $('.cart_tbody').append(html); + + $('#cart_total_amt').html(result.total_amount); + // $('#cart_record').html(result.rms_in_cart); + + // For Stats + $('#cart_record').html(result.booking_stats.stats.num_cart); + $('#cart_stats').html(result.booking_stats.stats.num_cart); + $("#num_part").html(result.booking_stats.stats.num_part_avai); } - - btn.removeClass('btn-primary').removeClass('par_add_cart').addClass('btn-danger').addClass('part_delete_cart_data').html(remove); - - btn.attr('data-id-cart', result.id_cart); - btn.attr('data-id-cart-book-data', result.id_cart_book_data); - - html = ""; - html += "" + result.room_num + ""; - html += "" + result.room_type + ""; - html += "" + result.date_from + " - " + result.date_to + ""; - html += "" + result.amount + ""; - html += ""; - html += ""; - - $('.cart_tbody').append(html); - - $('#cart_total_amt').html(result.total_amount); - // $('#cart_record').html(result.rms_in_cart); - - // For Stats - $('#cart_record').html(result.booking_stats.stats.num_cart); - $('#cart_stats').html(result.booking_stats.stats.num_cart); - $("#num_part").html(result.booking_stats.stats.num_part_avai); } - } - }); + }); + } else { + $current_btn.attr('disabled', false); + setRoomTypeGuestOccupancy($(this).closest('tr').find('.booking_occupancy_wrapper')); + } }); $('body').on('click', '.ajax_cart_delete_data', function() { @@ -826,6 +890,7 @@ $(document).ready(function() { }, success: function(result) { if (result) { + debugger; if (!(result.rms_in_cart)) { $(".cart_booking_btn").attr('disabled', 'true'); } @@ -903,7 +968,7 @@ $(document).ready(function() { //$( "#max_global_book_date" ).datepicker( "option", "maxDate", '20 Mar 2020'); /*END*/ - + /* ---- AdminHotelFeaturePricesSettingsController Admin ---- */ $('#date_selection_type').on('change', function() { @@ -1160,8 +1225,206 @@ $(document).ready(function() { } initGoogleMaps(); + + + $(document).on('click', '.booking_occupancy_wrapper .remove-room-link', function(e) { + e.preventDefault(); + + booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); + $(this).closest('.occupancy_info_block').remove(); + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); + }); + + $(document).on('change', '.num_occupancy', function(e) { + + let current_room_occupancy = 0; + $(this).closest('.occupancy_info_block').find('.num_occupancy').each(function(){ + current_room_occupancy += parseInt($(this).val()); + }); + let max_guests_in_room = $(this).closest(".booking_occupancy_wrapper").find('.max_guests').val(); + let max_allowed_for_current = (max_guests_in_room - current_room_occupancy) + parseInt($(this).val()); + if ($(this).val() > $(this).attr('max')) { + $(this).val($(this).attr('max')); + } + if ($(this).val() > max_allowed_for_current) { + $(this).val(max_allowed_for_current); + } + + if ($(this).hasClass('num_children')) { + let totalChilds = $(this).closest('.occupancy_info_block').find('.guest_child_age').length; + if (totalChilds < $(this).val()) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').show(); + while ($(this).closest('.occupancy_info_block').find('.guest_child_age').length < $(this).val()) { + var roomBlockIndex = parseInt($(this).closest('.occupancy_info_block').attr('occ_block_index')); + var childAgeSelect = '
'; + childAgeSelect += ''; + childAgeSelect += '
'; + $(this).closest('.occupancy_info_block').find('.children_ages').append(childAgeSelect); + } + } else { + let child = $(this).val(); + $(this).closest('.occupancy_info_block').find('.guest_child_age').each(function(ind, element) { + if (child <= ind) { + $(element).parent().remove(); + } + }); + if (child == 0) { + $(this).closest('.occupancy_info_block').find('.children_age_info_block').hide(); + } + + } + } + + setRoomTypeGuestOccupancy($(this).closest('.booking_occupancy_wrapper')); + + }); + + + $(document).on('click', '.booking_guest_occupancy', function(e) { + $(this).parent().toggleClass('open'); + }); + + $(document).on('click', function(e) { + if ($('.booking_occupancy_wrapper:visible').length) { + var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); + $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); + setRoomTypeGuestOccupancy(occupancy_wrapper); + + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".avai_add_cart").length || $(e.target).closest(".par_add_cart").length)) { + let hasErrors = 0; + + let adult = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); + let children = $(occupancy_wrapper).find(".num_children").map(function(){return $(this).val();}).get(); + let child_ages = $(occupancy_wrapper).find(".guest_child_age").map(function(){return $(this).val();}).get(); + + // start validating above values + if (!adult.length || (adult.length != children.length)) { + hasErrors = 1; + showErrorMessage(invalid_occupancy_txt); + } else { + $(occupancy_wrapper).find('.occupancy_count').removeClass('error_border'); + + // validate values of adult and children + adult.forEach(function (item, index) { + if (isNaN(item) || parseInt(item) < 1) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_adults").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + if (isNaN(children[index])) { + hasErrors = 1; + $(occupancy_wrapper).find(".num_children").eq(index).closest('.occupancy_count_block').find('.occupancy_count').addClass('error_border'); + } + }); + + // validate values of selected child ages + $(occupancy_wrapper).find('.guest_child_age').parent().removeClass('has-error'); + child_ages.forEach(function (age, index) { + age = parseInt(age); + if (isNaN(age) || (age < 0) || (age >= parseInt(max_child_age))) { + hasErrors = 1; + $(occupancy_wrapper).find(".guest_child_age").eq(index).parent().addClass('has-error'); + } + }); + } + if (hasErrors == 0) { + $(occupancy_wrapper).parent().removeClass('open'); + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().removeClass('has-error'); + + $(document).trigger( "QloApps:updateRoomOccupancy", [occupancy_wrapper]); + } else { + // $(occupancy_wrapper).siblings(".booking_guest_occupancy").parent().addClass('has-error'); + } + } + } + }); + + $('.booking_occupancy_wrapper .add_new_occupancy_btn').on('click', function(e) { + e.preventDefault(); + + var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + var occupancy_block = ''; + var roomBlockIndex = parseInt($(booking_occupancy_wrapper).find(".occupancy_info_block").last().attr('occ_block_index')); + roomBlockIndex += 1; + + + var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); + countRooms += 1 + occupancy_block += '
'; + occupancy_block += '
' + remove_txt + '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '(' + below_txt + ' ' + max_child_age + ' ' + years_txt + ')'; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += ''; + occupancy_block += '
'; + occupancy_block += '
'; + occupancy_block += '
'; + + $(booking_occupancy_wrapper).find('.booking_occupancy_inner').append(occupancy_block); + + setRoomTypeGuestOccupancy(booking_occupancy_wrapper); + }); }); +function setRoomTypeGuestOccupancy(booking_occupancy_wrapper) +{ + var adult = 0; + var children = 0; + var rooms = $(booking_occupancy_wrapper).find('.occupancy_info_block').length; + + $(booking_occupancy_wrapper).find(".num_adults" ).each(function(key, val) { + adult += parseInt($(this).val()); + }); + $(booking_occupancy_wrapper).find(".num_children" ).each(function(key, val) { + children += parseInt($(this).val()); + }); + + var guestButtonVal = parseInt(adult) + ' '; + if (parseInt(adult) > 1) { + guestButtonVal += adults_txt; + } else { + guestButtonVal += adult_txt; + } + if (parseInt(children) > 0) { + if (parseInt(children) > 1) { + guestButtonVal += ', ' + parseInt(children) + ' ' + children_txt; + } else { + guestButtonVal += ', ' + parseInt(children) + ' ' + child_txt; + } + } + if (parseInt(rooms) > 1) { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + rooms_txt; + } else { + guestButtonVal += ', ' + parseInt(rooms) + ' ' + room_txt; + } + $(booking_occupancy_wrapper).siblings('.booking_guest_occupancy').find('span').text(guestButtonVal); +} + + function showFeaturePriceRuleLangField(lang_iso_code, id_lang) { $('#feature_price_rule_lang_btn').html(lang_iso_code + ' '); 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 745368c1b..d29a820d5 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 @@ -45,6 +45,101 @@
+ {if $occupancy_wise_search} +
+ +
+
+ + +
+
+ {if isset($occupancies) && $occupancies} + {assign var=countRoom value=1} +
+ {foreach from=$occupancies key=key item=$occupancy name=occupancyInfo} +
+
{if !$smarty.foreach.occupancyInfo.first}{l s='Remove'}{/if}
+
+
+
+ + +
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+
+
+ +
+
+ {if isset($occupancy['child_ages']) && $occupancy['child_ages']} + {foreach $occupancy['child_ages'] as $childAge} +
+ +
+ {/foreach} + {/if} +
+
+
+
+
+
+
+ {assign var=countRoom value=$countRoom+1} + {/foreach} + {else} +
+
+
+
+
+ + +
+
+ + + ({l s='Below'} {$max_child_age|escape:'htmlall':'UTF-8'} {l s='years'}) +
+
+ +
+
+
+ {/if} +
+
+ {l s='Add Room'} +
+
+
+
+
+ {/if}