diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index ae35d50bd..cdca3016d 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1686,8 +1686,8 @@ class AdminStatsControllerCore extends AdminStatsTabController WHERE o.`valid` = 1 AND hbi.`active` = 1 AND hbd.`is_refunded` = 0 AND o.`invoice_date` BETWEEN "'.pSQL($dateFrom).' 00:00:00" AND "'.pSQL($dateTo).' 23:59:59" AND o.`source` = "'.pSQL(Configuration::get('PS_SHOP_DOMAIN')).'"'. - (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : ''). - 'GROUP BY o.`id_order` + (!is_null($idHotel) ? HotelBranchInformation::addHotelRestriction($idHotel, 'hbd') : '').' + GROUP BY o.`id_order` ) AS t'; $directRevenue = (float) Db::getInstance()->getValue($sql); diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index 5e85ac22d..5ade95914 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -598,16 +598,15 @@ class HotelReservationSystem extends Module || !$this->registerModuleHooks() || !$this->callInstallTab() || !$objHtlHelper->insertDefaultHotelEntries() + || !$objHtlHelper->createHotelRoomDefaultFeatures() + || !$objHtlHelper->insertHotelCommonFeatures() ) { return false; } // if module should be populated while installation if (isset($this->populateData) && $this->populateData) { - if (!$objHtlHelper->createHotelRoomDefaultFeatures() - || !$objHtlHelper->insertHotelCommonFeatures() - || !$objHtlHelper->createDummyDataForProject() - ) { + if (!$objHtlHelper->createDummyDataForProject()) { return false; } } diff --git a/modules/wkhotelfeaturesblock/classes/WkHotelFeaturesData.php b/modules/wkhotelfeaturesblock/classes/WkHotelFeaturesData.php index f1f6949ea..23d5990c2 100644 --- a/modules/wkhotelfeaturesblock/classes/WkHotelFeaturesData.php +++ b/modules/wkhotelfeaturesblock/classes/WkHotelFeaturesData.php @@ -138,8 +138,6 @@ class WkHotelFeaturesData extends ObjectModel // enter the default demo data of the module public function insertModuleDemoData() { - Configuration::updateValue('HOTEL_AMENITIES_BLOCK_NAV_LINK', 1); - $languages = Language::getLanguages(false); $HOTEL_AMENITIES_HEADING = array(); $HOTEL_AMENITIES_DESCRIPTION = array(); diff --git a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php index 510e448c7..1cfd97200 100644 --- a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php +++ b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php @@ -42,14 +42,6 @@ class AdminFeaturesModuleSettingController extends ModuleAdminController 'title' => $this->l('Hotel Amenity Setting'), 'icon' => 'icon-cogs', 'fields' => array( - 'HOTEL_AMENITIES_BLOCK_NAV_LINK' => array( - 'title' => $this->l('Show link at navigation'), - 'hint' => $this->l('Enable, if you want to display a link at navigation menu for the amenities block at home page.'), - 'validation' => 'isBool', - 'cast' => 'intval', - 'type' => 'bool', - 'required' => true - ), 'HOTEL_AMENITIES_HEADING' => array( 'title' => $this->l('Amenity Block Title'), 'type' => 'textLang', diff --git a/modules/wkhotelroom/classes/WkHotelRoomDisplay.php b/modules/wkhotelroom/classes/WkHotelRoomDisplay.php index 56aef9532..f324aba82 100644 --- a/modules/wkhotelroom/classes/WkHotelRoomDisplay.php +++ b/modules/wkhotelroom/classes/WkHotelRoomDisplay.php @@ -148,7 +148,7 @@ class WkHotelRoomDisplay extends ObjectModel $HOTEL_ROOM_DISPLAY_HEADING[$lang['id_lang']] = 'Our Rooms'; $HOTEL_ROOM_DISPLAY_DESCRIPTION[$lang['id_lang']] = 'Families travelling with kids will find Amboseli national park a safari destination matched to no other, with less tourist traffic, breathtaking open space.'; } - Configuration::updateValue('HOTEL_ROOM_BLOCK_NAV_LINK', 1); + // update global configuration values in multilang Configuration::updateValue('HOTEL_ROOM_DISPLAY_HEADING', $HOTEL_ROOM_DISPLAY_HEADING); Configuration::updateValue('HOTEL_ROOM_DISPLAY_DESCRIPTION', $HOTEL_ROOM_DISPLAY_DESCRIPTION); diff --git a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php index af26bfe6d..5e54ca3db 100644 --- a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php +++ b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php @@ -34,14 +34,6 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController 'title' => $this->l('Hotel Room Display Setting'), 'icon' => 'icon-cogs', 'fields' => array( - 'HOTEL_ROOM_BLOCK_NAV_LINK' => array( - 'title' => $this->l('Show link at navigation'), - 'hint' => $this->l('Enable, if you want to display a link at navigation menu for the hotel rooms block at home page.'), - 'validation' => 'isBool', - 'cast' => 'intval', - 'type' => 'bool', - 'required' => true - ), 'HOTEL_ROOM_DISPLAY_HEADING' => array( 'title' => $this->l('Hotel Room Block Title'), 'type' => 'textLang', diff --git a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php index f8138c5bc..28ce78361 100644 --- a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php +++ b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php @@ -144,7 +144,7 @@ class WkHotelTestimonialData extends ObjectModel $HOTEL_TESIMONIAL_BLOCK_HEADING[$lang['id_lang']] = 'What our guests say?'; $HOTEL_TESIMONIAL_BLOCK_CONTENT[$lang['id_lang']] = 'Fap put a bird on it next level, sustainable disrupt polaroid flannel Helvetica Kickstarter quinoa bicycle rights narwhal wolf Fap put a bird on it next level.'; } - Configuration::updateValue('HOTEL_TESIMONIAL_BLOCK_NAV_LINK', 1); + // update global configuration values in multilang Configuration::updateValue('HOTEL_TESIMONIAL_BLOCK_HEADING', $HOTEL_TESIMONIAL_BLOCK_HEADING); Configuration::updateValue('HOTEL_TESIMONIAL_BLOCK_CONTENT', $HOTEL_TESIMONIAL_BLOCK_CONTENT); diff --git a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php index 2bffd0fd9..0eec6e98b 100644 --- a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php +++ b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php @@ -36,14 +36,6 @@ class AdminTestimonialsModuleSettingController extends ModuleAdminController 'modulesetting' => array( 'title' => $this->l('Hotel Testimonials Setting'), 'fields' => array( - 'HOTEL_TESIMONIAL_BLOCK_NAV_LINK' => array( - 'title' => $this->l('Show link at navigation'), - 'hint' => $this->l('Enable, if you want to display a link at navigation menu for the testimonial block at home page.'), - 'validation' => 'isBool', - 'cast' => 'intval', - 'type' => 'bool', - 'required' => true - ), 'HOTEL_TESIMONIAL_BLOCK_HEADING' => array( 'title' => $this->l('Testimonial block title'), 'type' => 'textLang',