From e46bdfe82a6286bed8c67c429312a5199f7996a1 Mon Sep 17 00:00:00 2001 From: Godwin Date: Sat, 12 Sep 2015 18:44:00 -0700 Subject: [PATCH] Fixed preview for thank you email --- app/controllers/conferences_controller.rb | 6 +- ...age--conferences.MyBikeBike.broadcast.html | 4 +- ...ge--conferences.MyBikeBike.register-1.html | 4 +- ...ge--conferences.MyBikeBike.register-3.html | 103 +++++++++ ...ge--conferences.MyBikeBike.register-3.html | 216 ------------------ ...from-landing-page--email_confirmation.html | 4 +- ...nding-page--registration_confirmation.html | 103 +++++++++ config/locales/data/translation-info.yml | 14 +- 8 files changed, 224 insertions(+), 230 deletions(-) create mode 100644 config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html delete mode 100644 config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html create mode 100644 config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index bf84a25..b0ff19f 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -511,7 +511,11 @@ class ConferencesController < ApplicationController current_user.save if new_registration - UserMailer.registration_confirmation(@registration).deliver_now + UserMailer.send_mail :registration_confirmation do + { + :args => @registration + } + end end @register_template = @registration.registration_fees_paid ? :done : :payment diff --git a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html index 4abbeb9..441a6e3 100644 --- a/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html +++ b/config/locales/data/html_records/Broadcast-message--conferences.MyBikeBike.broadcast.html @@ -77,7 +77,7 @@ @@ -93,7 +93,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html index aa858bd..831e595 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-1.html @@ -80,7 +80,7 @@

-Confirm now +Confirm now

@@ -94,7 +94,7 @@ diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html new file mode 100644 index 0000000..f02b139 --- /dev/null +++ b/config/locales/data/html_records/Start-registration-from-landing-page--Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html @@ -0,0 +1,103 @@ + + + + + +<span class="translated-content" data-i18n-key="email.subject.registration_confirmed" data-i18n-needs-translation="1">Thank you for registering for My Bike!Bike!</span> + + + +
- +
-© Bike!Bike! 2015 +© Bike!Bike! 2015
-© Bike!Bike! 2015 +© Bike!Bike! 2015
+ + + +
+ + + + + + + + + + + + + + +

Thank you John Doe,

+

You have successfully registered for My Bike!Bike!. You can modify your registration details, pay, or add workshops at any time by restarting the registration process. If you have yet to pay or add your workshops and plan to do so, we ask that you take care of it as soon as possible to help us prepare in advance of your arrival.

+

See you in Halifax!

+
 
+ + +© Bike!Bike! 2015 +
 
+
+ + diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html b/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html deleted file mode 100644 index 8880d9f..0000000 --- a/config/locales/data/html_records/Start-registration-from-landing-page--conferences.MyBikeBike.register-3.html +++ /dev/null @@ -1,216 +0,0 @@ - - - -Bike!Bike! - - - - - - - - - - - - - - -
- -
- -
-

Registration Info

-

Please fill in this registration form to help us prepare for your arrival to Guadalajara. If you wish to ask questions or tell us information we did not ask, please fill in the "More Info" field at the bottom of the page.

-
-

What is your name?

-
- - -
-

Where are you coming from?

-
- - -
-

For what days will you need housing? (If you don't need housing, just tell us how long you plan to hang out with Bike!Bike!)

-
-
- - -
-
- - -
-
-

Which languages do you speak?

-
- - - -
-

Do you need a place to stay?

-
- - - -
-

Do you need a bike?

-
- - - - -
-

What are your eating habits?

-
- - - -
-

Do you have any allergies?

-
- - -
-

Is there anything else you'd like to tell us?

-
- - -
- -
- -
-
-
-
- - - - - - \ No newline at end of file diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html index aa858bd..831e595 100644 --- a/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html +++ b/config/locales/data/html_records/Start-registration-from-landing-page--email_confirmation.html @@ -80,7 +80,7 @@

-Confirm now +Confirm now

@@ -94,7 +94,7 @@ -© Bike!Bike! 2015 +© Bike!Bike! 2015 diff --git a/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html new file mode 100644 index 0000000..f02b139 --- /dev/null +++ b/config/locales/data/html_records/Start-registration-from-landing-page--registration_confirmation.html @@ -0,0 +1,103 @@ + + + + + +<span class="translated-content" data-i18n-key="email.subject.registration_confirmed" data-i18n-needs-translation="1">Thank you for registering for My Bike!Bike!</span> + + + + + + + +
+ + + + + + + + + + + + + + +

Thank you John Doe,

+

You have successfully registered for My Bike!Bike!. You can modify your registration details, pay, or add workshops at any time by restarting the registration process. If you have yet to pay or add your workshops and plan to do so, we ask that you take care of it as soon as possible to help us prepare in advance of your arrival.

+

See you in Halifax!

+
 
+ + +© Bike!Bike! 2015 +
 
+
+ + diff --git a/config/locales/data/translation-info.yml b/config/locales/data/translation-info.yml index c86da3c..3ab660f 100644 --- a/config/locales/data/translation-info.yml +++ b/config/locales/data/translation-info.yml @@ -1194,7 +1194,7 @@ email.subject.registration_confirmed: vars: - :conference_title examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--registration_confirmation email.general.paragraph.thank_you: pages: - "/conferences/:slug/register" @@ -1202,8 +1202,8 @@ email.general.paragraph.thank_you: vars: - :name examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--registration_confirmation + - Start-registration-from-landing-page--registration_confirmation email.registration.paragraph.confirmed: pages: - "/conferences/:slug/register" @@ -1215,8 +1215,8 @@ email.registration.paragraph.confirmed: vars: - :conference_title examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--registration_confirmation + - Start-registration-from-landing-page--registration_confirmation email.general.paragraph.see_you: pages: - "/conferences/:slug/register" @@ -1224,8 +1224,8 @@ email.general.paragraph.see_you: vars: - :conference_location examples: - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 - - Start-registration-from-landing-page--conferences.MyBikeBike.register-4 + - Start-registration-from-landing-page--registration_confirmation + - Start-registration-from-landing-page--registration_confirmation articles.conference_registration.headings.Payment: pages: - "/conferences/:slug/register"