[CRIMAPP-1455] Remove redundant ff (#780)

ministryofjustice · Dec 23, 2024 · b20d3d7 · b20d3d7
1 parent 4e06969
commit b20d3d7
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 94 deletions.
diff --git a/app/views/casework/crime_applications/_appeal_no_changes.html.erb b/app/views/casework/crime_applications/_appeal_no_changes.html.erb
@@ -13,9 +13,7 @@
 <%= render partial: 'casework/crime_applications/sections/first_court_hearing', locals: { case_details: crime_application.case_details } %>
 <%= render partial: 'interests_of_justice', locals: { crime_application: } %>
 
-<% if FeatureFlags.means_journey.enabled? %>
-  <%= render partial: 'appeal_income_details', locals: { crime_application: } %>
-<% end %>
+<%= render partial: 'appeal_income_details', locals: { crime_application: } %>
 
 <%= render partial: 'supporting_evidence', locals: { crime_application: } %>
 

diff --git a/app/views/casework/crime_applications/_capital_details.html.erb b/app/views/casework/crime_applications/_capital_details.html.erb
@@ -18,11 +18,11 @@
       locals: { capital_details: crime_application.means_details.capital_details }
     ) %>
 
-<% if FeatureFlags.partner_journey.enabled? && partner_included_in_means? %>
+<% if partner_included_in_means? %>
     <%= render(partial: 'casework/crime_applications/sections/premium_bonds_partner', locals: { details: crime_application.means_details.capital_details }) %>
-  <% else %>
+<% else %>
     <%= render(partial: 'casework/crime_applications/sections/premium_bonds', locals: { details: crime_application.means_details.capital_details }) %>
-  <% end %>
+<% end %>
 
 <%= render(
       partial: 'casework/crime_applications/sections/national_savings_certificates',
@@ -35,8 +35,6 @@
     ) %>
 
 <%= render partial: 'casework/crime_applications/sections/trust_fund', locals: { capital_details: crime_application.means_details.capital_details } %>
-<% if FeatureFlags.partner_journey.enabled? %>
-    <%= render partial: 'casework/crime_applications/sections/trust_fund_partner', locals: { capital_details: crime_application.means_details.capital_details } %>
-<% end %>
+<%= render partial: 'casework/crime_applications/sections/trust_fund_partner', locals: { capital_details: crime_application.means_details.capital_details } %>
 
 <%= render partial: 'casework/crime_applications/sections/other_capital_details', locals: { capital_details: crime_application.means_details.capital_details } %>
diff --git a/app/views/casework/crime_applications/_change_in_financial_circumstances.html.erb b/app/views/casework/crime_applications/_change_in_financial_circumstances.html.erb
@@ -13,14 +13,12 @@
 
 <%= render partial: crime_application.date_stamp_context if crime_application.date_stamp_context.show? %>
 
-<% if FeatureFlags.partner_journey.enabled? %>
-  <%= render partial: 'partner_details',
-             locals: {
-               crime_application: crime_application,
-               applicant: crime_application.client_details.applicant,
-               partner: crime_application.client_details.partner
-             } %>
-<% end %>
+<%= render partial: 'partner_details',
+           locals: {
+             crime_application: crime_application,
+             applicant: crime_application.client_details.applicant,
+             partner: crime_application.client_details.partner
+           } %>
 
 <%= render partial: 'casework/crime_applications/sections/passporting_benefit_check_client',
            locals: { crime_application: crime_application, applicant: crime_application.applicant } %>
@@ -30,13 +28,11 @@
            locals: { crime_application: crime_application, case_details: crime_application.case_details } %>
 <%= render partial: 'offences', object: crime_application.case_details.offences %>
 
-<% if FeatureFlags.means_journey.enabled? %>
-  <%= render partial: 'income_details', locals: { crime_application: } %>
-  <%= render partial: 'outgoings_details', locals: { crime_application: } %>
+<%= render partial: 'income_details', locals: { crime_application: } %>
+<%= render partial: 'outgoings_details', locals: { crime_application: } %>
 
