From b3d3d3a7e1aa299f01221b4c644290a8ed466d71 Mon Sep 17 00:00:00 2001
From: Jacob <jacob.sien.ong@gmail.com>
Date: Fri, 31 May 2019 10:22:39 +1200
Subject: [PATCH 1/2] Rearranged fields & added new - Work and Income benefits.

---
 app/javascript/helpers/data.js | 36 +++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/javascript/helpers/data.js b/app/javascript/helpers/data.js
index 59861411..edddbe18 100644
--- a/app/javascript/helpers/data.js
+++ b/app/javascript/helpers/data.js
@@ -8,7 +8,7 @@ export const summaryTabs= [
 export const incomeRows = [
   [
     'nz_superannuation',
-    'NZ Superannuation'
+    'New Zealand Superannuation'
   ],
   [
     'other_superannuation',
@@ -22,9 +22,13 @@ export const incomeRows = [
     'wages_salary',
     'Wages or salary'
   ],
+  [
+    'work_and_income_benefits',
+    'Work and Income benefits'
+  ],
   [
     'business_profit',
-    'Business profit (NET)'
+    'Business profit'
   ],
   [
     'rental_income',
@@ -32,7 +36,7 @@ export const incomeRows = [
   ],
   [
     'overseas_income',
-    'Overseas income (in $NZ)'
+    'Overseas income (in NZD$)'
   ],
 ];
 
@@ -85,15 +89,25 @@ export const customerDetailFields = [
     placeholder: '00000 000 00',
   },
   {
-    id:'email',
-    label: 'Email (optional)',
-    type:'email',
+    id: 'moved_within_rating_year',
+    label: 'Moved within rating year',
+    type:'radio'
+  },
+  {
+    id: 'lived_in_property_1_July',
+    label: 'Lived in property 1 July 2018',
+    type:'radio'
   },
   {
     id:'phone_number',
     label: 'Phone',
     type:'tel',
   },
+  {
+    id:'email',
+    label: 'Email (optional)',
+    type:'email',
+  },
   {
     id: 'spouse_or_partner',
     label: 'Partner or joint homeowner',
@@ -114,14 +128,4 @@ export const customerDetailFields = [
     id:'occupation',
     label: 'Occupation',
   },
-  {
-    id: 'moved_within_rating_year',
-    label: 'Moved within rating year',
-    type:'radio'
-  },
-  {
-    id: 'lived_in_property_1_July',
-    label: 'Lived in property 1 July 2018',
-    type:'radio'
-  },
 ];

From b9b75681cf7ba2cca84ff83abd9c989cdaa3350f Mon Sep 17 00:00:00 2001
From: Jacob <jacob.sien.ong@gmail.com>
Date: Wed, 5 Jun 2019 10:51:10 +1200
Subject: [PATCH 2/2] Chnaged order to appear on form.

---
 app/javascript/helpers/data.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/helpers/data.js b/app/javascript/helpers/data.js
index edddbe18..7d372c0c 100644
--- a/app/javascript/helpers/data.js
+++ b/app/javascript/helpers/data.js
@@ -89,13 +89,13 @@ export const customerDetailFields = [
     placeholder: '00000 000 00',
   },
   {
-    id: 'moved_within_rating_year',
-    label: 'Moved within rating year',
+    id: 'lived_in_property_1_July',
+    label: 'Lived in property 1 July 2018',
     type:'radio'
   },
   {
-    id: 'lived_in_property_1_July',
-    label: 'Lived in property 1 July 2018',
+    id: 'moved_within_rating_year',
+    label: 'Moved within rating year',
     type:'radio'
   },
   {