homeflowjs 0.9.17 → 0.9.20

package/README.md

@@ -19,6 +19,16 @@ Make sure you have cache disabled in Webpack or your changes to HomeflowJS may n
 "cache": false
 ```
 
+## Quality Assurance
+
+To get changes made in a branch of HomeflowJS deployed to a theme feature branch, change the package.json line for HomeflowJS to:
+
+```
+ "homeflowjs": "git+ssh://git@bitbucket.org:homeflow_developers/homeflowjs.git#<<<branch-name-here>>>",
+```
+
+After the change has been made push the feature branch and wait for the branch code to be compiled.
+
 ## Tests
 
 Run tests:

package/package.json

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

package/search/bedrooms-select/bedrooms-select.component.jsx

@@ -18,6 +18,7 @@ const NormalSelect = ({
   minBeds,
   maxBeds,
   placeholder,
+  bedOptionText,
   ...otherProps
 }) => (
   <select
@@ -42,7 +43,9 @@ const NormalSelect = ({
         title={`${i + 1} Bed`}
         className={optionClass}
       >
-        {i + 1} bed
+        {i + 1}
+        {' '}
+        {bedOptionText}
       </option>
     ))}
   </select>
@@ -57,10 +60,11 @@ const ReactSelect = (props) => {
     styles,
     value,
     placeholder,
+    bedOptionText,
   } = props;
 
   const bedOptions = bedValues.map(bedValue => (
-    { value: bedValue, label: `${bedValue} bed` }
+    { value: bedValue, label: `${bedValue} ${bedOptionText}` }
   ));
 
   if (value) bedOptions.unshift({ value: '', label: `No ${type} beds` });
@@ -123,6 +127,7 @@ BedroomsSelect.propTypes = {
   optionClass: PropTypes.string,
   placeholder: PropTypes.string,
   allowUnderOver: PropTypes.bool,
+  bedOptionText: PropTypes.string,
 };
 
 BedroomsSelect.defaultProps = {
@@ -130,6 +135,7 @@ BedroomsSelect.defaultProps = {
   optionClass: '',
   placeholder: null,
   allowUnderOver: false,
+  bedOptionText: 'Bed',
 };
 
 const mapStateToProps = ({ search: { currentSearch } }) => ({

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

@@ -9,6 +9,7 @@ const englishRates = (price, firstTimeBuyer, additionalProperty) => {
 
   // First time buyer
   if (firstTimeBuyer) {
+    // Rate 2
     if (price - 300000 > 0) {
       if ((price - 300000) > (500000 - 300000)) {
         rate2 = (500000 - 300000) * 0.05;
@@ -16,6 +17,32 @@ const englishRates = (price, firstTimeBuyer, additionalProperty) => {
         rate2 = (price - 300000) * 0.05;
       }
     }
+
+    // Rate 3  ( + supplemental rate 1)
+    if (price - 500000 > 0) {
+      rate1 = 5000; // 2% on 125k-250lk + 5% on 250-300k
+      if ((price - 500000) > (925000 - 500000)) {
+        rate3 = (925000 - 500000) * 0.05;
+      } else {
+        rate3 = (price - 500000) * 0.05;
+      }
+    }
+
+    // Rate 4
+    if (price - 925000 > 0) {
+      if ((price - 925000) > (1500000 - 925000)) {
+        rate4 = (1500000 - 925000) * 0.10;
+      } else {
+        rate4 = (price - 925000) * 0.10;
+      }
+    }
+
+    // Rate 5
+    if (price - 1500000 > 0) {
+      rate5 = (price - 1500000);
+      rate5 *= 0.12;
+    }
+
   }
 
   // Additional property