-  <% if crime_application.means_details.capital_details %>
-    <%= render partial: 'capital_details', locals: { crime_application: } %>
-  <% end %>
+<% if crime_application.means_details.capital_details %>
+  <%= render partial: 'capital_details', locals: { crime_application: } %>
 <% end %>
 
 <%= render partial: 'supporting_evidence', locals: { crime_application: } %>

diff --git a/app/views/casework/crime_applications/_client_details.html.erb b/app/views/casework/crime_applications/_client_details.html.erb
@@ -64,8 +64,7 @@
       </div>
     <% end %>
 
-    <% if FeatureFlags.partner_journey.enabled? %>
-      <% if applicant.has_partner == 'no' %>
+    <% if applicant.has_partner == 'no' %>
         <div class="govuk-summary-list__row">
           <dt class="govuk-summary-list__key">
             <%= label_text(:relationship_status) %>
@@ -85,7 +84,6 @@
           </div>
         <% end %>
       <% end %>
-    <% end %>
   <% end %>
 </dl>
 <% end %>
diff --git a/app/views/casework/crime_applications/_income_details.html.erb b/app/views/casework/crime_applications/_income_details.html.erb
@@ -6,21 +6,15 @@
 
 <%= render partial: 'casework/crime_applications/sections/employment', locals: { income_details: crime_application.means_details.income_details } %>
 <%= render partial: 'casework/crime_applications/sections/income', locals: { income_details: crime_application.means_details.income_details } %>
-<% if FeatureFlags.employment_journey.enabled? %>
-  <%= render partial: 'casework/crime_applications/sections/employment_income', locals: { employment_income: crime_application.income_payments.applicant_employment_income } %>
-  <%= render partial: 'casework/crime_applications/sections/employments', locals: { employments: crime_application.applicant_employments, subject: 'client' } %>
-<% end %>
+<%= render partial: 'casework/crime_applications/sections/employment_income', locals: { employment_income: crime_application.income_payments.applicant_employment_income } %>
+<%= render partial: 'casework/crime_applications/sections/employments', locals: { employments: crime_application.applicant_employments, subject: 'client' } %>
 
-<% if FeatureFlags.self_employed_journey.enabled? %>
-  <%= render partial: 'casework/crime_applications/sections/businesses', locals: { businesses: crime_application.applicant_businesses } %>
-<% end %>
+<%= render partial: 'casework/crime_applications/sections/businesses', locals: { businesses: crime_application.applicant_businesses } %>
 
-<% if FeatureFlags.employment_journey.enabled? || FeatureFlags.self_employed_journey.enabled? %>
-  <%= render partial: 'casework/crime_applications/sections/applicant_self_assessment_tax_bill', locals: { income_details: crime_application.means_details.income_details } %>
-  <%= render partial: 'casework/crime_applications/sections/applicant_other_work_benefits', locals: { income_details: crime_application.means_details.income_details, other_work_benefits: crime_application.income_payments.applicant_other_work_benefits } %>
-<% end %>
+<%= render partial: 'casework/crime_applications/sections/applicant_self_assessment_tax_bill', locals: { income_details: crime_application.means_details.income_details } %>
+<%= render partial: 'casework/crime_applications/sections/applicant_other_work_benefits', locals: { income_details: crime_application.means_details.income_details, other_work_benefits: crime_application.income_payments.applicant_other_work_benefits } %>
 
-  <%= render partial: 'casework/crime_applications/sections/income_payments', locals: { income_details: crime_application.means_details.income_details, income_payments: crime_application.income_payments.applicant_income_payments } %>
+<%= render partial: 'casework/crime_applications/sections/income_payments', locals: { income_details: crime_application.means_details.income_details, income_payments: crime_application.income_payments.applicant_income_payments } %>
 <%= render partial: 'casework/crime_applications/sections/income_benefits', locals: { income_details: crime_application.means_details.income_details, income_benefits: crime_application.income_benefits.applicant_income_benefits } %>
 
 <%= render(
@@ -30,19 +24,13 @@
         income_details: crime_application.means_details.income_details
       }
     ) %>
