diff --git a/.version b/.version index 4fc01ac9..3c59b404 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.3.19 +1.3.20 diff --git a/app/controllers/ticket_requests_controller.rb b/app/controllers/ticket_requests_controller.rb index 06072bcc..e62ffb54 100644 --- a/app/controllers/ticket_requests_controller.rb +++ b/app/controllers/ticket_requests_controller.rb @@ -252,7 +252,7 @@ def payment_reminder counter = 0 @event.ticket_requests.awaiting_payment.find_each do |ticket_request| if ticket_request.price.positive? - Rails.logger.debug { "payment_reminder: sending reminder for ticket request: #{ticket_request.inspect}" } + Rails.logger.info { "payment_reminder: sending reminder for ticket request: #{ticket_request.id}" } TicketRequestMailer.payment_reminder(ticket_request).deliver_later counter += 1 end @@ -272,7 +272,7 @@ def email_ticket_holders counter = 0 @event.ticket_requests.active.find_each do |ticket_request| - Rails.logger.debug { "email_ticket_holders: sending reminder for ticket request: #{ticket_request.inspect}" } + Rails.logger.info { "email_ticket_holders: sending email to: #{ticket_request.id}, subject: #{subject}" } TicketRequestMailer.email_ticket_holder(ticket_request, subject, body).deliver_later counter += 1 end diff --git a/app/mailers/ticket_request_mailer.rb b/app/mailers/ticket_request_mailer.rb index 431724a9..4ad10eab 100644 --- a/app/mailers/ticket_request_mailer.rb +++ b/app/mailers/ticket_request_mailer.rb @@ -104,10 +104,11 @@ def request_denied(ticket_request) def payment_reminder(ticket_request) # Set the ticket request self.ticket_request = ticket_request + Rails.logger.info { "payment_reminder: ticket_request: #{ticket_request.id} user: #{ticket_request.user.id}" } # Generate an authentication token for the user @auth_token = ticket_request.generate_user_auth_token! - Rails.logger.debug { "payment_reminder: ticket_request: #{ticket_request.inspect} user: #{ticket_request.user.id} auth_token: #{@auth_token}" } + Rails.logger.debug { "payment_reminder: #{ticket_request.inspect} auth_token: #{@auth_token}" } # Return if the authentication token is blank if @auth_token.blank? diff --git a/app/views/events/_event_summary.html.haml b/app/views/events/_event_summary.html.haml index 7368676f..c8c0c84f 100644 --- a/app/views/events/_event_summary.html.haml +++ b/app/views/events/_event_summary.html.haml @@ -43,11 +43,11 @@ %td.px-2 %span.price = number_to_currency(@event.kid_ticket_price) - - if @event.max_kid_tickets_per_request.present? - %span.muted (Maximum #{@event.max_adult_tickets_per_request} tickets) - - else - %span.muted - (Unlimited tickets) + - if @event.max_kid_tickets_per_request.present? + %span.muted (Maximum #{@event.max_kid_tickets_per_request} tickets) + - else + %span.muted + (Unlimited tickets) - if @event.active_event_addons? %span.muted 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 f51a2789..ddfb5527 100644 --- a/app/views/ticket_request_mailer/email_ticket_holder.html.haml +++ b/app/views/ticket_request_mailer/email_ticket_holder.html.haml @@ -23,5 +23,3 @@ = link_to "#{@ticket_request_url}", @ticket_request_url %p -%p - %i This email was generated by a very friendly #{Faker::Creature::Animal.name} at: #{Time.now} \ No newline at end of file diff --git a/app/views/ticket_request_mailer/payment_reminder.html.haml b/app/views/ticket_request_mailer/payment_reminder.html.haml index f9711bab..a1fe03d1 100644 --- a/app/views/ticket_request_mailer/payment_reminder.html.haml +++ b/app/views/ticket_request_mailer/payment_reminder.html.haml @@ -22,6 +22,4 @@ P.S. You can view the status of your request at any time by visiting = link_to 'this page', @ticket_request_url -%p -%p - %i This email was generated by a very friendly #{Faker::Creature::Animal.name} at: #{Time.now} \ No newline at end of file +%p \ No newline at end of file diff --git a/lib/mailer_previews/ticket_request_mailer_preview.rb b/lib/mailer_previews/ticket_request_mailer_preview.rb index 7f9b0d24..4a7a5279 100644 --- a/lib/mailer_previews/ticket_request_mailer_preview.rb +++ b/lib/mailer_previews/ticket_request_mailer_preview.rb @@ -3,21 +3,37 @@ class TicketRequestMailerPreview < ActionMailer::Preview def email_ticket_holder ticket_request = TicketRequest.last - subject = 'Test Subject' - body = "This is my message test + subject = 'FnF Fall Classic - Important Information' + body = "Friends! Family!
-We care deeply about the health, safety, and comfort of attendees at our events
-and member of our community.
-To help achieve this, we ask all of our members and guests to read,
-and abide by our Code Of Conduct
+The Classic is a week away! Holy carp!
-We ask that you share this with each of your guests whom you may bring to the event. +VOLUNTEER!
-We are a community driven by volunteerism in the service of the community.
+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!
-As such, we depend upon the energy and vision of members and guests to make our events happen!
-Please (re)acquaint yourself with The FnF Way, https://cfaea.net/the-fnf-way/,
-and get involved with helping make the event happen!
+The volunteer signup sheet: https://signup.app.fnf.org
+
+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).
+
+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
+
+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! " TicketRequestMailer.with(ticket_request:).email_ticket_holder(ticket_request, subject, body) end