diff --git a/lib/smart_answer_flows/locales/en/uk-benefits-abroad.yml b/lib/smart_answer_flows/locales/en/uk-benefits-abroad.yml deleted file mode 100644 index 671c82aa347..00000000000 --- a/lib/smart_answer_flows/locales/en/uk-benefits-abroad.yml +++ /dev/null @@ -1,235 +0,0 @@ -en-GB: - flow: - uk-benefits-abroad: - phrases: - going_abroad_country_question_title: Which country are you moving to? - already_abroad_country_question_title: Which country are you living in? - going_abroad_how_long_question_title: How long are you going abroad for? - already_abroad_how_long_question_title: How long will you be living abroad for? - why_going_abroad_title: Why are you going abroad? - why_already_abroad_title: Why have you gone abroad? - disability_benefits_how_long_question_title: How long will you be abroad for? - already_abroad_text_two: " or permanently" - -# Shared Country question - which_country?: - title: "%{country_question_title}" - -# Q1 - going_or_already_abroad?: - title: "Are you currently:" - options: - going_abroad: "in the UK and planning to move abroad" - already_abroad: "someone who has lived and worked in the UK who is now living abroad" - -# Q2 already_abroad and Q3 going_abroad - which_benefit?: - title: Which benefit will you be claiming? - options: - jsa: "Jobseeker's Allowance (JSA)" - pension: "State Pension" - winter_fuel_payment: "Winter Fuel Payment" - maternity_benefits: "Maternity benefits" - child_benefit: "Child Benefit" - iidb: "Industrial Injuries Disablement Benefit" - ssp: "Statutory Sick Pay (SSP)" - esa: "Employment and Support Allowance (ESA)" - disability_benefits: "Benefits for carers and people with disabilities " - bereavement_benefits: "Bereavement benefits" - tax_credits: "Tax credits" - income_support: "Income Support" -# Q8 going_abroad and Q7 already_abroad - working_for_a_uk_employer?: - title: | - Are you working for a UK employer and paying Class 1 National Insurance Contributions? - body: | - If you're unsure you can read our [National Insurance Guide](/national-insurance/how-much-national-insurance-you-pay). - options: - "yes": "Yes" - "no": "No" -# Q9 going_abroad and Q8 already_abroad - eligible_for_smp?: - title: Are you eligible for Statutory Maternity Pay? - body: | - If you're unsure you can read our [Maternity pay and leave guide](/statutory-maternity-pay#eligibility) - options: - "yes": "Yes" - "no": "No" - -# Q10, Q11, Q16 going_abroad and Q9, Q10, Q15 already_abroad - employer_paying_ni?: - title: | - Is your employer paying National Insurance contributions for you? - options: - "yes": "Yes" - "no": "No" - -# Q13 going_abroad and Q12 already_abroad - do_either_of_the_following_apply?: - title: Does the following apply to you? - body: | - You're currently receiving at least one of the following UK benefits: - - - Bereavement benefits - - Severe Disablement Allowance - - Employment and Support Allowance - - Incapacity Benefit - - Industrial Injuries Disablement Benefit - - State Pension - options: - "yes": "Yes" - "no": "No" - -# Q15 going_abroad and Q14 already_abroad - working_for_uk_employer_ssp?: - title: Are you working for a UK employer? - options: - "yes": "Yes" - "no": "No" -# Q17 going_abroad Q16 already_abroad - eligible_for_tax_credits?: - title: Are you or your partner one of the following? - options: - crown_servant: A Crown servant - cross_border_worker: A cross-border worker - none_of_the_above: None of the above - hint: | - A Crown servant is someone who works for the UK government. - - A cross-border worker is someone who regularly travels to or from another country to work. - -# Q19 going_abroad and Q18 already_abroad - tax_credits_children?: - title: Do you have any children? - options: - "yes": "Yes" - "no": "No" - -# Q20 already_abroad - tax_credits_currently_claiming?: - title: Are you currently claiming State Pension or any of the following benefits? - body: | - - Incapacity Benefit - - Widow's Benefit - - Bereavement Benefit - - Industrial Injuries Disablement Benefit - - contribution-based Employment and Support Allowance - - Severe Disablement Allowance - options: - "yes": "Yes" - "no": "No" - -# Q23 going_abroad and Q22 already_abroad - tax_credits_why_going_abroad?: - title: "%{why_abroad_question_title}" - options: - tax_credits_holiday: A holiday or business trip - tax_credits_medical_treatment: For medical treatment for yourself, your partner or your child - tax_credits_death: Because of the death of your partner, child or close family member - -# Q26 going_abroad Q25 already_abroad - iidb_already_claiming?: - title: Are you currently receiving Industrial Injuries Disablement Benefit? - options: - "yes": "Yes" - "no": "No" - -# Q30 going_abroad and Q29 already_abroad - db_claiming_benefits?: - title: | - Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits? - options: - "yes": "Yes" - "no": "No" -# Q33 going_abroad - is_claiming_benefits?: - title: | - Are you travelling abroad with a partner who is getting Income Support with one of the following: - body: | - - [Pensioner premium](/income-support/what-youll-get) - - [Higher Pensioner premium](/income-support/what-youll-get) - - [Disability premium](/disability-premiums-income-support/eligibility) - - [Severe Disability premium](/disability-premiums-income-support/eligibility) - hint: | - Your partner must be getting the premium, not you. - options: - "yes": "Yes" - "no": "No" -# Q34 going_abroad - is_either_of_the_following?: - title: "Are you getting Income Support while either:" - body: | - - getting [Statutory Sick Pay](/statutory-sick-pay/) - - incapable of work, but being treated as capable of work because you are temporarily disqualified from receiving Income Support - options: - "yes": "Yes" - "no": "No" - -# Q35 going_abroad - is_abroad_for_treatment?: - title: | - Are you going abroad to get medical treatment for the illness or disability that prevents you from working? - options: - "yes": "Yes" - "no": "No" - -# Q36 going_abroad - is_work_or_sick_pay?: - title: | - Have you been unable to work or received Statutory Sick Pay for one of the following: - body: | - - 364 days - - 196 days if you're terminally ill, or getting the highest rate of Disability Living Allowance (care component) or the enhanced rate of Personal Independence Payment (daily living component) - options: - "yes": "Yes" - "no": "No" - -# Q37 going_abroad - is_any_of_the_following_apply?: - title: "Are you one of the following:" - body: | - - affected by a trades dispute (eg on strike) - - age 16 to 19 and in full-time secondary education - - appealing against a decision about your ability to work - options: - "yes": "Yes" - "no": "No" - -# Going abroad questions -# Going abroad Q3 going_abroad - jsa_how_long_abroad?: - title: | - If you're claiming JSA, how long are you going abroad for? - body: | - *[JSA]: Jobseeker's Allowance - options: - less_than_a_year_medical: "Less than 1 year, to get medical treatment for yourself or your child " - less_than_a_year_other: "Less than 1 year, for a different reason" - more_than_a_year: "More than 1 year" -# Going abroad Q18 (tax credits) and Q17 already_abroad - tax_credits_how_long_abroad?: - title: "%{how_long_question_titles}" - options: - tax_credits_up_to_a_year: Up to 1 year - tax_credits_more_than_a_year: More than 1 year or permanently -# Going abroad Q24 going_abroad (ESA) and Q23 already_abroad - esa_how_long_abroad?: - title: "%{how_long_question_titles}" - options: - esa_under_a_year_medical: Less than 1 year, to get medical treatment for yourself or your child - esa_under_a_year_other: Less than 1 year, for a different reason - esa_more_than_a_year: More than 1 year%{already_abroad_text_two} -# Going abroad Q28 going_abroad (Disability Benefits) and Q27 already_abroad - db_how_long_abroad?: - title: "%{how_long_question_titles}" - options: - temporary: Temporarily, eg for a holiday - permanent: Permanently -# Going abroad Q32 going_abroad (Income Support) - is_how_long_abroad?: - title: How long are you going abroad for? - options: - is_under_a_year_medical: Less than 1 year, to get medical treatment for you or your child - is_under_a_year_other: Less than 1 year, for a different reason - is_more_than_a_year: More than 1 year - hint: You can't apply for Income Support from abroad. diff --git a/lib/smart_answer_flows/uk-benefits-abroad.rb b/lib/smart_answer_flows/uk-benefits-abroad.rb index 1088e23672e..706f556ff99 100644 --- a/lib/smart_answer_flows/uk-benefits-abroad.rb +++ b/lib/smart_answer_flows/uk-benefits-abroad.rb @@ -6,6 +6,8 @@ def define status :published satisfies_need "100490" + use_erb_templates_for_questions + exclude_countries = %w(british-antarctic-territory french-guiana guadeloupe holy-see martinique mayotte reunion st-maarten) additional_countries = [OpenStruct.new(slug: "jersey", name: "Jersey"), OpenStruct.new(slug: "guernsey", name: "Guernsey")] @@ -18,11 +20,19 @@ def define save_input_as :going_or_already_abroad calculate :country_question_title do - PhraseList.new(:"#{going_or_already_abroad}_country_question_title") + if going_or_already_abroad == "going_abroad" + "Which country are you moving to?" + else + "Which country are you living in?" + end end calculate :why_abroad_question_title do - PhraseList.new(:"why_#{going_or_already_abroad}_title") + if going_or_already_abroad == "going_abroad" + "Why are you going abroad?" + else + "Why have you gone abroad?" + end end calculate :going_abroad do @@ -34,7 +44,7 @@ def define end calculate :already_abroad_text_two do |response| - PhraseList.new(:already_abroad_text_two) if already_abroad + " or permanently" if already_abroad end next_node :which_benefit? @@ -59,9 +69,13 @@ def define calculate :how_long_question_titles do if benefit == "disability_benefits" - PhraseList.new(:"#{benefit}_how_long_question_title") + "How long will you be abroad for?" else - PhraseList.new(:"#{going_or_already_abroad}_how_long_question_title") + if going_or_already_abroad == "going_abroad" + "How long are you going abroad for?" + else + "How long will you be living abroad for?" + end end end diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb new file mode 100644 index 00000000000..35b7e3afcc1 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb new file mode 100644 index 00000000000..b8b5aa59a78 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + <%= how_long_question_titles %> +<% end %> + +<% options( + "temporary": "Temporarily, eg for a holiday", + "permanent": "Permanently" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb new file mode 100644 index 00000000000..f015d18eb60 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.govspeak.erb @@ -0,0 +1,20 @@ +<% content_for :title do %> + Does the following apply to you? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + You're currently receiving at least one of the following UK benefits: + + - Bereavement benefits + - Severe Disablement Allowance + - Employment and Support Allowance + - Incapacity Benefit + - Industrial Injuries Disablement Benefit + - State Pension + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb new file mode 100644 index 00000000000..11d2978f425 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.govspeak.erb @@ -0,0 +1,13 @@ +<% content_for :title do %> + Are you eligible for Statutory Maternity Pay? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + If you're unsure you can read our [Maternity pay and leave guide](/statutory-maternity-pay#eligibility) + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.govspeak.erb new file mode 100644 index 00000000000..c9cd905186f --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.govspeak.erb @@ -0,0 +1,13 @@ +<% content_for :title do %> + Are you or your partner one of the following? +<% end %> + +<% options( + "crown_servant": "A Crown servant", + "cross_border_worker": "A cross-border worker", + "none_of_the_above": "None of the above" +) %> + +<% content_for :hint do %> + A Crown servant is someone who works for the UK government. A cross-border worker is someone who regularly travels to or from another country to work. +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb new file mode 100644 index 00000000000..aaf2bc327e6 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Is your employer paying National Insurance contributions for you? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb new file mode 100644 index 00000000000..49323bebfcb --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.govspeak.erb @@ -0,0 +1,9 @@ +<% content_for :title do %> + <%= how_long_question_titles %> +<% end %> + +<% options( + "esa_under_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child", + "esa_under_a_year_other": "Less than 1 year, for a different reason", + "esa_more_than_a_year": "More than 1 year#{already_abroad_text_two}" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb new file mode 100644 index 00000000000..be02208b61d --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Are you currently: +<% end %> + +<% options( + "going_abroad": "in the UK and planning to move abroad", + "already_abroad": "someone who has lived and worked in the UK who is now living abroad" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb new file mode 100644 index 00000000000..b8db594b7b7 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Are you currently receiving Industrial Injuries Disablement Benefit? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb new file mode 100644 index 00000000000..cc591d537e6 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Are you going abroad to get medical treatment for the illness or disability that prevents you from working? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb new file mode 100644 index 00000000000..5cff648da6d --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.govspeak.erb @@ -0,0 +1,15 @@ +<% content_for :title do %> + Are you one of the following: +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + - affected by a trades dispute (eg on strike) + - age 16 to 19 and in full-time secondary education + - appealing against a decision about your ability to work + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb new file mode 100644 index 00000000000..13056a01485 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.govspeak.erb @@ -0,0 +1,20 @@ +<% content_for :title do %> + Are you travelling abroad with a partner who is getting Income Support with one of the following: +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :hint do %> + Your partner must be getting the premium, not you. +<% end %> + +<% content_for :body do %> + - [Pensioner premium](/income-support/what-youll-get) + - [Higher Pensioner premium](/income-support/what-youll-get) + - [Disability premium](/disability-premiums-income-support/eligibility) + - [Severe Disability premium](/disability-premiums-income-support/eligibility) + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb new file mode 100644 index 00000000000..b92271eb541 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.govspeak.erb @@ -0,0 +1,14 @@ +<% content_for :title do %> + Are you getting Income Support while either: +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + - getting [Statutory Sick Pay](/statutory-sick-pay/) + - incapable of work, but being treated as capable of work because you are temporarily disqualified from receiving Income Support + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.govspeak.erb new file mode 100644 index 00000000000..2ed65b7cdb4 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.govspeak.erb @@ -0,0 +1,13 @@ +<% content_for :title do %> + How long are you going abroad for? +<% end %> + +<% options( + "is_under_a_year_medical": "Less than 1 year, to get medical treatment for you or your child", + "is_under_a_year_other": "Less than 1 year, for a different reason", + "is_more_than_a_year": "More than 1 year" +) %> + +<% content_for :hint do %> + You can't apply for Income Support from abroad. +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb new file mode 100644 index 00000000000..1c009af07d3 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.govspeak.erb @@ -0,0 +1,14 @@ +<% content_for :title do %> + Have you been unable to work or received Statutory Sick Pay for one of the following: +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + - 364 days + - 196 days if you're terminally ill, or getting the highest rate of Disability Living Allowance (care component) or the enhanced rate of Personal Independence Payment (daily living component) + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb new file mode 100644 index 00000000000..2028e443a14 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.govspeak.erb @@ -0,0 +1,14 @@ +<% content_for :title do %> + If you're claiming JSA, how long are you going abroad for? +<% end %> + +<% options( + "less_than_a_year_medical": "Less than 1 year, to get medical treatment for yourself or your child ", + "less_than_a_year_other": "Less than 1 year, for a different reason", + "more_than_a_year": "More than 1 year" +) %> + +<% content_for :body do %> + *[JSA]: Jobseeker's Allowance + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb new file mode 100644 index 00000000000..d952fdd6e0f --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Do you have any children? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb new file mode 100644 index 00000000000..22869d05b5c --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.govspeak.erb @@ -0,0 +1,18 @@ +<% content_for :title do %> + Are you currently claiming State Pension or any of the following benefits? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + - Incapacity Benefit + - Widow's Benefit + - Bereavement Benefit + - Industrial Injuries Disablement Benefit + - contribution-based Employment and Support Allowance + - Severe Disablement Allowance + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb new file mode 100644 index 00000000000..6c823322309 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + <%= how_long_question_titles %> +<% end %> + +<% options( + "tax_credits_up_to_a_year": "Up to 1 year", + "tax_credits_more_than_a_year": "More than 1 year or permanently" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb new file mode 100644 index 00000000000..8d0988c9916 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.govspeak.erb @@ -0,0 +1,9 @@ +<% content_for :title do %> + <%= why_abroad_question_title %> +<% end %> + +<% options( + "tax_credits_holiday": "A holiday or business trip", + "tax_credits_medical_treatment": "For medical treatment for yourself, your partner or your child", + "tax_credits_death": "Because of the death of your partner, child or close family member" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb new file mode 100644 index 00000000000..52d2426a9c8 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.govspeak.erb @@ -0,0 +1,18 @@ +<% content_for :title do %> + Which benefit will you be claiming? +<% end %> + +<% options( + "jsa": "Jobseeker's Allowance (JSA)", + "pension": "State Pension", + "winter_fuel_payment": "Winter Fuel Payment", + "maternity_benefits": "Maternity benefits", + "child_benefit": "Child Benefit", + "iidb": "Industrial Injuries Disablement Benefit", + "ssp": "Statutory Sick Pay (SSP)", + "esa": "Employment and Support Allowance (ESA)", + "disability_benefits": "Benefits for carers and people with disabilities ", + "bereavement_benefits": "Bereavement benefits", + "tax_credits": "Tax credits", + "income_support": "Income Support" +) %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb new file mode 100644 index 00000000000..cbfd0c39f25 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.govspeak.erb @@ -0,0 +1,3 @@ +<% content_for :title do %> + <%= country_question_title %> +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb new file mode 100644 index 00000000000..c7e4b901080 --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.govspeak.erb @@ -0,0 +1,13 @@ +<% content_for :title do %> + Are you working for a UK employer and paying Class 1 National Insurance Contributions? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> + +<% content_for :body do %> + If you're unsure you can read our [National Insurance Guide](/national-insurance/how-much-national-insurance-you-pay). + +<% end %> diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb new file mode 100644 index 00000000000..46d4cd0c31a --- /dev/null +++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.govspeak.erb @@ -0,0 +1,8 @@ +<% content_for :title do %> + Are you working for a UK employer? +<% end %> + +<% options( + "yes": "Yes", + "no": "No" +) %> diff --git a/test/artefacts/uk-benefits-abroad/going_abroad.html b/test/artefacts/uk-benefits-abroad/going_abroad.html index 97e3624eb7e..e7d6a15ebf2 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad.html @@ -38,13 +38,14 @@

+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html index aacd2b42c35..492771ce7cf 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/child_benefit/austria.html @@ -48,6 +48,7 @@

+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html index e1cc4796e67..92a47d8cf00 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits.html @@ -38,6 +38,7 @@

+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html index b073358cc99..e5bbc69d6ee 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/disability_benefits/permanent/austria.html @@ -33,12 +33,12 @@

Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits? -

+
    @@ -58,6 +58,7 @@

    +

diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/esa.html b/test/artefacts/uk-benefits-abroad/going_abroad/esa.html index 867001b2193..830c16d65a9 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/esa.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/esa.html @@ -38,6 +38,7 @@

+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html b/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html index a3021b7e08a..d7f29d3a060 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/iidb.html @@ -38,6 +38,7 @@

+
diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html index 07673d51530..251967d8f67 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support.html @@ -37,7 +37,8 @@

-

You can't apply for Income Support from abroad.

+ +

You can't apply for Income Support from abroad.

@@ -64,6 +65,7 @@

+

diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html index ef4732e96a3..64773b0e816 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other.html @@ -33,7 +33,6 @@

Are you travelling abroad with a partner who is getting Income Support with one of the following: -

    @@ -44,8 +43,8 @@

-

Your partner must be getting the premium, not you. -

+ +

Your partner must be getting the premium, not you.

@@ -66,6 +65,7 @@

+

diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html index 8c65ec608ea..c17f429c569 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no.html @@ -42,6 +42,7 @@

+
@@ -119,15 +121,13 @@

- Are you travelling abroad with a partner who is getting Income Support with one of the following: - + Are you travelling abroad with a partner who is getting Income Support with one of the following: No - Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following: -" + Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:" diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html index 549ce74c950..f969bebf37f 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/no.html @@ -43,6 +43,7 @@

+
@@ -120,15 +122,13 @@

- Are you travelling abroad with a partner who is getting Income Support with one of the following: - + Are you travelling abroad with a partner who is getting Income Support with one of the following: No - Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following: -" + Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:" diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html index 7f5997d9632..d764224cda4 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes.html @@ -33,12 +33,12 @@

Are you going abroad to get medical treatment for the illness or disability that prevents you from working? -

+
    @@ -58,6 +58,7 @@

    +

@@ -116,15 +117,13 @@

- Are you travelling abroad with a partner who is getting Income Support with one of the following: - + Are you travelling abroad with a partner who is getting Income Support with one of the following: No - Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following: -" + Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:" diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html index 08d70e05478..5c6fe860b56 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/income_support/is_under_a_year_other/no/yes/no.html @@ -33,7 +33,6 @@

Have you been unable to work or received Statutory Sick Pay for one of the following: -

    @@ -43,6 +42,7 @@

    +
      @@ -62,6 +62,7 @@

      +

