effective_events 2.29.6 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1418db9da2798d264e5384fc5dfe32881f2d1f1833eb6d91663c7f9b7efe21f9
-  data.tar.gz: 8f84fd120bed8ad94285572e763c42fd4585286ffa3aaaf76aa604cd7b427dc6
+  metadata.gz: a00e6d6e6fce1100f98e19f6d9a0e5d1a9ba66ebfadf33de9b65f73127c859fa
+  data.tar.gz: 0abd39dd425fe5aa03a4aca9bc3e23e35319b829eb8136ac274a06531297f098
 SHA512:
-  metadata.gz: 2c04bc69efe714e931b6e058904d7b9d26d9f613472b946a9f085e75e60952ccac8b5c0695dc9f2e22c50e7897c83f9f8f89b1481fd01c09baef0aff71d2d667
-  data.tar.gz: e001f6562fa6d9d600c865d6bd3a453578273feb781b0cf352cc15ef4309f9dee5bf41a33c43fd56be8d444d442fddadd1ddafa9a0c903d48b27c6a2799da1b4
+  metadata.gz: 53bb80da8ecd9e1cedea4f489c9e3cd48a8d76ec839655480e7ed7e238a7e5daf1586830e68c3e79c5744d50d3e81a095a9c3296c5105545fd57965cd36e92d9
+  data.tar.gz: ab519af6f7760009617670f236a8983189112931d9ab3eb50b292fe419f52921e6b1009c5f6fecc8610376c28989d2b7c9ff3c457527ca50f99ee5d3447955ea

data/app/mailers/effective/events_mailer.rb

@@ -15,39 +15,6 @@ module Effective
       mail(to: resource.email, **headers_for(resource, opts))
     end
 
-    # Sent on registration purchase
-    # Sent on delayed payment date registration submitted
-    # Sent on delayed payment date registration update 
-    # Sent on update blank registrants
-    def event_registration_confirmation(resource, opts = {})
-      raise('expected an event registration') unless resource.class.try(:effective_events_event_registration?)
-
-      @event_registration = resource
-      @event = resource.event
-
-      @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, cc: mailer_admin, subject: subject, **headers)
-    end
-
-    # Sent manually by an admin to one registrant
-    def event_registrant_confirmation(resource, opts = {})
-      raise('expected an event registrant') unless resource.kind_of?(Effective::EventRegistrant)
-
-      @event_registrant = resource
-      @event = resource.event
-      @event_registration = resource.event_registration # Optional
-
-      subject = subject_for(__method__, "Confirmation - #{@event}", resource, opts)
-      headers = headers_for(resource, opts)
-
-      mail(to: resource.email, cc: mailer_admin, subject: subject, **headers)
-    end
-
     protected
 
     def assigns_for(resource)

data/app/models/concerns/effective_events_event_registration.rb

@@ -246,7 +246,6 @@ module EffectiveEventsEventRegistration
 
     def after_submit_deferred!
       update_deferred_event_registration!
-      send_event_registration_confirmation!
     end
 
     def after_submit_purchased!
@@ -255,8 +254,6 @@ 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? || submit_order&.deferred?
-
       true
     end
   end
@@ -390,17 +387,6 @@ module EffectiveEventsEventRegistration
     save!
   end
 
-  # Not involved in money processing
-  # This will only be called when the order is previously delayed and deferred
-  # And we're going through the registration again with a saved card
-  def checkout!
-    if submit_order.present? && submit_order.delayed? && submit_order.deferred?
-      send_event_registration_confirmation!
-    end
-
-    save!
-  end
-
   def try_completed!
     return false unless submitted?
     return false unless submit_order&.purchased?
@@ -506,20 +492,14 @@ module EffectiveEventsEventRegistration
     update_submit_fees_and_order! if submit_order.present? && !submit_order.purchased?
 
     after_commit do
-      send_event_registration_confirmation!
+      send_order_emails!
     end
 
     true
   end
 
-  # Sent on registration purchase
-  # Sent on delayed payment date registration submitted
-  # 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)
+  def send_order_emails!
+    submit_order.send_order_emails!
   end
 
   def just_let_them_edit_tickets_and_register_anyway?

data/app/models/effective/event.rb

@@ -48,6 +48,8 @@ module Effective
     acts_as_tagged if respond_to?(:acts_as_tagged)
     log_changes if respond_to?(:log_changes)
 
+    attr_accessor :mailer_preview # Set by the mailer preview. Disabled delayed payment validations
+
     effective_resource do
       title                  :string
 