-<% if FeatureFlags.partner_journey.enabled? %>
-  <%= render partial: 'casework/crime_applications/sections/partner_employment', locals: { income_details: crime_application.means_details.income_details } %>
-  <% if FeatureFlags.employment_journey.enabled? %>
-    <%= render partial: 'casework/crime_applications/sections/employment_income', locals: { employment_income: crime_application.income_payments.partner_employment_income } %>
-    <%= render partial: 'casework/crime_applications/sections/employments', locals: { employments: crime_application.partner_employments, subject: 'partner' } %>
-    <%= render partial: 'casework/crime_applications/sections/partner_self_assessment_tax_bill', locals: { income_details: crime_application.means_details.income_details } %>
-    <%= render partial: 'casework/crime_applications/sections/partner_other_work_benefits', locals: { income_details: crime_application.means_details.income_details, other_work_benefits: crime_application.income_payments.partner_other_work_benefits } %>
-  <% end %>
+<%= render partial: 'casework/crime_applications/sections/partner_employment', locals: { income_details: crime_application.means_details.income_details } %>
+<%= render partial: 'casework/crime_applications/sections/employment_income', locals: { employment_income: crime_application.income_payments.partner_employment_income } %>
+<%= render partial: 'casework/crime_applications/sections/employments', locals: { employments: crime_application.partner_employments, subject: 'partner' } %>
+<%= render partial: 'casework/crime_applications/sections/partner_self_assessment_tax_bill', locals: { income_details: crime_application.means_details.income_details } %>
+<%= render partial: 'casework/crime_applications/sections/partner_other_work_benefits', locals: { income_details: crime_application.means_details.income_details, other_work_benefits: crime_application.income_payments.partner_other_work_benefits } %>
 
-  <% if FeatureFlags.self_employed_journey.enabled? %>
-    <%= render partial: 'casework/crime_applications/sections/businesses', locals: { businesses: crime_application.partner_businesses } %>
-  <% end %>
-  <%= render partial: 'casework/crime_applications/sections/income_payments_partner', locals: { income_details: crime_application.means_details.income_details, income_payments: crime_application.income_payments.partner_income_payments } %>
-  <%= render partial: 'casework/crime_applications/sections/income_benefits_partner', locals: { income_details: crime_application.means_details.income_details, income_benefits: crime_application.income_benefits.partner_income_benefits } %>
-<% end %>
+<%= render partial: 'casework/crime_applications/sections/businesses', locals: { businesses: crime_application.partner_businesses } %>
+<%= render partial: 'casework/crime_applications/sections/income_payments_partner', locals: { income_details: crime_application.means_details.income_details, income_payments: crime_application.income_payments.partner_income_payments } %>
+<%= render partial: 'casework/crime_applications/sections/income_benefits_partner', locals: { income_details: crime_application.means_details.income_details, income_benefits: crime_application.income_benefits.partner_income_benefits } %>
 <%= render partial: 'casework/crime_applications/sections/other_income_details', locals: { income_details: crime_application.means_details.income_details } %>
diff --git a/app/views/casework/crime_applications/_initial.html.erb b/app/views/casework/crime_applications/_initial.html.erb
@@ -13,14 +13,12 @@
 
 <%= render partial: crime_application.date_stamp_context if crime_application.date_stamp_context.show? %>
 
-<% if FeatureFlags.partner_journey.enabled? %>
-  <%= render partial: 'partner_details',
-             locals: {
-               crime_application: crime_application,
-               applicant: crime_application.client_details.applicant,
-               partner: crime_application.client_details.partner
-             } %>
-<% end %>
+<%= render partial: 'partner_details',
+           locals: {
+             crime_application: crime_application,
+             applicant: crime_application.client_details.applicant,
+             partner: crime_application.client_details.partner
+           } %>
 
 <%= render partial: 'casework/crime_applications/sections/passporting_benefit_check_client',
            locals: { crime_application: crime_application, applicant: crime_application.applicant } %>
