Merge pull request #731 from TrustTheVote-Project/production

Get latest updates into main

Author: amekelburg

Gemfile

@@ -17,7 +17,6 @@ gem 'twilio-ruby' #, '~> 4.11.1'
 gem 'will_paginate'
 
 #gem 'utf8-cleaner'
-gem 'rack', "2.2.11"
 gem 'rack-robustness'
 
 gem "authlogic" #, "= 4.3.0"
@@ -125,6 +124,3 @@ gem "delayed_job_active_record" #, "~> 4.1"
 gem 'delayed_cron_job'
 
 gem 'exception_notification'
-
-gem "net-imap", "0.3.8"
-gem "rexml", "3.3.9"

Gemfile.lock

@@ -1211,7 +1211,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.3.4)
     deep_merge (1.2.1)
     delayed_cron_job (0.7.4)
       delayed_job (>= 4.1)
@@ -1378,7 +1378,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
-    net-imap (0.3.8)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -1408,7 +1408,7 @@ GEM
       thread_safe
     public_suffix (4.0.7)
     racc (1.8.1)
-    rack (2.2.11)
+    rack (2.2.9)
     rack-mini-profiler (2.3.1)
       rack (>= 1.2.0)
     rack-robustness (1.1.0)
@@ -1459,7 +1459,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.9)
+    rexml (3.3.8)
     rjb (1.6.4)
     rotp (6.3.0)
     rqrcode (2.2.0)
@@ -1542,7 +1542,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.10)
     timecop (0.9.4)
-    timeout (0.4.3)
+    timeout (0.4.1)
     twilio-ruby (5.52.0)
       faraday (>= 0.9, < 2.0)
       jwt (>= 1.5, <= 2.5)
@@ -1615,19 +1615,16 @@ DEPENDENCIES
   listen
   mechanize
   mysql2
-  net-imap (= 0.3.8)
   nokogiri
   paperclip
   passenger (= 5.3.7)
-  rack (= 2.2.11)
   rack-mini-profiler
   rack-robustness
   rails (= 5.2.8.1)
   rails-controller-testing
   rails-i18n
   rake
   rest-client
-  rexml (= 3.3.9)
   rr
   rspec-activemodel-mocks
   rspec-collection_matchers

app/controllers/application_controller.rb

@@ -65,7 +65,7 @@ def strict_transport_security
   def authenticate_everything
     authenticate_or_request_with_http_basic("Rocky") do |user, password|
       pass = Settings.admin_password
-      pass.present? && user == 'rtvdemo' && password == 'roxy'
+      pass.present? && user == 'rtvdemo' && password == 'sunset'
     end
   end
 

app/controllers/state_configurations_controller.rb

@@ -51,7 +51,7 @@ def submit_data(file)
   def authenticate
     authenticate_or_request_with_http_basic("Settings UI") do |user, password|
       pass = Settings.admin_password
-      pass.present? && user == 'rtvdemo' && password == 'roxy'
+      pass.present? && user == 'rtvdemo' && password == 'sunset'
     end
   end
 

app/controllers/step2_controller.rb

@@ -34,7 +34,7 @@ def render_show
   end
 
 
-  def update  
+  def update
     # get rid of home_state_name
     if params[:registrant]
       params[:registrant].delete(:home_state_name)

app/helpers/date_of_birth_methods.rb

@@ -1,5 +1,11 @@
 module DateOfBirthMethods
   def date_of_birth=(string_value)
+    # If the date is "00/00/0000", set it directly
+    if string_value == "00/00/0000"
+      write_attribute(:date_of_birth, nil)
+      return
+    end
+
     dob = nil
     if string_value.is_a?(String)
       if matches = string_value.match(/\A(\d{1,2})\D+(\d{1,2})\D+(\d{4})\z/)
@@ -77,9 +83,8 @@ def form_date_of_birth
     end
   end
 
-  # TODO: remove duplicate from RegistrantAbrMethods
   def validate_date_of_birth_age
-    if date_of_birth.present?
+    if date_of_birth.present? && date_of_birth != "00/00/0000"
       age_in_years = (Date.today - date_of_birth).to_i / 365
       if age_in_years < 13
         errors.add(:date_of_birth, :way_too_young)
@@ -94,8 +99,13 @@ def validate_date_of_birth_age
     end
   end
 
