homeflowjs 1.0.100 → 1.0.102

package/actions/branches.actions.js

@@ -15,8 +15,8 @@ export const setBranchesPagination = (payload) => ({
   payload,
 });
 
-export const setSearchedPolygonBranchesIDs = (payload) => ({
-  type: BranchesActionTypes.SET_SEARCHED_POLYGON_BRANCHES_IDS,
+export const setSearchedBranchesIDs = (payload) => ({
+  type: BranchesActionTypes.SET_SEARCHED_BRANCHES_IDS,
   payload,
 });
 

package/actions/branches.types.js

@@ -2,7 +2,7 @@ const BranchesActionTypes = {
   SET_BRANCHES: 'SET_BRANCHES',
   SET_BRANCHES_SEARCH: 'SET_BRANCHES_SEARCH',
   SET_BRANCHES_PAGINATION: 'SET_BRANCHES_PAGINATION',
-  SET_SEARCHED_POLYGON_BRANCHES_IDS: 'SET_SEARCHED_POLYGON_BRANCHES_IDS',
+  SET_SEARCHED_BRANCHES_IDS: 'SET_SEARCHED_BRANCHES_IDS',
   SET_BRANCH_DEPARTMENT_FILTER: 'SET_BRANCH_DEPARTMENT_FILTER',
 };
 

package/branches/branches-search-form/branches-polygon-search-input.component.jsx

@@ -10,7 +10,7 @@ import { notify } from 'homeflowjs';
 
 import { DEBOUNCE_DELAY } from '../../utils';
 import branchSearchUtils from '../../utils/requests-handler';
-import { setSearchedPolygonBranchesIDs } from '../../actions/branches.actions';
+import { setSearchedBranchesIDs } from '../../actions/branches.actions';
 import LoadingIcon from '../../shared/loading-icon/loading-icon.component';
 
 const { fetchAddressSuggestions, fetchBranchDataBySearchedAddress, ERROR_DEFAULT_MESSAGE } = branchSearchUtils;
@@ -25,6 +25,7 @@ const BranchesPolygonSearchInput = ({
   loadingIcon: CustomLoadingIcon,
   handleInputClick,
   handleSuggestionSelected,
+  usePolygonSearch,
 }) => {
   const dispatch = useDispatch();
   
@@ -35,14 +36,14 @@ const BranchesPolygonSearchInput = ({
   const [selectedSuggestion, setSelectedSuggestion] = useState(null);
 
   useEffect(() => {
-    dispatch(setSearchedPolygonBranchesIDs(null));
+    dispatch(setSearchedBranchesIDs(null));
   }, []);
 
   const handleSearchedBranchData = (branchesIDs) => {
     const searchedBranchesIDs = branchesIDs.filter(
       (branchID) => !hiddenBranchIDs.includes(branchID.toString())
     );
-    dispatch(setSearchedPolygonBranchesIDs(searchedBranchesIDs));
+    dispatch(setSearchedBranchesIDs(searchedBranchesIDs));
   };
 
   const resetLoadingStatus = () => {
@@ -62,13 +63,15 @@ const BranchesPolygonSearchInput = ({
     notify(errorData.message, 'error')
   }
 
+  const polygonRequestPrm = usePolygonSearch ? { usingPolygon: true } : {};
+
   const getSearchedBranch = () => {
     if (channel) {
       fetchBranchDataBySearchedAddress({
         addressID: selectedSuggestion,
-        usingPolygon: true,
         channel,
         isDepartmentSearch,
+        ...polygonRequestPrm,
       })
         .then(handleSearchedBranchData)
         .catch(handleError)
@@ -77,15 +80,15 @@ const BranchesPolygonSearchInput = ({
       Promise.all([
         fetchBranchDataBySearchedAddress({
           addressID: selectedSuggestion,
-          usingPolygon: true,
           channel: 'sales',
           isDepartmentSearch,
+          ...polygonRequestPrm,
         }),
         fetchBranchDataBySearchedAddress({
           addressID: selectedSuggestion,
-          usingPolygon: true,
           channel: 'lettings',
           isDepartmentSearch,
+          ...polygonRequestPrm,
         })
       ])
         .then(([salesBranchIDList, lettingsBranchIDList]) => {
@@ -144,7 +147,7 @@ const BranchesPolygonSearchInput = ({
 
   const onInputChange = useCallback((_, { newValue }) => {
     if (!newValue) {
-      dispatch(setSearchedPolygonBranchesIDs(null));
+      dispatch(setSearchedBranchesIDs(null));
     }
     setSearchedAddress(newValue);
     setSelectedSuggestion(null);
@@ -211,6 +214,7 @@ BranchesPolygonSearchInput.defaultProps = {
   handleInputClick: null,
   handleSuggestionSelected: null,
   hiddenBranchIds: [],
+  usePolygonSearch: true,
 };
 
 export default BranchesPolygonSearchInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "1.0.100",
+  "version": "1.0.102",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-map/draggable-map.js

@@ -231,17 +231,34 @@ export default class DraggableMap {
     marker.property = property;
 
     if (!Homeflow.get('do_not_show_marker_popup')) {
-      const popupTemplate = document.getElementById('property-map-popup-template').innerHTML;
-      const compiled = template(popupTemplate);
-      const t = compiled({ property });
+      const lodashTemplatePopup = document.getElementById('property-map-popup-template');
+      const liquidTemplatePopup = document.querySelector(`.property-map-popup-template[data-property-id="${property.property_id}"]`);
 
-      Homeflow.kickEvent('map_marker_rendered', property);
-      const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
-      marker.bindPopup(t, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+      if (lodashTemplatePopup) {
+        const compiled = template(lodashTemplatePopup.innerHTML);
+        const t = compiled({ property });
 
-      if (Homeflow.get('pop_up_on_mouseover')) {
-        marker.on("mouseover", e => marker.openPopup());
-        marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        Homeflow.kickEvent('map_marker_rendered', property);
+        const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
+        marker.bindPopup(t, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+
+        if (Homeflow.get('pop_up_on_mouseover')) {
+          marker.on("mouseover", e => marker.openPopup());
+          marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        }
+      }
+
+      if (liquidTemplatePopup) {
+        const html = liquidTemplatePopup.innerHTML;
+
+        Homeflow.kickEvent('map_marker_rendered', property);
+        const popup = new L.Point(Homeflow.get('autopan_padding')[0], Homeflow.get('autopan_padding')[1]);
+        marker.bindPopup(html, { autoPanPadding: popup, autoPan: !Homeflow.get('disable_map_pop_up_scroll') });
+
+        if (Homeflow.get('pop_up_on_mouseover')) {
+          marker.on("mouseover", e => marker.openPopup());
+          marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
+        }
       }
     }
 
@@ -250,6 +267,7 @@ export default class DraggableMap {
     if (Homeflow.get('select_marker_on_click')) {
       marker.on('click', e => store.dispatch(setSelectedMarker(e.target)));
     }
+    
     return window['map_marker_' + property.property_id] = marker;
   }
 

package/reducers/branches.reducer.js

@@ -25,7 +25,7 @@ const branchesReducer = (state = INITIAL_STATE, action) => {
         ...state,
         pagination: action.payload,
       };
-    case BranchesActionTypes.SET_SEARCHED_POLYGON_BRANCHES_IDS:
+    case BranchesActionTypes.SET_SEARCHED_BRANCHES_IDS:
       return {
         ...state,
         searchedBranchesIDs: action.payload,