@@ -30,26 +28,22 @@
            locals: { crime_application: crime_application, case_details: crime_application.case_details } %>
 <%= render partial: 'offences', object: crime_application.case_details.offences %>
 <%= render partial: 'codefendants', object: crime_application.case_details.codefendants %>
-<% if FeatureFlags.other_charges.enabled? %>
-  <% if crime_application.case_details.client_other_charge_in_progress.present? %>
-    <% title_key = crime_application.case_details.partner_other_charge_in_progress.present? ? :client_other_charges_explicit : :client_other_charges %>
-    <%= render partial: 'other_charge', locals: { other_charge_in_progress: crime_application.case_details.client_other_charge_in_progress, other_charge: crime_application.case_details.client_other_charge, title_key: title_key } %>
-  <% end %>
-  <% if crime_application.case_details.partner_other_charge_in_progress.present? %>
-    <%= render partial: 'other_charge', locals: { other_charge_in_progress: crime_application.case_details.partner_other_charge_in_progress, other_charge: crime_application.case_details.partner_other_charge, title_key: :partner_other_charges } %>
-  <% end %>
+<% if crime_application.case_details.client_other_charge_in_progress.present? %>
+  <% title_key = crime_application.case_details.partner_other_charge_in_progress.present? ? :client_other_charges_explicit : :client_other_charges %>
+  <%= render partial: 'other_charge', locals: { other_charge_in_progress: crime_application.case_details.client_other_charge_in_progress, other_charge: crime_application.case_details.client_other_charge, title_key: title_key } %>
+<% end %>
+<% if crime_application.case_details.partner_other_charge_in_progress.present? %>
+  <%= render partial: 'other_charge', locals: { other_charge_in_progress: crime_application.case_details.partner_other_charge_in_progress, other_charge: crime_application.case_details.partner_other_charge, title_key: :partner_other_charges } %>
 <% end %>
 <%= render partial: 'casework/crime_applications/sections/next_court_hearing', locals: { case_details: crime_application.case_details } %>
 <%= render partial: 'casework/crime_applications/sections/first_court_hearing', locals: { case_details: crime_application.case_details } %>
 <%= render partial: 'interests_of_justice', locals: { crime_application: } unless crime_application.cifc?%>
 
-<% if FeatureFlags.means_journey.enabled? %>
-  <%= render partial: 'income_details', locals: { crime_application: } %>
-  <%= render partial: 'outgoings_details', locals: { crime_application: } %>
+<%= render partial: 'income_details', locals: { crime_application: } %>
+<%= render partial: 'outgoings_details', locals: { crime_application: } %>
 
-  <% if crime_application.means_details.capital_details %>
-    <%= render partial: 'capital_details', locals: { crime_application: } %>
-  <% end %>
+<% if crime_application.means_details.capital_details %>
+  <%= render partial: 'capital_details', locals: { crime_application: } %>
 <% end %>
 
 <%= render partial: 'supporting_evidence', locals: { crime_application: } %>

diff --git a/config/settings.yml b/config/settings.yml
@@ -7,30 +7,10 @@ feature_flags:
     local: false
     staging: true
     production: false # user managers should not access the service in production
-  means_journey:
-    local: true
-    staging: true
-    production: true
-  employment_journey:
-    local: true
-    staging: true
-    production: true
-  partner_journey:
-    local: true
-    staging: true
-    production: true
-  self_employed_journey:
-    local: true
-    staging: true
-    production: true
   adding_decisions:
     local: false
     staging: true
     production: false
-  other_charges:
-    local: true
-    staging: true
-    production: true
 
 # For settings that vary by HostEnv name
 host_env_settings: