effective_events 2.27.0 → 2.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca685f788c0c911540a269b943046c6182232e524f377fedc73d4df69040f32
-  data.tar.gz: d959c84ffa9a9a5f6c99107ba30f000795c4aaae1e5fbbe50c80a03642146dd9
+  metadata.gz: 65a88e5d6206066769f73981314e721330bf383d56aa44eb47cb0efeb4e4b3c3
+  data.tar.gz: e2b2e3a956bf3eaaaa1feaa2fdacc1e62ba0e273a2cc2361e11952b0259926c3
 SHA512:
-  metadata.gz: '08cff54abfee17f8058f581832a3bb313011cb6297259dbc856e550c27e6bca2dfd62dea52eaf680e9f80be6fa95f4f236d632793bc465ffd29585dedc597eb8'
-  data.tar.gz: 92d401b99b9bc124fe35754837a3c561f9000018f3081501b18ec6b1e81a234c8d9be0d7a1e077b937d9ffc89bbd96d54e9ffd72f9d43ad0f06b669786368a87
+  metadata.gz: 69dc5d4580c987c69198815e019180baedcec93657462f989574d9b9461bb8b08954e78e5936c65ed77e24be770c6575d2039ab54f78d5f6d5bdc583012dace5
+  data.tar.gz: 658199605d4c9926620ab684556f073ae6730fe25a582bfdcf2cb66efd6856718ded8940028602245be1c306fc688f02567b97b68db29aa42ee3d0b85a7aff92

data/app/mailers/effective/events_mailer.rb

@@ -24,13 +24,14 @@ 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)
+      mail(to: resource.owner.email, cc: mailer_admin, subject: subject, **headers)
     end
 
     # Sent manually by an admin to one registrant
@@ -41,10 +42,10 @@ 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)
+      mail(to: resource.email, cc: mailer_admin, subject: subject, **headers)
     end
 
     protected

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
 

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

@@ -19,35 +19,83 @@
 
 %hr
 
-- responses = Array(@event_registrants).any? { |er| er.responses.present? }
-
-%table.table
-  %thead
-    %tr
-      %th{style: "text-align: left;"} Qty
-      %th{style: "text-align: left;"}  Ticket
-      %th{style: "text-align: right;"}  Price
-  %tbody
-    - Array(@event_registrants).each do |er|
+.effective-order
+  %table.table{style: "margin-bottom: 20px;"}
+    %thead
       %tr
-        %td{style: "text-align: left;"} 1
-        %td{style: "text-align: left;"}
-          = er.purchasable_name
-          = er.responses if responses
-        %td{style: "text-align: right;"}= price_to_currency(er.price)
+        %th{style: "text-align: left;"} Qty
+        %th{style: "text-align: left;"} Ticket
+        %th{style: "text-align: right;"} Price
 
-    - Array(@event_addons).each do |ea|
+    %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)
+
+    %tfoot
+      %tr
+        %td{colspan: 3}= " ".html_safe
       %tr
-        %td{style: "text-align: left;"} 1
-        %td{style: "text-align: left;"}
-          = ea.purchasable_name
-          = ea.notes if responses
-        %td{style: "text-align: right;"}= price_to_currency(ea.price)
+        %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?
+  - 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/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.27.0'.freeze
+  VERSION = '2.28.1'.freeze
 end

metadata

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