Skip to content
This repository was archived by the owner on Nov 16, 2019. It is now read-only.

[WIP] fix/rr325-change-order-of-content-and-labels #339

Open
JacOng17 wants to merge 35 commits into
base: dev
Choose a base branch
from
Open

[WIP] fix/rr325-change-order-of-content-and-labels #339

Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b3d3d3a
Rearranged fields & added new - Work and Income benefits.
JacOng17 May 30, 2019
fd0e862
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] May 31, 2019
b9fc9e8
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] May 31, 2019
3854c35
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] May 31, 2019
40376ea
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] May 31, 2019
3974cab
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] May 31, 2019
1eca44e
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 1, 2019
d519d21
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 3, 2019
35b299f
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
2edb4eb
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
16dba32
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
eafb475
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
c39d8f1
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
e5c5b87
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
6dc3e75
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 4, 2019
b9b7568
Chnaged order to appear on form.
JacOng17 Jun 4, 2019
d675fd2
Merge branch 'fix/rr325-change-order-of-content-and-labels' of github…
JacOng17 Jun 4, 2019
df39834
Merge branch 'dev' into fix/rr325-change-order-of-content-and-labels
JacOng17 Jun 6, 2019
a66562d
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 6, 2019
d36d046
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 7, 2019
903cb87
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 9, 2019
3191634
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 9, 2019
8f27fc0
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 10, 2019
5160ff6
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 10, 2019
4a5c07e
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 10, 2019
41b5129
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 10, 2019
93b421b
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 10, 2019
7c7e587
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 11, 2019
0a1a30b
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 11, 2019
34e977a
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 12, 2019
7c9c56e
merge
mischa-s Jun 12, 2019
dd15013
Merge branch 'dev' into fix/rr325-change-order-of-content-and-labels
JacOng17 Jun 12, 2019
b17e73c
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 12, 2019
efdf6cc
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 12, 2019
849b663
Merge dev into fix/rr325-change-order-of-content-and-labels
always-be-closing[bot] Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/javascript/helpers/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const summaryTabs = [
export const incomeRows = [
[
'nz_superannuation',
'NZ Superannuation'
'New Zealand Superannuation'
],
[
'other_superannuation',
Expand All @@ -29,15 +29,15 @@ export const incomeRows = [
],
[
'business_profit',
'Business profit (NET)'
'Business profit'
],
[
'rental_income',
'Rental income'
],
[
'overseas_income',
'Overseas income (in $NZ)'
'Overseas income (in NZD$)'
],
];

Expand Down Expand Up @@ -90,15 +90,25 @@ export const customerDetailFields = [
placeholder: '00000 000 00',
},
{
id: 'email',
label: 'Email (optional)',
type: 'email',
id: 'lived_in_property_1_July',
label: 'Lived in property 1 July 2018',
type:'radio'
},
{
id: 'moved_within_rating_year',
label: 'Moved within rating year',
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',
Expand All @@ -119,14 +129,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'
},
];