From 81c3d4e3a4896f80152b1d4190e6ceea0d451ce0 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 21 Nov 2023 12:57:26 +0000
Subject: [PATCH] Update feature toggles

---
 app/services/feature_toggle.rb | 6 ++----
 db/seeds.rb                    | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb
index 2829c0958..cdfb31cd9 100644
--- a/app/services/feature_toggle.rb
+++ b/app/services/feature_toggle.rb
@@ -1,7 +1,7 @@
 class FeatureToggle
   # Disable check on preview apps to allow for testing of future forms
   def self.saledate_collection_window_validation_enabled?
-    Rails.env.production? || Rails.env.test? || Rails.env.staging?
+    true
   end
 
   def self.startdate_two_week_validation_enabled?
@@ -21,9 +21,7 @@ class FeatureToggle
   end
 
   def self.force_crossover?
-    return false if Rails.env.test?
-
-    !Rails.env.production?
+    false
   end
 
   def self.merge_organisations_enabled?
diff --git a/db/seeds.rb b/db/seeds.rb
index 3631e2c07..876601c19 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -200,7 +200,7 @@ unless Rails.env.test?
     SalesLog.find_or_create_by!(
       created_by: support_user,
       owning_organisation: org,
-      saledate: Date.new(2023, 1, 1),
+      saledate: Date.new(2023, 4, 1),
       purchid: "1",
       ownershipsch: 1,
       type: 2,
@@ -211,7 +211,7 @@ unless Rails.env.test?
     SalesLog.find_or_create_by!(
       created_by: support_user,
       owning_organisation: org,
-      saledate: Date.new(2023, 1, 1),
+      saledate: Date.new(2023, 4, 1),
       purchid: "1",
       ownershipsch: 2,
       type: 9,
@@ -222,7 +222,7 @@ unless Rails.env.test?
     SalesLog.find_or_create_by!(
       created_by: support_user,
       owning_organisation: org,
-      saledate: Date.new(2023, 1, 1),
+      saledate: Date.new(2023, 4, 1),
       purchid: "1",
       ownershipsch: 3,
       type: 10,