-  # TODO: remove duplicate from RegistrantAbrMethods
   def validate_date_of_birth
+    # Skip validation if the date_of_birth is "00/00/0000"
+    if date_of_birth == "00/00/0000" || date_of_birth.nil?
+      self[:date_of_birth] = nil  # Explicitly set it to nil if it's "00/00/0000"
+      return
+    end
+
     if date_of_birth_before_type_cast.is_a?(Date) || date_of_birth_before_type_cast.is_a?(Time)
       validate_date_of_birth_age
       return

app/models/registrant.rb

@@ -785,10 +785,23 @@ def pdf_date_of_birth_year
     pdf_date_of_birth.split('/')[2]
   end
 
+  #def pdf_date_of_birth
+  #  (date_of_birth.is_a?(Date) || date_of_birth.is_a?(DateTime)) ? date_of_birth.to_s(:month_day_year) : date_of_birth.to_s
+  #end
+
   def pdf_date_of_birth
-    (date_of_birth.is_a?(Date) || date_of_birth.is_a?(DateTime)) ? date_of_birth.to_s(:month_day_year) : date_of_birth.to_s
+    if home_state_abbrev == "NC"
+      "00/00/0000"
+    else
+      (date_of_birth.is_a?(Date) || date_of_birth.is_a?(DateTime)) ? date_of_birth.to_s(:month_day_year) : date_of_birth.to_s
+    end
   end
 
+  validate :must_be_18_by_election_for_nc
+
+  validate :date_of_birth_required_for_states
+
+
   def pdf_english_race
     if race != I18n.t('txt.registration.races', :locale=>locale).values.last
       english_race
@@ -2168,5 +2181,20 @@ def limit_zip_codes
       end
     end
   end
-  
+
+  # This method checks if the registrant's home state is NC, 
+  # and enforces that the "will_be_18_by_election" field must be true
+  def must_be_18_by_election_for_nc
+    if home_state_abbrev == "NC" && at_least_step_2? && !will_be_18_by_election
+      errors.add(:will_be_18_by_election, I18n.t('activerecord.errors.models.registrant.attributes.will_be_18_by_election.accepted'))
+    end
+  end
+
+  def date_of_birth_required_for_states
+    # Only validate if the registrant is at Step 2 or beyond
+    if status.to_s.match?(/step_[2-5]|complete/) && home_state_abbrev != "NC" && date_of_birth.nil?
+      errors.add(:date_of_birth, I18n.t('activerecord.errors.models.registrant.blank'))
+    end
+  end
+
 end

app/models/state_registrants/base.rb

@@ -97,7 +97,7 @@ def english_name_suffix
 
 
   def check_locale_change
-    if !self.new_locale.blank? && self.new_locale != self.locale && ENABLED_LOCALES.include?(self.new_locale)
+    if !self.new_locale.blank? && self.new_locale != self.locale
       selected_name_title_key = name_title_key
       selected_name_suf_key = name_suffix_key
       selected_race_key = race_key

app/views/catalist_lookups/_form.html.erb

@@ -93,4 +93,4 @@ $(document).ready(function() {
 <%= render :partial=> "registrants/phone_opt_ins", :locals=>{:form=>form} %>
 </fieldset>
 
-<%= rollover_button(:next_step, I18n.t('txt.button.lookup').html_safe) %>
+<%= rollover_button(:next_step, I18n.t(params[:utm_feature] == 'prereg_included' ? 'txt.button.lookup_pre_register' : 'txt.button.lookup').html_safe) %>

app/views/catalist_lookups/new.html.haml

@@ -1,9 +1,10 @@
-%h1{role: "heading", "aria-level": 1}= t('txt.lookup.step_1_header')
+- header_key = params[:utm_feature] == 'prereg_included' ? 'txt.lookup.step_1_header_pre_register' : 'txt.lookup.step_1_header'
+%h1{role: "heading", "aria-level": 1}= t(header_key)
 
+- intro_key = params[:utm_feature] == 'prereg_included' ? 'txt.lookup.step_1_instructions_pre_register' : 'txt.lookup.step_1_instructions'
 .intro-message
-  = t('txt.lookup.step_1_instructions').html_safe
+  = t(intro_key).html_safe
 
 = form_for(@lookup) do |form|
   = render partial: 'form', :object => form
-
   %p= I18n.t('txt.privacy_policy_acceptance').html_safe