- Emails make use of variables; variables are placeholders that are automatically replaced with user- and reservation- specific information.
+ Please note that by default all emails sent to users include a salutation (e.g. "Dear John") and a closing (e.g. "Sincerely, John Doe Library")
+
+ Emails make use of variables; variables are placeholders that are automatically replaced with user- and reservation- specific information.
You can use the following variables in each email:
<%= simple_format(replace_variables(@app_configs.upcoming_checkin_email_body)) %>
\ No newline at end of file +<%= render html: simple_format(replace_variables(@app_configs.upcoming_checkin_email_body)).html_safe %> \ No newline at end of file diff --git a/app/views/user_mailer/_missed.html.erb b/app/views/user_mailer/_missed.html.erb index 988fafe40..4e8191b83 100644 --- a/app/views/user_mailer/_missed.html.erb +++ b/app/views/user_mailer/_missed.html.erb @@ -1 +1 @@ -<%= simple_format(replace_variables(@app_configs.deleted_missed_reservation_email_body)) %>
\ No newline at end of file +<%= render html: simple_format(replace_variables(@app_configs.deleted_missed_reservation_email_body)).html_safe %> \ No newline at end of file diff --git a/app/views/user_mailer/_overdue.html.erb b/app/views/user_mailer/_overdue.html.erb index 1f8870e3f..f0397fbca 100644 --- a/app/views/user_mailer/_overdue.html.erb +++ b/app/views/user_mailer/_overdue.html.erb @@ -1 +1 @@ -<%= simple_format(replace_variables(@app_configs.overdue_checkin_email_body)) %>
+<%= render html: simple_format(replace_variables(@app_configs.overdue_checkin_email_body)).html_safe %> diff --git a/app/views/user_mailer/_starts_today.html.erb b/app/views/user_mailer/_starts_today.html.erb index 15926c552..453fa6b63 100644 --- a/app/views/user_mailer/_starts_today.html.erb +++ b/app/views/user_mailer/_starts_today.html.erb @@ -1 +1 @@ -<%= simple_format(replace_variables(@app_configs.upcoming_checkout_email_body)) %>
\ No newline at end of file +<%= render html: simple_format(replace_variables(@app_configs.upcoming_checkout_email_body)).html_safe %> \ No newline at end of file diff --git a/db/default_messages/deleted_missed_email b/db/default_messages/deleted_missed_email index 5b0609f96..bdc286810 100644 --- a/db/default_messages/deleted_missed_email +++ b/db/default_messages/deleted_missed_email @@ -1,6 +1 @@ -Dear @user@,\n\n\ - Because you have missed a scheduled equipment checkout, your reservation (number Reservation_id@) has been cancelled. If you believe this is in error, please contact an administrator.\n\n\ - @equipment_list@\n\n\ - Thank you,\n\ - '@department_name@' - +Because you have missed a scheduled equipment checkout, your reservation has been cancelled. If you believe this is in error, please contact an administrator. diff --git a/db/default_messages/overdue_email b/db/default_messages/overdue_email index bf61192a6..15ea1dc85 100644 --- a/db/default_messages/overdue_email +++ b/db/default_messages/overdue_email @@ -1,10 +1,10 @@ -Dear @user@,\n\n\ - It looks like you have overdue equipment!\n\n\ - Please return the following equipment to us as soon as possible. Until then you will be charged a daily late fee of @late_fee@.\n\n\ - @equipment_list@\n\n\ - Failure to return equipment will result in the levying of replacement fees, and potential revocation of borrowing privileges.\n\n\ - Your reservation number is Reservation_id@.\n\n\ - Thank you,\n\ - '@department_name@' +It looks like you have overdue equipment! +Please return the following equipment to us as soon as possible. Until then you will be charged a daily late fee of @late_fee@. + +@equipment_list@ + +Failure to return equipment will result in the levying of replacement fees, and potential revocation of borrowing privileges. + +Your reservation number is @reservation_id@. diff --git a/db/default_messages/upcoming_checkin_email b/db/default_messages/upcoming_checkin_email index a409abce5..bfba69741 100644 --- a/db/default_messages/upcoming_checkin_email +++ b/db/default_messages/upcoming_checkin_email @@ -1,5 +1,9 @@ - Hey there, you have equipment due! Please return the following items before 4pm on @return_date@.\n\n\ - @equipment_list@\n\n\ - If you fail to return your equipment on time you will be subject to a late fee of @late_fee@ per day. If you have lost the item you may additionally have to pay a replacement fee of @replacement_fee@.\n\ - Log in to Reservations to see if any of your items are eligible for renewal. If you have further questions feel free to contact an employee of @department_name@.\n\n\ - Your reservation number is @reservation_id@.\n\n\ +Hey there, you have equipment due! Please return the following items before 4pm on @return_date@. + +@equipment_list@ + +If you fail to return your equipment on time you will be subject to a late fee of @late_fee@ per day. If you have lost the item you may additionally have to pay a replacement fee of @replacement_fee@. +Log in to Reservations to see if any of your items are eligible for renewal. If you have further questions feel free to contact an employee of @department_name@. + +Your reservation number is @reservation_id@. + diff --git a/db/default_messages/upcoming_checkout_email b/db/default_messages/upcoming_checkout_email index 5e0ad09bc..a23aaa7a0 100644 --- a/db/default_messages/upcoming_checkout_email +++ b/db/default_messages/upcoming_checkout_email @@ -1,4 +1,7 @@ - Hey there, you have equipment reserved today! Please checkout the following items today:\n\n\ - @equipment_list@\n\n\ - If you fail to return your equipment on time you will be subject to a late fee of @late_fee@ per day. If you have lost the item you may additionally have to pay a replacement fee of @replacement_fee@.\n\ - Log in to Reservations to see if any of your items are eligible for renewal. If you have further questions feel free to contact an employee of @department_name@.\n\n\ +Hey there, you have equipment reserved today! Please checkout the following items today: + +@equipment_list@ + +If you fail to return your equipment on time you will be subject to a late fee of @late_fee@ per day. If you have lost the item you may additionally have to pay a replacement fee of @replacement_fee@. +Log in to Reservations to see if any of your items are eligible for renewal. If you have further questions feel free to contact an employee of @department_name@. + diff --git a/lib/tasks/setup_application.rake b/lib/tasks/setup_application.rake index eead319a9..f1d4531cd 100644 --- a/lib/tasks/setup_application.rake +++ b/lib/tasks/setup_application.rake @@ -94,60 +94,23 @@ namespace :app do end # app config default variables - terms_of_service_text = 'No terms of service document has been '\ - 'uploaded yet. Please navigate to http://sitelocation/app_configs to '\ - 'add a ToS and edit other application configurations.' - upcoming_checkin_email_body = - "Dear @user@,\n\n"\ - 'Hey there, you have equipment due! Please return the following items '\ - "before 4pm on @return_date@.\n\n"\ - "@equipment_list@\n\n"\ - 'If you fail to return your equipment on time you will be subject to '\ - 'a late fee of @late_fee@ per day. If you have lost the item you may '\ - "additionally have to pay a replacement fee of @replacement_fee@.\n"\ - 'Log in to Reservations to see if any of your items are eligible for '\ - 'renewal. If you have further questions feel free to contact an '\ - "employee of @department_name@.\n\n"\ - "Your reservation number is @reservation_id@.\n\n"\ - "Thank you,\n"\ - "@department_name@\n\n"\ - - upcoming_checkout_email_body = - "Dear @user@,\n\n"\ - 'Hey there, you have an upcoming reservation! You have reserved the '\ - 'following item(s), which will be available today:\n\n'\ - "@equipment_list@\n\n"\ - 'If you fail to return your equipment on time you will be subject to '\ - 'a late fee of @late_fee@ per day. If you have lost the item you may '\ - "additionally have to pay a replacement fee of @replacement_fee@.\n"\ - 'Log in to Reservations to see if any of your items are eligible for '\ - 'renewal. If you have further questions feel free to contact an '\ - "employee of @department_name@.\n\n"\ - "Your reservation number is @reservation_id@.\n\n"\ - "Thank you,\n"\ - "@department_name@\n\n"\ - - overdue_checkin_email_body = - "Dear @user@,\n\n"\ - "It looks like you have overdue equipment!\n\n"\ - 'Please return the following equipment to us as soon as possible. '\ - "Until then you will be charged a daily late fee of @late_fee@.\n\n"\ - "@equipment_list@\n\n"\ - 'Failure to return equipment will result in the levying of '\ - 'replacement fees, and potential revocation of borrowing privileges.'\ - "\n\n"\ - "Your reservation number is @reservation_id@.\n\n"\ - "Thank you,\n"\ - '@department_name@' - - deleted_missed_reservation_email_body = - "Dear @user@,\n\n"\ - 'Because you have missed a scheduled equipment checkout, your '\ - 'reservation (number @reservation_id@) has been cancelled. If you '\ - "believe this is in error, please contact an administrator.\n\n"\ - "@equipment_list@\n\n"\ - "Thank you,\n"\ - '@department_name@' + DEFAULT_MSGS = File.join(Rails.root, 'db', 'default_messages') + + terms_of_service_text = File.read(File.join(DEFAULT_MSGS, 'tos_text')) + + upcoming_checkin_email_body = File.read(File.join(DEFAULT_MSGS, + 'upcoming_checkin_email')) + + upcoming_checkout_email_body = File.read(File.join(DEFAULT_MSGS, + 'upcoming_checkout_email' + )) + + overdue_checkin_email_body = File.read(File.join(DEFAULT_MSGS, + 'overdue_email')) + + deleted_missed_reservation_email_body = File.read(File.join( + DEFAULT_MSGS, + 'deleted_missed_email')) request_text = 'The following equipment cannot be reserved because of admin '\ diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb index 40d006ed1..4428986f5 100644 --- a/spec/mailers/admin_mailer_spec.rb +++ b/spec/mailers/admin_mailer_spec.rb @@ -5,9 +5,9 @@ expect(@mail.to.size).to eq(1) expect(@mail.to.first).to eq(@app_config.admin_email) end - it 'is from no-reply@reservations.app' do - expect(@mail.from.size).to eq(1) - expect(@mail.from.first).to eq('no-reply@reservations.app') + it "is from no-reply@#{ ActionMailer::Base.default_url_options[:host] }" do + expect(@mail.from).to eq("no-reply@#{ + ActionMailer::Base.default_url_options[:host] }") end it 'should actually send the email' do expect(ActionMailer::Base.deliveries.count).to eq(1) diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 68585befd..ffad83c41 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -65,6 +65,17 @@ "[Reservations] #{@res.equipment_model.name} Request Approved") end + it 'sends approved request notifications for requests starting today' do + @res.update_attributes(status: 'reserved', + flags: Reservation::FLAGS[:request], + start_date: Time.zone.today, + due_date: Time.zone.today + 1) + @mail = UserMailer.reservation_status_update(@res, + 'request approved').deliver + expect(@mail.subject).to eq( + "[Reservations] #{@res.equipment_model.name} Request Approved") + end + it 'sends reminders to check-out' do @res.update_attributes( FactoryGirl.attributes_for(:upcoming_reservation)) @@ -83,7 +94,7 @@ it 'sends check-out receipts' do @res.update_attributes( FactoryGirl.attributes_for(:checked_out_reservation)) - @mail = UserMailer.reservation_status_update(@res, true).deliver + @mail = UserMailer.reservation_status_update(@res).deliver expect(@mail.subject).to eq( "[Reservations] #{@res.equipment_model.name} Checked Out") end @@ -92,7 +103,7 @@ @res.update_attributes( FactoryGirl.attributes_for(:valid_reservation)) expect(@res.checked_out).to be_nil - @mail = UserMailer.reservation_status_update(@res, true).deliver + @mail = UserMailer.reservation_status_update(@res, 'checked out').deliver expect(@mail).to be_nil end @@ -100,14 +111,14 @@ @res.update_attributes( FactoryGirl.attributes_for(:checked_out_reservation, due_date: Time.zone.today)) - @mail = UserMailer.reservation_status_update(@res, true).deliver + @mail = UserMailer.reservation_status_update(@res, 'checked out').deliver expect(@mail.subject).to eq( "[Reservations] #{@res.equipment_model.name} Checked Out") end it 'sends check-out receipts for overdue reservations' do @res.update_attributes(FactoryGirl.attributes_for(:overdue_reservation)) - @mail = UserMailer.reservation_status_update(@res, true).deliver + @mail = UserMailer.reservation_status_update(@res, 'checked out').deliver expect(@mail.subject).to eq( "[Reservations] #{@res.equipment_model.name} Checked Out") end @@ -143,5 +154,13 @@ expect(@mail.subject).to eq( "[Reservations] #{@res.equipment_model.name} Returned Overdue") end + + it "doesn't send fine emails when there is no late fee" do + @res.update_attributes(FactoryGirl.attributes_for(:checked_in_reservation, + :overdue)) + @res.equipment_model.update_attributes(late_fee: 0) + @mail = UserMailer.reservation_status_update(@res).deliver + expect(@mail).to be_nil + end end end