From d9c375df8398b7c8441a9cae9a2d161bb874286b Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 9 Mar 2018 18:27:27 -0600 Subject: [PATCH] send out email on onboarder assignment: VRFS-4717 --- ruby/lib/jam_ruby/models/user.rb | 5 +++++ web/app/controllers/sessions_controller.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 76971c1c4..515245eb7 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -333,6 +333,11 @@ module JamRuby updates = {onboarding_status: self.computed_onboarding_status} + if onboarder_id_changed? && onboarder_id + AdminMailer.ugly({to: onboarder.email, cc: 'support@jamkazam.com', + subject:'New student assigned to you', + body: "Hi #{onboarder.first_name},\n\nA new student has been assigned to you for onboarding. Please send the first introductory email to this student ASAP, and update the onboarding console to start tracking.\n\nNew User Email: #{email}\nNew User Name: #{name}\n\nOnboarding Management: https://www.jamkazam.com/client#/account/onboarder\n\nThanks!\n\nRegards,\nTeam JamKazam"}).deliver_now + end if first_onboarding_free_lesson_at_changed? || first_onboarding_paid_lesson_at_changed? || second_onboarding_free_lesson_at? updates[:stuck_take_flesson] = false updates[:stuck_take_2nd_flesson] = false diff --git a/web/app/controllers/sessions_controller.rb b/web/app/controllers/sessions_controller.rb index 96fd5c367..0dbc227e3 100644 --- a/web/app/controllers/sessions_controller.rb +++ b/web/app/controllers/sessions_controller.rb @@ -25,7 +25,7 @@ class SessionsController < ApplicationController password = params[:session][:password] email.strip! if email password.strip! if password - + user = User.authenticate(email, password) if user.nil?