@@ -120,15 +121,13 @@

- Are you travelling abroad with a partner who is getting Income Support with one of the following: - + Are you travelling abroad with a partner who is getting Income Support with one of the following: No - Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following: -" + Change answer to "Are you travelling abroad with a partner who is getting Income Support with one of the following:" @@ -146,15 +145,13 @@

- Are you going abroad to get medical treatment for the illness or disability that prevents you from working? - + Are you going abroad to get medical treatment for the illness or disability that prevents you from working? No - Change answer to "Are you going abroad to get medical treatment for the illness or disability that prevents you from working? -" + Change answer to "Are you going abroad to get medical treatment for the illness or disability that prevents you from working?" diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html b/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html index 6214798e8c1..7a880326f12 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/jsa.html @@ -32,13 +32,13 @@

- If you're claiming JSA, how long are you going abroad for? - + If you're claiming JSA, how long are you going abroad for?

+
    @@ -64,6 +64,7 @@

    +

@@ -100,7 +101,7 @@

Which benefit will you be claiming? - Jobseeker's Allowance (JSA) + Jobseeker's Allowance (JSA) diff --git a/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html b/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html index ea90806f372..00877754dff 100644 --- a/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html +++ b/test/artefacts/uk-benefits-abroad/going_abroad/jsa/more_than_a_year.html @@ -38,6 +38,7 @@

+