Remove feature toggle

app/components/sales_log_summary_component.html.erb

@@ -32,7 +32,7 @@
               <dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd>
             </div>
           <% end %>
-          <% if log.managing_organisation && FeatureToggle.sales_managing_organisation_enabled? %>
+          <% if log.managing_organisation %>
             <div class="app-metadata__item">
               <dt class="app-metadata__term">Reported by</dt>
               <dd class="app-metadata__definition"><%= log.managing_organisation&.name %></dd>

app/models/form/sales/pages/managing_organisation.rb

@@ -13,7 +13,6 @@ class Form::Sales::Pages::ManagingOrganisation < ::Form::Page
   def routed_to?(log, current_user)
     return false unless current_user
     return false unless current_user.support?
-    return false unless FeatureToggle.sales_managing_organisation_enabled?
     return false unless log.owning_organisation
 
     log.owning_organisation.managing_agents.count >= 1

app/models/form/sales/pages/owning_organisation.rb

@@ -13,7 +13,6 @@ class Form::Sales::Pages::OwningOrganisation < ::Form::Page
   def routed_to?(log, current_user)
     return false unless current_user
     return true if current_user.support?
-    return false unless FeatureToggle.sales_managing_organisation_enabled?
     return true if has_multiple_stock_owners_with_own_stock?(current_user)
 
     stock_owners = if FeatureToggle.merge_organisations_enabled?

app/models/form/sales/questions/owning_organisation_id.rb

@@ -14,7 +14,7 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question
     return answer_opts unless user
     return answer_opts unless log
 
-    if FeatureToggle.sales_managing_organisation_enabled? && !user.support?
+    unless user.support?
       if log.owning_organisation_id.present?
         answer_opts[log.owning_organisation.id] = log.owning_organisation.name
       end

app/services/bulk_upload/sales/year2023/row_parser.rb

@@ -455,12 +455,12 @@ class BulkUpload::Sales::Year2023::RowParser
 
   validate :validate_owning_org_data_given, on: :after_log
   validate :validate_owning_org_exists, on: :after_log
-  validate :validate_owning_org_owns_stock, on: :after_log if FeatureToggle.sales_managing_organisation_enabled?
+  validate :validate_owning_org_owns_stock, on: :after_log
   validate :validate_owning_org_permitted, on: :after_log
 
   validate :validate_created_by_exists, on: :after_log
   validate :validate_created_by_related, on: :after_log
-  validate :validate_managing_org_related, on: :after_log if FeatureToggle.sales_managing_organisation_enabled?
+  validate :validate_managing_org_related, on: :after_log
   validate :validate_relevant_collection_window, on: :after_log
   validate :validate_incomplete_soft_validations, on: :after_log
 

app/services/bulk_upload/sales/year2024/row_parser.rb

@@ -447,12 +447,12 @@ class BulkUpload::Sales::Year2024::RowParser
 
   validate :validate_owning_org_data_given, on: :after_log
   validate :validate_owning_org_exists, on: :after_log
-  validate :validate_owning_org_owns_stock, on: :after_log if FeatureToggle.sales_managing_organisation_enabled?
+  validate :validate_owning_org_owns_stock, on: :after_log
   validate :validate_owning_org_permitted, on: :after_log
 
   validate :validate_created_by_exists, on: :after_log
   validate :validate_created_by_related, on: :after_log
-  validate :validate_managing_org_related, on: :after_log if FeatureToggle.sales_managing_organisation_enabled?
+  validate :validate_managing_org_related, on: :after_log
   validate :validate_relevant_collection_window, on: :after_log
   validate :validate_incomplete_soft_validations, on: :after_log
 

app/services/feature_toggle.rb

@@ -47,8 +47,4 @@ class FeatureToggle
   def self.service_moved?
     false
   end
-
-  def self.sales_managing_organisation_enabled?
-    true
-  end
 end

app/views/logs/_log_filters.html.erb

@@ -93,7 +93,7 @@
           } %>
         <% end %>
 
-        <% if (current_user.support? || non_support_with_managing_orgs?) && (user_or_org_lettings_path? || FeatureToggle.sales_managing_organisation_enabled?) %>
+        <% if current_user.support? || non_support_with_managing_orgs? %>
           <%= render partial: "filters/radio_filter", locals: {
             f:,
             options: {