diff --git a/README.md b/README.md index 8f9b606a..08ac2361 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,6 @@ Calculators This is an application to contain custom-built calculators. These will initially replace some smart-answers that have outgrown the framework. -## Child benefit tax calculator -Currently the only calculator in this application is the Child benefit tax calculator. - -This calculator reports how much child benefit tax you are entitled during a tax year. - -There is a cut-off date of 7 January 2013. This is the date [High Income Child Benefit Tax Charge](https://www.gov.uk/child-benefit-tax-charge/overview) came in effect. -This means that if the 2012 tax year is selected the calculator will only calculate the child benefit you are entitled to from 7 Jan 2013 to 5 Apr 2013, not for the entire tax year. - - ## Running the app ``` diff --git a/app/views/child_benefit_tax/_starting_child.html.erb b/app/views/child_benefit_tax/_starting_child.html.erb index 7b118fb7..f9c7680d 100644 --- a/app/views/child_benefit_tax/_starting_child.html.erb +++ b/app/views/child_benefit_tax/_starting_child.html.erb @@ -15,5 +15,5 @@ <% end %> <%= select_date (child ? child.end_date : nil), :prefix => "starting_children[#{index}][stop]", :prompt => {:day => "Day", :month => "Month", :year => "Year" }, :order => [:day, :month, :year], - :start_year => 3.years.ago(Date.today).year, :end_year => 10.years.since(Date.today).year %> + :start_year => 2.years.ago(Date.today).year, :end_year => 10.years.since(Date.today).year %> diff --git a/app/views/child_benefit_tax/main.html.erb b/app/views/child_benefit_tax/main.html.erb index c2a832a0..8c93f801 100644 --- a/app/views/child_benefit_tax/main.html.erb +++ b/app/views/child_benefit_tax/main.html.erb @@ -35,8 +35,17 @@ <%= submit_tag "Update", :name => "children", :class => "button update-button" %> +
+ <%= step(2, "Enter the Child Benefit start and stop dates:") %> + + <%= render "starting_children" %> +
+
- <%= step(2, "Choose a tax year:") %> + <%= step(3, "Choose a tax year:") %>

Tax years run from 6 April to 5 April the following year.

<% @calculator.errors[:tax_year].each do |message| %> @@ -51,15 +60,6 @@
-
- <%= step(3, "Enter the Child Benefit start and stop dates:") %> - - <%= render "starting_children" %> -
-
<%= step(4, "Enter income details for the tax year (optional):") %>