@@ -161,7 +163,7 @@ module Effective
     end
 
     validate(if: -> { delayed_payment? }) do
-      errors.add(:delayed_payment, 'no delayed payment processor available') unless EffectiveOrders.try(:delayed?)
+      errors.add(:delayed_payment, 'no delayed payment processor available') unless EffectiveOrders.try(:delayed?) || mailer_preview
     end
 
     validate(if: -> { file.attached? }) do

data/app/models/effective/event_registrant.rb

@@ -161,6 +161,21 @@ module Effective
       registered! if event_registration.blank? && !registered?
     end
 
+    # Build an event registration for this registrant with a $0 purchased order
+    after_commit(if: -> { event_registration.blank? && created_by_admin? }) do
+      event_registration = EffectiveEvents.EventRegistration.new(event: event, owner: owner)
+      event_registration.event_registrants << self
+      event_registration.build_submit_fees_and_order()
+      event_registration.save!
+
+      order = event_registration.submit_order
+      order.order_items.each { |oi| oi.assign_attributes(price: 0) }
+      order.order_items.each { |oi| oi.purchasable.assign_attributes(price: 0) }
+      order.mark_as_purchased!
+
+      order.update_columns(subtotal: 0, total: 0, tax: 0, amount_owing: 0)
+    end
+
     def to_s
       persisted? ? title : 'registrant'
     end
@@ -343,7 +358,12 @@ module Effective
 
     # Manual admin action only
     def send_confirmation_email!
-      EffectiveEvents.send_email(:event_registrant_confirmation, self)
+      order = event_registration&.submit_order
+      order.send_order_emails!
+    end
+
+    def event_registration_submit_order
+      event_registration&.submit_order
     end
 
     private

data/app/views/admin/event_registrants/_form.html.haml

@@ -25,6 +25,10 @@
           - if f.object.purchased?
             = f.static_field :event_ticket, label: 'Purchased ticket'
 
+          - if (order = f.object.event_registration_submit_order).present?
+            = f.static_field :event_registration_submit_order, label: 'Order' do
+              = link_to(order, effective_orders.admin_order_path(order), target: '_blank')
+
           = f.select :event_ticket_id, effective_events_event_tickets_collection(f.object.event, namespace), required: true
 
           - if f.object.event.allow_blank_registrants? && (f.object.new_record? || f.object.blank_registrant?)
@@ -35,6 +39,10 @@
           = f.show_if(:blank_registrant, false) do
             = render('effective/event_registrants/fields', f: f)
 
+          - if f.object.new_record?
+            %p.text-muted
+              %small A $0 purchased event registration and order will be created. No emails will be sent.
+
   = f.check_box :archived, label: "Archive this registrant. It will be displayed as archived on the owner's event registration"
 
   - if f.object.new_record?

data/config/effective_events.rb

@@ -29,9 +29,6 @@ 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.29.6'.freeze
+  VERSION = '2.30.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, :send_confirmation_email,
+      :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
       :organization_enabled, :create_users, :company_or_organization_required,
       :event_registration_class_name
     ]
@@ -39,8 +39,4 @@ module EffectiveEvents
     !!EffectiveOrders.try(:delayed?) 
   end
 
-  def self.send_confirmation_email?
-    send_confirmation_email == true
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.29.6
+  version: 2.30.0
 platform: ruby
 authors:
 - Code and Effect
@@ -297,9 +297,7 @@ files:
 - app/views/effective/events/_sidebar.html.haml
 - app/views/effective/events/index.html.haml
 - app/views/effective/events/show.html.haml
-- app/views/effective/events_mailer/event_registrant_confirmation.html.haml
 - app/views/effective/events_mailer/event_registrant_purchased.liquid
-- app/views/effective/events_mailer/event_registration_confirmation.html.haml
 - app/views/simple_calendar/_month_calendar.html.haml
 - config/effective_events.rb
 - config/locales/effective_events.en.yml

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

@@ -1,39 +0,0 @@
-%h1{style: "text-align: center"} Your tickets have been confirmed!
-
-%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? && @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 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,101 +0,0 @@
-%h1{style: "text-align: center"} Your tickets have been confirmed!
-
-%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?
-  %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 after the transaction is completed.
-
-%hr
-
-.effective-order
-  %table.table{style: "margin-bottom: 20px;"}
-    %thead
-      %tr
-        %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)
-
-    %tfoot
-      %tr
-        %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))