From ee153353dcbad493b3666f0376bda4223b5ff6b3 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Mon, 21 Oct 2024 09:41:16 -0700 Subject: [PATCH 1/2] remove email view Put all text into body. Updated template --- .../email_ticket_holder.html.haml | 22 ---------- .../ticket_request_mailer_preview.rb | 42 +++++++++---------- 2 files changed, 20 insertions(+), 44 deletions(-) diff --git a/app/views/ticket_request_mailer/email_ticket_holder.html.haml b/app/views/ticket_request_mailer/email_ticket_holder.html.haml index ddfb5527..8638d16c 100644 --- a/app/views/ticket_request_mailer/email_ticket_holder.html.haml +++ b/app/views/ticket_request_mailer/email_ticket_holder.html.haml @@ -1,25 +1,3 @@ -%p - Hi #{@ticket_request.user.first_name}, - -%p - - if @payment_url.present? - Your tickets still need to be purchased. - = link_to @payment_url do - Buy your tickets now! %p = @body - -%p - With love ❤️, - %br - Your FnF Ticket Team - -%p - - if @payment_url.present? - = link_to @payment_url do - Buy your tickets now! -%p - You can view the status of your request at any time by visiting - = link_to "#{@ticket_request_url}", @ticket_request_url - %p diff --git a/lib/mailer_previews/ticket_request_mailer_preview.rb b/lib/mailer_previews/ticket_request_mailer_preview.rb index 4a7a5279..857decb7 100644 --- a/lib/mailer_previews/ticket_request_mailer_preview.rb +++ b/lib/mailer_previews/ticket_request_mailer_preview.rb @@ -3,37 +3,35 @@ class TicketRequestMailerPreview < ActionMailer::Preview def email_ticket_holder ticket_request = TicketRequest.last - subject = 'FnF Fall Classic - Important Information' - body = "Friends! Family! + subject = 'FnF Fall Classic - Important Information - Thank you!' + body = " +Hi Friends and Family!

-The Classic is a week away! Holy carp! +Thank you all for attending the 2024 FnF Fall Classic! We hope you had tons of fun! I know I did!

+Great music, perfect weather, and you!
+The Classic is one of my favorite events anywhere.
+Thank you for making this happen!

-VOLUNTEER! +1) We have some outstanding payments for Car Camping ($50/car) and Late Departure ($30/person).
+If you have not already done so, please PayPal your balance to paypal@cfaea.org.

-FnF is a community driven by volunteerism. Our events are produced entirely by volunteers, for ourselves!
-We can’t throw this event without *your* help!
-Please sign up for a couple of shifts. You’ll get to meet awesome new people and have fun doing it! +2) Lost and Found is here: https://docs.google.com/spreadsheets/d/1yy4mlnrt4wI5rYLPNau5iOzLSZo3YbuemBF_c59wsN0/edit?usp=sharing

-The volunteer signup sheet: https://signup.app.fnf.org +3) Please join our FnF Slack! It's private and we use it for teams and groups to chat in real-time. https://join.slack.com/t/cfaea/shared_invite/zt-2mrpai15u-k3z3z92gr3y2GfFceGRLuQ

-If you are looking for a great way to contribute and want to meet a lot of people along the way,
-consider taking a shift as a Site Coordinator (SkC). +4) Please fill out the Fall Classic '24 retrospective questionnaire. +
+It can be totally anonymous, but if you'd like us to contact you, please include your email.
+There is also a space where you can get us your email if you'd like to volunteer in the future.
+https://forms.gle/gtdZN6WdNMFPctEE9

-WEBSITE:

-We will continue to update The Fall Classic event page with all of the information a raver needs, -so check back before you go!
-https://fnf.events/2024-fall-classic +And please forward this email to your guests and invite them to join the FnF Planners group to get more involved.
+We had a lot of wonderful new people!

-Friends and Family reminds you to Leave No Trace!

-If you pack it in, you pack it out!
-This means that if the packaging, trash, cans, bottles, came with you, it goes home with you! -

-“Robot poop” is NOT recyclable. Do not throw any in the trash or recycling! -

-

-Excited to see all of you there! +With love and gratitude,
+Bessie, Ethan, Joanna, Matt, Sticky " TicketRequestMailer.with(ticket_request:).email_ticket_holder(ticket_request, subject, body) end From db223da556c85a180221449757a7d748af3a1d92 Mon Sep 17 00:00:00 2001 From: Matt Levy Date: Mon, 21 Oct 2024 09:41:31 -0700 Subject: [PATCH 2/2] bump version --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 3c59b404..89bdc094 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3.20 +1.3.21