diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb index 0dc56450a..0f2020854 100644 --- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb +++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb @@ -483,7 +483,7 @@ module JamRuby def signup_survey(user) @user = user @subject = I18n.t('user_mailer.signup_survey.subject') - @survey_url = "https://www.surveymonkey.com/r/WVBKLYL" + @survey_url = Rails.application.config.signup_survey_url mail(:to => user.email, :subject => @subject) do |format| format.text format.html { render layout: "user_mailer_beta" } diff --git a/ruby/lib/jam_ruby/lib/email_signup_survey.rb b/ruby/lib/jam_ruby/lib/email_signup_survey.rb index d03f7f3db..400513abe 100644 --- a/ruby/lib/jam_ruby/lib/email_signup_survey.rb +++ b/ruby/lib/jam_ruby/lib/email_signup_survey.rb @@ -9,7 +9,8 @@ module JamRuby end def self.survey_users - User.where("users.signup_survey_sent_at IS NULL AND users.created_at < ?", 1.days.ago) + cutoff_date = Date.parse(Rails.application.config.signup_survey_cutoff_date) # Define a cutoff date for the survey + User.where("users.signup_survey_sent_at IS NULL AND users.created_at < ? AND users.created_at > ?", 1.days.ago, cutoff_date) end end end \ No newline at end of file diff --git a/web/config/application.rb b/web/config/application.rb index 033060c28..397840eaf 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -519,6 +519,8 @@ if defined?(Bundler) config.spa_origin_url = "http://beta.jamkazam.local:4000" config.user_match_monitoring_email = "user_match_monitoring_email@jamkazam.com" config.send_user_match_mail_only_to_jamkazam_team = true + config.signup_survey_url = "https://www.surveymonkey.com/r/WVBKLYL" + config.signup_survey_cutoff_date = "2025-06-10" config.action_mailer.asset_host = config.action_controller.asset_host end end diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index efd1faf54..858e677b1 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -126,4 +126,6 @@ SampleApp::Application.configure do config.action_controller.asset_host = 'http://www.jamkazam.local:3000' config.send_user_match_mail_only_to_jamkazam_team = false + config.signup_survey_url = "https://www.surveymonkey.com/r/WVBKLYL" + config.signup_survey_cutoff_date = "2025-06-10" end