Revert "AP-5368 cash income and outgoings bug (#7458)" (#7471)

This reverts commit f4bfc9a.
ministryofjustice · Nov 25, 2024 · a2ca0d6 · a2ca0d6
1 parent f4bfc9a
commit a2ca0d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/app/controllers/providers/means/cash_incomes_controller.rb b/app/controllers/providers/means/cash_incomes_controller.rb
@@ -3,16 +3,13 @@ module Means
     class CashIncomesController < ProviderBaseController
       before_action :setup_variables, only: %i[show update]
 
-      def show
-        @none_selected = legal_aid_application.no_cash_income?
-      end
+      def show; end
 
       def update
         if aggregated_cash_income.update(form_params)
           update_no_cash_income(form_params)
           go_forward
         else
-          @none_selected = form_params[:none_selected] == "true"
           render :show
         end
       end

diff --git a/app/controllers/providers/means/cash_outgoings_controller.rb b/app/controllers/providers/means/cash_outgoings_controller.rb
@@ -3,16 +3,13 @@ module Means
     class CashOutgoingsController < ProviderBaseController
       before_action :setup_cash_outgoings, only: %i[show update]
 
-      def show
-        @none_selected = legal_aid_application.no_cash_outgoings?
-      end
+      def show; end
 
       def update
         if aggregated_cash_outgoings.update(form_params)
           update_no_cash_outgoings(form_params)
           go_forward
         else
-          @none_selected = form_params[:none_selected] == "true"
           render :show
         end
       end

diff --git a/app/views/shared/means/_cash_income.html.erb b/app/views/shared/means/_cash_income.html.erb
@@ -26,7 +26,7 @@
       </div>
 
       <%= form.govuk_radio_divider %>
-      <%= form.govuk_check_box :none_selected, true, "", multiple: false, label: { text: none_of_the_above }, checked: @none_selected %>
+      <%= form.govuk_check_box :none_selected, true, "", multiple: false, label: { text: none_of_the_above }, checked: type.no_cash_income? %>
     <% end %>
 
     <%= next_action_buttons(

diff --git a/app/views/shared/means/_cash_outgoing.html.erb b/app/views/shared/means/_cash_outgoing.html.erb
@@ -27,7 +27,7 @@
       </div>
 
       <%= form.govuk_radio_divider %>
-      <%= form.govuk_check_box :none_selected, true, "", multiple: false, label: { text: t("generic.none_of_the_above") }, checked: @none_selected %>
+      <%= form.govuk_check_box :none_selected, true, "", multiple: false, label: { text: t("generic.none_of_the_above") }, checked: type.no_cash_outgoings? %>
     <% end %>
 
     <%= next_action_buttons(