homeflowjs 0.7.14 → 0.7.15

package/app/notify.js

@@ -2,6 +2,8 @@ import Toastify from 'toastify-js';
 import 'toastify-js/src/toastify.css';
 
 const notify = (message, type, config = {}) => {
+  if (!message) return;
+
   let color = '#28a745'; // default is success
 
   if (type === 'error') {

package/package.json

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

package/properties/stamp-duty-calculator/default-calculator.component.jsx

@@ -10,6 +10,7 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
   const [rate2, setRate2] = useState();
   const [rate3, setRate3] = useState();
   const [rate4, setRate4] = useState();
+  const [rate5, setRate5] = useState();
 
   const calculateStampDuty = (price) => {
     if (!price) {
@@ -17,6 +18,7 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
       setRate2(0);
       setRate3(0);
       setRate4(0);
+      setRate5(0);
       setTotalRate(0);
       setEffectiveRate(Math.round(0));
 
@@ -29,29 +31,38 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
     let rate2 = 0;
     let rate3 = 0;
     let rate4 = 0;
+    let rate5 = 0;
 
-    if (price - 500000 > 0) {
-      rate2 = (price - 500000);
-      rate2 *= 0.05;
-      if (rate2 > 425000 * 0.05) {
-        rate2 = 425000 * 0.05;
+    if (price - 125000 > 0) {
+      rate2 = (price - 125000);
+      rate2 *= 0.02;
+      if (rate2 > 125000 * 0.02) {
+        rate2 = 125000 * 0.02;
+      }
+    }
+
+    if (price - 250000 > 0) {
+      rate3 = (price - 250000);
+      rate3 *= 0.05;
+      if (rate3 > 675000 * 0.05) {
+        rate3 = 675000 * 0.05;
       }
     }
 
     if (price - 925000 > 0) {
-      rate3 = (price - 925000);
-      rate3 *= 0.10;
-      if (rate3 > 575000 * 0.10) {
-        rate3 = 575000 * 0.10;
+      rate4 = (price - 925000);
+      rate4 *= 0.10;
+      if (rate4 > 575000 * 0.10) {
+        rate4 = 575000 * 0.10;
       }
     }
 
     if (price - 1500000 > 0) {
-      rate4 = (price - 1500000);
-      rate4 *= 0.12;
+      rate5 = (price - 1500000);
+      rate5 *= 0.12;
     }
 
-    totalRate = rate1 + rate2 + rate3 + rate4;
+    totalRate = rate1 + rate2 + rate3 + rate4 + rate5;
     effectiveRate = totalRate / price;
     effectiveRate *= 100;
 
@@ -59,6 +70,7 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
     setRate2(rate2);
     setRate3(rate3);
     setRate4(rate4);
+    setRate5(rate5);
     setTotalRate(totalRate);
     setEffectiveRate(Math.round(effectiveRate * 10) / 10);
 
@@ -128,7 +140,7 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
             </thead>
             <tbody>
               <tr>
-                <td>Between £0 and £500,000</td>
+                <td>Between £0 and £125,000</td>
                 <td> 0% </td>
                 <td className="rate1">
                   £
@@ -136,29 +148,37 @@ const DefaultCalculator = ({ purchasePrice, setPurchasePrice }) => {
                 </td>
               </tr>
               <tr>
-                <td>Between £500,000 and £925,000</td>
-                <td> 5% </td>
+                <td>Between £125,000 and £250,000</td>
+                <td> 2% </td>
                 <td className="rate2">
                   £
                   {Number(rate2).toLocaleString()}
                 </td>
               </tr>
               <tr>
-                <td>Between £925,000 and £1,500,000 </td>
-                <td> 10% </td>
+                <td>Between £250,000 and £925,000</td>
+                <td> 5% </td>
                 <td className="rate3">
                   £
                   {Number(rate3).toLocaleString()}
                 </td>
               </tr>
               <tr>
-                <td>Over £1,500,000 </td>
-                <td> 12% </td>
+                <td>Between £925,000 and £1,500,000 </td>
+                <td> 10% </td>
                 <td className="rate4">
                   £
                   {Number(rate4).toLocaleString()}
                 </td>
               </tr>
+              <tr>
+                <td>Over £1,500,000 </td>
+                <td> 12% </td>
+                <td className="rate5">
+                  £
+                  {Number(rate5).toLocaleString()}
+                </td>
+              </tr>
               <tr className="totals">
                 <td>Total</td>
                 <td className="effectiveRate">