diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index cd78e3395..5072ed2d3 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -59,7 +59,11 @@ class CategoryControllerCore extends FrontController $this->addCSS(_THEME_CSS_DIR_.'occupancy.css'); $this->addJS(_THEME_JS_DIR_.'occupancy.js'); - + Media::addJsDef( + array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), + ) + ); $scenes = Scene::getScenes($this->category->id, $this->context->language->id, true, false); if ($scenes && count($scenes)) { $this->addJS(_THEME_JS_DIR_.'scenes.js'); diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php index 5a65c9795..0124fb8d0 100644 --- a/controllers/front/ContactController.php +++ b/controllers/front/ContactController.php @@ -235,6 +235,11 @@ class ContactControllerCore extends FrontController // GOOGLE MAP if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) { + Media::addJsDef( + array( + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), + ) + ); $this->addJS( 'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY. '&libraries=places&language='.$this->context->language->iso_code.'®ion='.$this->context->country->iso_code diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index d7b3d9ca7..5e1da2853 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -811,6 +811,7 @@ class OrderDetailControllerCore extends FrontController 'map_input_text' => $objHotelBranchInformation->map_input_text, ), 'hotel_name' => $objHotelBranchInformation->hotel_name, + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) )); $this->addJS( diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index ac7a4b8a4..724de5910 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -78,7 +78,8 @@ class ProductControllerCore extends FrontController 'hotel_location' => array( 'latitude' => $objHotelBranchInformation->latitude, 'longitude' => $objHotelBranchInformation->longitude, - ) + ), + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) )); $this->addJS( diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index 0fa3ea369..9d57defca 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -778,6 +778,7 @@ class AdminAddHotelController extends ModuleAdminController 'sortRowsUrl' => $this->context->link->getAdminLink('AdminAddHotel'), 'primaryHotelId' => Configuration::get('WK_PRIMARY_HOTEL'), 'disableHotelMsg' => $this->l('Primary hotel for website will be updated to first available active hotel.', null, true), + 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')), ) ); // GOOGLE MAP diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index ec016ecba..065640113 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -87,9 +87,6 @@ class HotelReservationSystem extends Module public function hookActionFrontControllerSetMedia() { - Media::addJsDef(array( - 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) - )); if (Configuration::get('WK_CUSTOMER_SUPPORT_PHONE_NUMBER') != '' || Configuration::get('WK_CUSTOMER_SUPPORT_EMAIL') != '' ) { @@ -501,10 +498,6 @@ class HotelReservationSystem extends Module public function hookDisplayBackOfficeHeader() { - Media::addJsDef(array( - 'PS_STORES_ICON' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_STORES_ICON')) - )); - $this->context->controller->addCSS($this->_path.'views/css/admin/css/hotel_admin_tab_logo.css'); }