Merge pull request #931 from abhishek-webkul/gli-1575

Fixed: JS issue due to map if Google Maps API key is set and hotel location is not set
Qloapps · Mar 15, 2024 · 663a61d · 663a61d
2 parents 252da38 + 49a342b
commit 663a61d
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 25 deletions.
diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
@@ -221,10 +221,12 @@ public function setMedia()
         $this->addJS(_PS_JS_DIR_.'validate.js');
 
         // GOOGLE MAP
-        $language = $this->context->language;
-        $country = $this->context->country;
-        $PS_API_KEY = Configuration::get('PS_API_KEY');
-        $this->addJs("https://maps.googleapis.com/maps/api/js?key=$PS_API_KEY&libraries=places&language=$language->iso_code&region=$country->iso_code");
+        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
+            $this->addJS(
+                'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY.
+                '&libraries=places&language='.$this->context->language->iso_code.'&region='.$this->context->country->iso_code
+            );
+        }
     }
 
     /**
@@ -303,7 +305,7 @@ public function initContent()
         );
 
         //By webkul to send hotels Map Informations for google Map.
-        if (Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
+        if (Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
             $hotelLocationArray = $objHotelInfo->getMapFormatHotelsInfo(Configuration::get('WK_MAP_HOTEL_ACTIVE_ONLY'));
             if ($hotelLocationArray) {
                 $this->context->smarty->assign('hotelLocationArray', json_encode($hotelLocationArray));

diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
@@ -66,11 +66,27 @@ public function setMedia()
             $this->addJqueryPlugin('jqzoom');
         }
 
-        if (($PS_API_KEY = Configuration::get('PS_API_KEY')) && Configuration::get('WK_GOOGLE_ACTIVE_MAP')) {
-            $this->addJS(
-                'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY.'&libraries=places&language='.
-                $this->context->language->iso_code.'&region='.$this->context->country->iso_code
-            );
+        if (($PS_API_KEY = Configuration::get('PS_API_KEY'))) {
+            $objHotelRoomType = new HotelRoomType();
+            $roomTypeInfo = $objHotelRoomType->getRoomTypeInfoByIdProduct($this->product->id);
+            if ($roomTypeInfo) {
+                $objHotelBranchInformation = new HotelBranchInformation($roomTypeInfo['id_hotel']);
+                if (floatval($objHotelBranchInformation->latitude) != 0
+                    && floatval($objHotelBranchInformation->longitude) != 0
+                ) {
+                    Media::addJsDef(array(
+                        'hotel_location' => array(
+                            'latitude' => $objHotelBranchInformation->latitude,
+                            'longitude' => $objHotelBranchInformation->longitude,
+                        )
+                    ));
+
+                    $this->addJS(
+                        'https://maps.googleapis.com/maps/api/js?key='.$PS_API_KEY.'&libraries=places&language='.
+                        $this->context->language->iso_code.'&region='.$this->context->country->iso_code
+                    );
+                }
+            }
         }
     }
 
@@ -375,13 +391,6 @@ public function initContent()
                         }
                     }
 
-                    Media::addJsDef(array(
-                        'hotel_loc' => array(
-                            'latitude' => $hotel_branch_obj->latitude,
-                            'longitude' => $hotel_branch_obj->longitude,
-                        )
-                    ));
-
                     $this->context->smarty->assign(
                         array(
                             'id_hotel' => $hotel_id,

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -180,7 +180,7 @@ public function renderForm()
         }
 
         $smartyVars['state_var'] = $stateOptions;
-        $smartyVars['enabledDisplayMap'] =  Configuration::get('WK_GOOGLE_ACTIVE_MAP');
+        $smartyVars['enabledDisplayMap'] = Configuration::get('PS_API_KEY') && Configuration::get('WK_GOOGLE_ACTIVE_MAP');
         $smartyVars['ps_img_dir'] = _PS_IMG_.'l/';
 
         $this->context->smarty->assign($smartyVars);

diff --git a/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js b/modules/hotelreservationsystem/views/js/HotelReservationAdmin.js
@@ -309,8 +309,9 @@ $(document).on('click', 'button.gm-ui-hover-effect', function () {
 
 function initGoogleMaps() {
     if (typeof enabledDisplayMap != 'undefined'
-        && typeof google === 'object'
         && $('#googleMapContainer').length
+        && typeof google == 'object'
+        && typeof google.maps == 'object'
     ) {
         GoogleMapsManager.init($('#map'));
         GoogleMapsManager.initMap();

diff --git a/modules/hotelreservationsystem/views/js/searchResultsMap.js b/modules/hotelreservationsystem/views/js/searchResultsMap.js
@@ -23,7 +23,7 @@ function initMap() {
         lng: Number(hotel_location.longitude),
     };
 
-    const map = new google.maps.Map($($('#search-results-wrap .map-wrap')).get(0), {
+    const map = new google.maps.Map($('#search-results-wrap .map-wrap').get(0), {
         zoom: 10,
         center: hotelLocation,
         disableDefaultUI: true,
@@ -49,7 +49,11 @@ function initMap() {
 }
 
 $(document).ready(function() {
-    if (typeof google == 'object' && typeof hotel_location == 'object') {
+    if (typeof hotel_location == 'object'
+        && $('#search-results-wrap .map-wrap').length
+        && typeof google == 'object'
+        && typeof google.maps == 'object'
+    ) {
         initMap();
     }
 });
diff --git a/themes/hotel-reservation-theme/js/contact-form.js b/themes/hotel-reservation-theme/js/contact-form.js
@@ -50,7 +50,11 @@ $(document).ready(function() {
     showProductSelect($('select[name=id_order]').attr('value'));
 
     //By Webkul JS for Map locations of the hotels on google Map
-    if (hotelLocationArray) {
+    if (typeof hotelLocationArray != 'undefined'
+        && $('#map').length
+        && typeof google == 'object'
+        && typeof google.maps == 'object'
+    ) {
         initMap();
     }
 });

diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js
@@ -1090,7 +1090,11 @@ $(document).ready(function() {
         e.preventDefault();
 	});
 
-    if (typeof google === 'object') {
+    if (typeof hotel_location == 'object'
+        && $('#room_type_map_tab .map-wrap').length
+        && typeof google == 'object'
+        && typeof google.maps == 'object'
+    ) {
         initMap();
     }
 
@@ -1291,8 +1295,8 @@ function initMap() {
     });
 
     const hotelLatLng = {
-        lat: Number(hotel_loc.latitude),
-        lng: Number(hotel_loc.longitude),
+        lat: Number(hotel_location.latitude),
+        lng: Number(hotel_location.longitude),
     };
 
     map.setCenter(hotelLatLng);