effective_events 2.26.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93702d0f34b53536a8534ad5d983be17e75f66bf133e8cd67c46e3d38f6ec5dc
-  data.tar.gz: 243eb4b9796e5b0752ec0bfa4d121508253550e5765a62be4252e2835a6391d8
+  metadata.gz: 2a2da9770f5c4f1594f4364d6ac060476cdd4e4624c8c1e8866c4ce096001ba6
+  data.tar.gz: 94af1b7beb1e82aa64fce228e047dfbca828bf5fddc1e88ffb7d59b1e94a0833
 SHA512:
-  metadata.gz: 408c0a3b0d923e692e1c853945e0b2899e83d02743049cc7d834ccb1163f00ca6e941b5291e9ece8abe98177f4d475b99eeaa15c9d3f047aa153f0e0f94cfc15
-  data.tar.gz: d1d0ddeb5f16cfd4d803e76222b27c5450f584f45adc9f63961fe7f0c033490554f1ab2780d964fcea91113d8553ce1e53d55c4de5afc744e0dddd5075b5f178
+  metadata.gz: ac0da1b17544723dbf542c7286fa456991b0882baf0c5bb0aefe5ef3d4f3cd18aecef8741a984761ffc33f54c50930d3a90dfbe398aefcca97baf3332abdf12d
+  data.tar.gz: 6a194263574e2a7b715573f39a94fc06c9e653100b80f98f1e123a7a034ebf21fb9549f140a266501e28aaf3a1634515a3ad79afff752eb2a6a8dd1902d4f85b

data/app/mailers/effective/events_mailer.rb

@@ -24,10 +24,11 @@ module Effective
 
       @event_registration = resource
       @event = resource.event
-      @event_registrants = resource.event_registrants
-      @event_addons = resource.event_addons
 
-      subject = subject_for(__method__, "Event Confirmation - #{@event}", resource, opts)
+      @order = @event_registration.submit_order
+      raise('expected an event registration submit_order') unless @order.present?
+
+      subject = subject_for(__method__, "Confirmation - #{@event}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.owner.email, subject: subject, **headers)
@@ -41,7 +42,7 @@ module Effective
       @event = resource.event
       @event_registration = resource.event_registration # Optional
 
-      subject = subject_for(__method__, "Event Registrant Confirmation - #{@event}", resource, opts)
+      subject = subject_for(__method__, "Confirmation - #{@event}", resource, opts)
       headers = headers_for(resource, opts)
 
       mail(to: resource.email, subject: subject, **headers)

data/app/models/concerns/effective_events_event_registration.rb

@@ -229,7 +229,7 @@ module EffectiveEventsEventRegistration
       notifications = event.event_notifications.select(&:registrant_purchased?)
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
 
-      send_event_registration_confirmation! unless submit_order&.delayed?
+      send_event_registration_confirmation! unless submit_order&.delayed? || submit_order&.deferred?
     end
   end
 
@@ -488,6 +488,8 @@ module EffectiveEventsEventRegistration
   # Sent on delayed payment date registration update 
   # Sent on update blank registrants
   def send_event_registration_confirmation!
+    return false unless EffectiveEvents.send_confirmation_email?
+
     EffectiveEvents.send_email(:event_registration_confirmation, self)
   end
 

data/app/views/effective/events_mailer/event_registrant_confirmation.html.haml

@@ -1,22 +1,39 @@
-%h2 Event Registrant Confirmation
+%h1{style: "text-align: center"} Your tickets have been confirmed!
 
-%p Event: #{@event.title}
-%p Date: #{effective_events_event_schedule(@event)}
-%p Ticket: #{@event_registrant.purchasable_name.gsub('<br>', ' - ').html_safe} - #{price_to_currency(@event_registrant.price)}
-
-- if @event_registrant.responses.present?
-  %p= @event_registrant.responses
-
-- if @event_registration.present? && @event_registrant.user == @event_registration.owner
-  %p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
+%p{style: "text-align: center"}
+  %strong{style: "font-size: 18px"}= @event.title
+  %br
+  #{effective_events_event_schedule(@event)}
 
 - if @event.rich_text_confirmation_email.present?
   %hr
   = @event.rich_text_confirmation_email.to_s.html_safe
 
-- if @event.delayed_payment?
-  %strong Please note:
-  %ul
-    %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")} 
+- if @event.delayed_payment? && @event_registration.present? && @event_registrant.user == @event_registration.owner && @event_registration.submit_order.delayed? && @event_registration.submit_order.deferred?
+  %hr
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
+  %ul{style: "margin-top: 0;"}
+    %li Your credit card will be charged on <strong>#{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
     %li Changes and cancellations must be made before this date.
-    %li A receipt will be sent to you after the transaction is completed.
+    %li A receipt will be sent after the transaction is completed.
+
+%hr
+
+%table.table
+  %thead
+    %tr
+      %th{style: "text-align: left;"} Qty
+      %th{style: "text-align: left;"} Ticket
+      %th{style: "text-align: right;"} Price
+  %tbody
+    %tr
+      %td{style: "text-align: left;"} 1
+      %td{style: "text-align: left;"}
+        = @event_registrant.purchasable_name
+        = @event_registrant.responses if @event_registrant.responses.present?
+      %td{style: "text-align: right;"}= price_to_currency(@event_registrant.price)
+
+- if @event_registration.present? && @event_registrant.user == @event_registration.owner
+  %hr
+  %p{style: "text-align: center;"}
+    = link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))

data/app/views/effective/events_mailer/event_registration_confirmation.html.haml

