homeflowjs 1.1.0 → 1.1.2

package/package.json

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

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

@@ -222,6 +222,49 @@ export default class DraggableMap {
   }
 
   generateMarker(property) {
+    const rates = Homeflow.get('currency_rates') || null;
+    const selectedCurrency = localStorage.getItem('currency') || 'GBP';
+    const localCurrencyCode = property.local_currency_code || '';
+    const localCurrencyPrice= property.local_currency_price || '';
+    const propertyPrice = property.price;
+    
+    // Function to extract the number for properties having price with symbols such as £1,000,000
+    const extractNumber = (str) => {
+      const numbers = str.match(/\d+/g);
+      return numbers ? numbers.join('') : '0';
+    };
+
+    const convertPriceOnPopup = (price, currency) => {
+      const numericPrice = parseInt(extractNumber(price), 10);
+      const formatter = new Intl.NumberFormat('en-US', {
+        style: 'currency',
+        currency: selectedCurrency,
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+      });
+      const value = rates && rates[currency] * numericPrice || propertyPrice;
+      const convertedValue = formatter.format(Math.round(value));
+
+      /*
+        Properties which have different currencies set in admin
+        should display the value without converting it.
+      */
+      if (localCurrencyCode === selectedCurrency) return formatter.format(Math.round(localCurrencyPrice));
+
+      /**
+       * Converting the property price to the selected currency
+       * this could either be from GBP to EUR, GBP to USD, EUR to USD, etc
+      */
+      if ( selectedCurrency === 'GBP' && localCurrencyCode !== null && localCurrencyPrice !== null && localCurrencyCode !== 'GBP' ) {
+        const value = localCurrencyPrice / rates[localCurrencyCode];
+        return formatter.format(Math.round(value));
+      }
+
+      return convertedValue;
+    };
+
+    const propertyWithConvertedPrice = { ...property, price: convertPriceOnPopup(propertyPrice, selectedCurrency) };
+
     const marker = L.marker(
       [property.lat, property.lng],
       { title: property.name, icon: this.generateMarkerIcon(property) }
@@ -232,33 +275,17 @@ export default class DraggableMap {
 
     if (!Homeflow.get('do_not_show_marker_popup')) {
       const lodashTemplatePopup = document.getElementById('property-map-popup-template');
-      const liquidTemplatePopup = document.querySelector(`.property-map-popup-template[data-property-id="${property.property_id}"]`);
 
-      if (lodashTemplatePopup) {
-        const compiled = template(lodashTemplatePopup.innerHTML);
-        const t = compiled({ property });
+      const compiled = template(lodashTemplatePopup.innerHTML);
+      const t = compiled( rates ? { property: propertyWithConvertedPrice } : {property});
 
-        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') });
+      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));
-        }
+      if (Homeflow.get('pop_up_on_mouseover')) {
+        marker.on("mouseover", e => marker.openPopup());
+        marker.on("mouseout", e => setTimeout((() => marker.closePopup()), 4000));
       }
     }
 

package/utils/requests-handler.js

@@ -56,7 +56,7 @@ const fetchBranchesDataByPostcode = ({
   const polygonPrm = (usingPolygon && channel) ? '&using_polygon=true' : '';
   const channelPrm = channel ? `&channel=${channel}` : '';
   const departmentPrm = (isDepartmentSearch && channel) ? `&department=true` : '';
-  const crossAgencyPrm = `&check_for_cross_agency_branches=true`
+  const crossAgencyPrm = `&include_cross_agency_branches=true`
 
   return fetch(`/postcode_branches_lookup?postcode=${postcode}${departmentPrm}${channelPrm}${polygonPrm}${crossAgencyPrm}`)
     .then(handleRequest)