seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

update email for amazon users

This commit is contained in:
Seth Call 2017-10-15 17:07:35 -05:00
parent 21c294de59
commit 175d6d458e
8 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/up/amazon_signup.sql
View File

@ -1 +1,2 @@
ALTER TABLE users ADD COLUMN under_13 BOOLEAN;
ALTER TABLE users ADD COLUMN under_13 BOOLEAN;
ALTER TABLE users ADD COLUMN via_amazon BOOLEAN;

16
ruby/lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -66,6 +66,22 @@ module JamRuby
end
end
def amazon_welcome_message(user)
@user = user
@subject = "Your 2 free music lessons"
sendgrid_category "Welcome"
sendgrid_unique_args :type => "welcome_message"
sendgrid_recipients([user.email])
sendgrid_substitute('@USERID', [user.id])
sendgrid_substitute(EmailBatchProgression::VAR_FIRST_NAME, [user.first_name])
mail(:to => user.email, :subject => @subject) do |format|
format.text
format.html
end
end
def student_welcome_message(user)
@user = user
@subject = "Welcome to JamKazam and JamClass online lessons!"

18
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/amazon_welcome_message.html.erb Normal file
View File

@ -0,0 +1,18 @@
<p>
Welcome to JamKazam, and congratulations on the purchase of your new guitar or bass from Amazon!
</p>
<p>
Connecting with a world-class instructor is the best way to learn to play an instrument. Your instructor will guide you based on your unique goals, make sure you’re doing things correctly to build a solid foundation, and maximize your musical growth from your investment of time.
</p>
<p>JamKazam has attracted a community of world-class instructors and has built a truly unique technology platform that lets students and instructors learn and play together over the Internet from the comfort and convenience of home.</p>
<p>
Within a day or two, one of our support team members will reach out to you via email to help you get ready for your first lesson. We provide free and highly personalized 1:1 support to help you set up our app with audio and video, make sure everything is working properly, and get you comfortable with the features you’ll be using in your lessons.
</p>
<p>
Thanks again for joining our community of <%= APP_CONFIG.musician_count %> musicians and starting your musical journey with us! We’ll be in touch very soon.
</p>
<p>Best Regards,<br/>
Team JamKazam</p>

14
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/amazon_welcome_message.text.erb Normal file
View File

@ -0,0 +1,14 @@
<% provide(:title, @subject) %>
Welcome to JamKazam, and congratulations on the purchase of your new guitar or bass from Amazon!
Connecting with a world-class instructor is the best way to learn to play an instrument. Your instructor will guide you based on your unique goals, make sure you’re doing things correctly to build a solid foundation, and maximize your musical growth from your investment of time.
JamKazam has attracted a community of world-class instructors and has built a truly unique technology platform that lets students and instructors learn and play together over the Internet from the comfort and convenience of home.</p>
Within a day or two, one of our support team members will reach out to you via email to help you get ready for your first lesson. We provide free and highly personalized 1:1 support to help you set up our app with audio and video, make sure everything is working properly, and get you comfortable with the features you’ll be using in your lessons.
Thanks again for joining our community of <%= APP_CONFIG.musician_count %> musicians and starting your musical journey with us! We’ll be in touch very soon.
Best Regards,
Team JamKazam

4
ruby/lib/jam_ruby/models/lesson_package_type.rb
View File

@ -48,6 +48,10 @@ module JamRuby
LessonPackageType.find(SINGLE_FREE)
end
def is_amazon?
AMAZON_PACKAGES.include?(id)
end
def self.amazon_test_drive_free_4
LessonPackageType.find(AMAZON_TEST_DRIVE_FREE_4_ID)
end

3
ruby/lib/jam_ruby/models/posa_card.rb
View File

@ -38,6 +38,9 @@ module JamRuby
validate :must_be_activated
validate :within_one_year
def is_amazon_posa_card?
lesson_package_type.is_amazon?
end
def is_lesson_posa_card?
self.is_lesson
end

9
ruby/lib/jam_ruby/models/user.rb
View File

@ -1367,6 +1367,7 @@ module JamRuby
if posa_card
posa_card.claim(user)
user.via_amazon = posa_card.is_amazon_posa_card?
user.posa_cards << posa_card
user.purchase_required = posa_card.requires_purchase # temporary; just so the signup page knows to send them to payment place
else
@ -1467,7 +1468,13 @@ module JamRuby
end
AdminMailer.jamclass_alerts({subject: "#{user.email} just signed up as a student", body: body}).deliver_now
UserMailer.student_welcome_message(user).deliver_now
if user.via_amazon
UserMailer.amazon_welcome_message(user).deliver_now
else
UserMailer.student_welcome_message(user).deliver_now
end
#end
elsif user.is_a_teacher
UserMailer.teacher_welcome_message(user).deliver_now

2
web/config/application.rb
View File

@ -448,7 +448,7 @@ if defined?(Bundler)
config.end_of_wait_window_forgiveness_minutes = 1
config.olark_enabled = true
config.jamclass_enabled = false
config.musician_count = '40,000+'
config.musician_count = '75,000+'
config.jamblaster_menu = false
# Applications created before Rails 4.1 uses Marshal to serialize cookie values into the signed and encrypted cookie jars.
# If you want to use the new JSON-based format in your application, you can add an initializer file with the following content: