homeflowjs 0.7.2 → 0.7.6

package/app/recaptcha.js

@@ -86,6 +86,7 @@ export default () => {
         const forms = document.querySelectorAll(formSelectors[i]);
         forms.forEach((form) => {
           form.addEventListener('submit', (e) => {
+            if (e.target.classList.contains('hfjs-form-invalid')) return;
             if (!document.getElementById('g-recaptcha-response') || !document.getElementById('g-recaptcha-response').value) {
               e.preventDefault();
               Homeflow.set('submitted_form', e.target);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "description": "JavaScript toolkit for Homeflow themes",
   "main": "index.js",
   "scripts": {

package/properties/properties-list/properties-list.component.jsx

@@ -18,7 +18,9 @@ const PropertiesList = ({ properties, ListItem, infiniteScroll }) => {
     };
   });
 
-  const items = propertiesByPage(properties).map((page) => (
+  const propertiesToRender = properties || [];
+
+  const items = propertiesByPage(propertiesToRender).map((page) => (
     <div
       data-result-page={page[0].resultPage}
       key={uniqueKey()}
@@ -38,11 +40,15 @@ const PropertiesList = ({ properties, ListItem, infiniteScroll }) => {
 };
 
 PropertiesList.propTypes = {
-  properties: PropTypes.array.isRequired,
+  properties: PropTypes.array,
   ListItem: PropTypes.elementType.isRequired,
   infiniteScroll: PropTypes.bool.isRequired,
 };
 
+PropertiesList.defaultProps = {
+  properties: [],
+};
+
 const mapStateToProps = state => ({
   properties: state.properties.properties,
 });

package/search/generic-search-field/generic-search-field.component.jsx

@@ -14,7 +14,7 @@ const GenericSelect = ({ name, value, children, setSearchField }) => (
     {children}
   </select>
 );
-
+  
 const GenericTextInput = ({ name, value, setSearchField }) => (
   <input
     type="text"

package/search/index.js

@@ -9,8 +9,10 @@ import StatusCheckbox from './status-checkbox/status-checkbox.component';
 import GenericSearchField from './generic-search-field/generic-search-field.component';
 import GeolocateButton from './geolocate-button/geolocate-button.component';
 import SaveSearchButton from './save-search-button/save-search-button.component';
+import RemoveSavedSearchButton from '../properties/remove-saved-property-button/remove-saved-property-button.component';
 import SavedSearch from './saved-search/saved-search.component';
 import propertySearch from './property-search/property-search';
+import generateSearchDescription from './saved-search/generate-description';
 
 export {
   SearchForm,
@@ -23,6 +25,8 @@ export {
   StatusCheckbox,
   GenericSearchField,
   GeolocateButton,
+  RemoveSavedSearchButton,
+  generateSearchDescription,
   SaveSearchButton,
   SavedSearch,
   propertySearch,

package/search/search-form/search-form.component.jsx

@@ -14,6 +14,7 @@ class SearchForm extends Component {
     const {
       defaultSort,
       defaultChannel,
+      defaultStatus,
       search,
       setSearch,
       setInitialSearch,
@@ -24,8 +25,17 @@ class SearchForm extends Component {
     const searchFromFragment = parseFragment(window.location.pathname);
 
     if (!isEmpty(searchFromFragment)) {
+      if (defaultSort && !searchFromFragment.sorted) {
+        searchFromFragment.sorted = defaultSort;
+      }
+      if (defaultStatus && !searchFromFragment.status) {
+        searchFromFragment.status = defaultStatus;
+      }
       setInitialSearch(searchFromFragment);
       setSearch(searchFromFragment);
+    } else {
+      if (defaultSort && !search.sorted) setSearchField({ sorted: defaultSort });
+      if (defaultStatus && !search.status) setSearchField({ status: defaultStatus });
     }
 
     const place = Homeflow.get('place');
@@ -36,7 +46,6 @@ class SearchForm extends Component {
       });
     }
 
-    if (defaultSort && !search.order) setSearchField({ order: defaultSort });
     if (defaultChannel) setSearchField({ channel: defaultChannel });
 
     // after search has been fully updated, add to userHstory in localStorage
@@ -58,6 +67,7 @@ class SearchForm extends Component {
     const {
       defaultSort,
       defaultChannel,
+      defaultStatus,
       search,
       setSearch,
       setSearchField,
@@ -92,6 +102,7 @@ SearchForm.propTypes = {
 
 const mapStateToProps = state => ({
   search: state.search.currentSearch,
+  defaultStatus: state.app.themePreferences.default_search_status,
 });
 
 const mapDispatchToProps = {

package/utils/stamp-duty-calculator/scottish-rates.js

@@ -42,7 +42,7 @@ const scottishRates = (price, firstTimeBuyer, additionalProperty) => {
     }
   }
 
-  if (!firstTimeBuyer && !additionalProperty) {
+  if (!firstTimeBuyer) {
     // Rate 2
     if (price - 145000 > 0) {
       if ((price - 145000) > (250000 - 145000)) {

package/utils/stamp-duty-calculator/welsh-rates.js

@@ -36,25 +36,24 @@ const welshRates = (price, additionalProperty) => {
     // Rate 4
     if (price - 400000 > 0) {
       if ((price - 400000) > (750000 - 400000)) {
-        rate4 = (750000 - 400000) * 1.15;
+        rate4 = (750000 - 400000) * 0.115;
       } else {
-        rate4 = (price - 400000) * 1.15;
+        rate4 = (price - 400000) * 0.115;
       }
     }
 
     // Rate 5
     if (price - 750000 > 0) {
       if ((price - 750000) > (1500000 - 750000)) {
-        rate5 = (1500000 - 750000) * 1.40;
+        rate5 = (1500000 - 750000) * 0.14;
       } else {
-        rate5 = (price - 750000) * 1.40;
+        rate5 = (price - 750000) * 0.14;
       }
     }
 
     // Rate 6
     if (price - 1500000 > 0) {
-      rate6 = (price - 1500000) * 1.16;
-      rate6 *= 1.16;
+      rate6 = (price - 1500000) * 0.160;
     }
   }
 
@@ -80,9 +79,9 @@ const welshRates = (price, additionalProperty) => {
     // Rate 4
     if (price - 400000 > 0) {
       if ((price - 400000) > (750000 - 400000)) {
-        rate4 = (750000 - 400000) * 0.75;
+        rate4 = (750000 - 400000) * 0.075;
       } else {
-        rate4 = (price - 400000) * 0.75;
+        rate4 = (price - 400000) * 0.075;
       }
     }
 
@@ -98,7 +97,6 @@ const welshRates = (price, additionalProperty) => {
     // Rate 6
     if (price - 1500000 > 0) {
       rate6 = (price - 1500000) * 0.12;
-      rate6 *= 0.12;
     }
   }