@@ -1,45 +1,101 @@
-%h2 Event Registration Confirmation
+%h1{style: "text-align: center"} Your tickets have been confirmed!
 
-%p Event: #{@event.title}
-%p Date: #{effective_events_event_schedule(@event)}
-%p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
+%p{style: "text-align: center"}
+  %strong{style: "font-size: 18px"}= @event.title
+  %br
+  #{effective_events_event_schedule(@event)}
 
 - if @event.rich_text_confirmation_email.present?
   %hr
   = @event.rich_text_confirmation_email.to_s.html_safe
 
 - if @event.delayed_payment?
-  %strong Please note:
-  %ul
-    %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")} 
+  %hr
+  %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
+  %ul{style: "margin-top: 0;"}
+    %li Your credit card will be charged on <strong>#{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
     %li Changes and cancellations must be made before this date.
-    %li A receipt will be sent to you after the transaction is completed.
+    %li A receipt will be sent after the transaction is completed.
 
 %hr
 
-- responses = Array(@event_registrants).any? { |er| er.responses.present? }
-
-%table.table
-  %thead
-    %tr
-      %th Qty
-      %th Ticket
-      - if responses
-        %th Details
-      %th Price
-  %tbody
-    - Array(@event_registrants).each do |er|
+.effective-order
+  %table.table{style: "margin-bottom: 20px;"}
+    %thead
       %tr
-        %td 1
-        %td= er.purchasable_name
-        - if responses
-          %td= er.responses
-        %td= price_to_currency(er.price)
+        %th{style: "text-align: left;"} Qty
+        %th{style: "text-align: left;"} Ticket
+        %th{style: "text-align: right;"} Price
+
+    %tbody
+      - @order.order_items.each do |oi|
+        %tr
+          %td{style: "text-align: left;"}= oi.quantity
+          %td{style: "text-align: left;"}
+            = oi.to_s.html_safe
+            = oi.purchasable.try(:responses) || oi.purchasable.try(:notes)
+          %td.price= price_to_currency(oi.price)
 
-    - Array(@event_addons).each do |ea|
+    %tfoot
       %tr
-        %td 1
-        %td= ea.purchasable_name
-        - if responses
-          %td= ea.notes
-        %td= price_to_currency(ea.price)
+        %td{colspan: 3}= "&nbsp;".html_safe
+      %tr
+        %th.subtotal{colspan: 2}
+          Subtotal
+        %td.price.subtotal-price
+          = price_to_currency(@order.subtotal)
+
+      - if @order.tax_rate.blank?
+        -# Nothing to do. We can't display Tax, Total or Credit Card Surcharge (which is taxed) yet.
+
+      - elsif @order.tax_rate.present? && @order.surcharge_percent.to_f > 0.0
+        %tr
+          %th.tax{colspan: 2}
+            Tax (#{rate_to_percentage(@order.tax_rate)})
+          %td.price.tax-price
+            = price_to_currency(@order.tax)
+
+        %tr
+          %th.amount-owing{colspan: 2}
+            Amount owing before Credit Card Processing Fee
+          %td.price.amount-owing-price
+            = price_to_currency(@order.amount_owing)
+
+        %tr
+          %th.surcharge{colspan: 2}
+            Credit Card Processing Fee (#{rate_to_percentage(@order.surcharge_percent)}) on #{price_to_currency(@order.amount_owing)}
+          %td.price.surcharge-price
+            = price_to_currency(@order.surcharge)
+
+        %tr
+          %th.surcharge-tax{colspan: 2}
+            Tax (#{rate_to_percentage(@order.tax_rate)}) on Credit Card Processing Fee
+          %td.price.surcharge-tax-price
+            = price_to_currency(@order.surcharge_tax)
+
+        %tr
+          %th.total{colspan: 2}
+            Total amount charged to credit card
+          %td.price.total-price
+            = price_to_currency(@order.total)
+
+      - elsif @order.tax_rate.present? && !(@order.surcharge_percent.to_f > 0.0)
+        %tr
+          %th.tax{colspan: 2}
+            Tax (#{rate_to_percentage(@order.tax_rate)})
+          %td.price.tax-price
+            = price_to_currency(@order.tax)
+
+        %tr
+          %th.total{colspan: 2}
+            Total
+          %td.total-price
+            = price_to_currency(@order.total)
+
+%hr
+
+%p{style: "text-align: center;"}
+  - if @event.delayed_payment? && @order.delayed? && @order.deferred?
+    = link_to('View or modify your registration', effective_events.event_event_registration_url(@event, @event_registration))
+  - else
+    = link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))

data/config/effective_events.rb

@@ -29,6 +29,9 @@ EffectiveEvents.setup do |config|
   # Hint text for event images attachments
   config.events_hint_text = 'Optional. Shown on the events index and event pages. Dimensions are 220px tall and 350px wide.'
 
+  # Send confirmation emails
+  config.send_confirmation_email = false
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.26.0'.freeze
+  VERSION = '2.28.0'.freeze
 end

data/lib/effective_events.rb

@@ -9,7 +9,7 @@ module EffectiveEvents
       :events_table_name, :event_registrants_table_name, :event_tickets_table_name, :event_ticket_selections_table_name,
       :event_registrations_table_name, :event_products_table_name, :event_addons_table_name, :event_notifications_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
-      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
+      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text, :send_confirmation_email,
       :organization_enabled, :create_users, :company_or_organization_required,
       :event_registration_class_name
     ]
@@ -39,4 +39,8 @@ module EffectiveEvents
     !!EffectiveOrders.try(:delayed?) 
   end
 
+  def self.send_confirmation_email?
+    send_confirmation_email == true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails