From b973e8348e4e013350186264eb2778a919cbdf5d Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 16 Feb 2023 12:16:39 +0000 Subject: [PATCH] CLDC-1861 Update options order for lead tenant's working situation (#1289) * Switch the first two options so Full time comes before Part time * Enable dates validations on staging --- app/models/form/lettings/questions/working_situation1.rb | 2 +- config/initializers/feature_toggle.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/form/lettings/questions/working_situation1.rb b/app/models/form/lettings/questions/working_situation1.rb index 866271f4d..20f5dc984 100644 --- a/app/models/form/lettings/questions/working_situation1.rb +++ b/app/models/form/lettings/questions/working_situation1.rb @@ -11,8 +11,8 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question end ANSWER_OPTIONS = { - "2" => { "value" => "Part-time – Less than 30 hours" }, "1" => { "value" => "Full-time – 30 hours or more" }, + "2" => { "value" => "Part-time – Less than 30 hours" }, "7" => { "value" => "Full-time student" }, "3" => { "value" => "In government training into work, such as New Deal" }, "4" => { "value" => "Jobseeker" }, diff --git a/config/initializers/feature_toggle.rb b/config/initializers/feature_toggle.rb index 37f6aa653..d31ee184b 100644 --- a/config/initializers/feature_toggle.rb +++ b/config/initializers/feature_toggle.rb @@ -1,14 +1,14 @@ class FeatureToggle def self.startdate_two_week_validation_enabled? - Rails.env.production? || Rails.env.test? + Rails.env.production? || Rails.env.test? || Rails.env.staging? end def self.startdate_collection_window_validation_enabled? - Rails.env.production? || Rails.env.test? + Rails.env.production? || Rails.env.test? || Rails.env.staging? end def self.saledate_collection_window_validation_enabled? - Rails.env.production? || Rails.env.test? + Rails.env.production? || Rails.env.test? || Rails.env.staging? end def self.sales_log_enabled?