effective_events 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab282b6e5ef6cd139915119d5bce34cb49192c0f1b4779af718a1ecbc89e79b
-  data.tar.gz: 68a979b44d79a825b38b66ae1ff65d015a0b105d962dcaddf1d16eaca16dea0f
+  metadata.gz: 14b31d4fcbf22eb2a7a235b42b02db1b5940319f76964200e368a5fb0fe6d5d2
+  data.tar.gz: 7f157eaa6726be68a1595c4e887aa535ddda2d81936e35d3783f4d598b128aaf
 SHA512:
-  metadata.gz: 0b94ed2cc8d1fa22fa47797fee3c33871fb5bf5a89896eb9dc686de50563e184bd42feb07888d3f410e29a345cce9b3b5fcd2c79f8191423a81bb1791927faf0
-  data.tar.gz: 3a511dc708dbee72c8803ce7f990d236043c30b2379bc1733c9fc26a888b3e302500712ecd5b3f4c3c0dee14b1555bc18ad8df4ac222c2ac695979ede4c503c1
+  metadata.gz: 5339ff0360365f773d2d86c8040eb1ec56cf114a02714bb8189139befe666baf9289bb2ae8c3c15521db13324ba173c23bc57fc74a6973a2cd54f1f9f31a3cc1
+  data.tar.gz: 69002d95887fc84559d4a5d3de1965c3bb8f9b541ff139c760488d38d4c9c498044dd0b3bd8160cf60bce2567a6fef3bda2e973b8356b37144627c71c7f4c188

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -23,7 +23,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.purchased
+      scope = Effective::EventAddon.deep.purchased.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/mailers/effective/events_mailer.rb

@@ -1,23 +1,23 @@
 module Effective
-  class EventsMailer < EffectiveResources.parent_mailer_class
-    default from: -> { EffectiveResources.mailer_sender }
-    layout -> { EffectiveResources.mailer_layout }
+  class EventsMailer < EffectiveEvents.parent_mailer_class
 
+    include EffectiveMailer
     include EffectiveEmailTemplatesMailer if EffectiveEvents.use_effective_email_templates
 
-    def event_registrant_purchased(event_registrant, opts = {})
-      @assigns = assigns_for(event_registrant)
-      @event_registrant = event_registrant
+    def event_registrant_purchased(resource, opts = {})
+      raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
 
-      mail(to: event_registrant.email, **headers_for(event_registrant, opts))
-    end
+      @assigns = assigns_for(resource)
+      @event_registrant = resource
 
-    protected
+      subject = subject_for(__method__, 'Event Registrant Purchased', resource, opts)
+      headers = headers_for(resource, opts)
 
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      mail(to: resource.email, subject: subject, **headers)
     end
 
+    protected
+
     def assigns_for(resource)
       if resource.kind_of?(EventRegistrant)
         return event_registrant_assigns(resource).merge(event_assigns(resource.event)).merge(event_ticket_assigns(resource.event_ticket))

data/app/models/effective/event_addon.rb

@@ -32,7 +32,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:id) }
-    scope :deep, -> { all }
+    scope :deep, -> { includes(:event, :event_product) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event

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

@@ -6,7 +6,7 @@
   - else
     = f.static_field :owner
 
-  = render 'effective/event_registrants/fields', f: f, event: event_registrant.event
+  = render 'effective/event_registrants/fields', f: f, event: event_registrant.event, namespace: :admin
 
   - if f.object.new_record?
     = f.submit 'Save and Mark Paid'

data/app/views/effective/event_registrants/_fields.html.haml

@@ -5,6 +5,9 @@
     - else
       = f.select :event_ticket_id, effective_events_event_tickets_collection(event), label: 'Ticket'
 
+    - if f.object.purchased? && namespace == :admin
+      = f.select :event_ticket_id, effective_events_event_tickets_collection(event), label: 'Change Ticket', hint: 'Admin only. Change the purchased ticket. This will not create charges, alter the original order, or consider ticket capacity.'
+
     .row
       .col-lg= f.text_field :first_name
       .col-lg= f.text_field :last_name

data/app/views/effective/event_registrations/tickets.html.haml

@@ -7,6 +7,6 @@
         = f.hidden_field :id
 
         = f.has_many :event_registrants, f.object.build_event_registrants do |fr|
-          = render('effective/event_registrants/fields', f: fr, event: f.object.event)
+          = render('effective/event_registrants/fields', f: fr, event: f.object.event, namespace: :events)
 
         = f.save 'Save and Continue'

data/config/effective_events.rb

@@ -19,13 +19,20 @@ EffectiveEvents.setup do |config|
   # Events can be restricted by role
   config.use_effective_roles = true
 
-  # Mailer Configuration
+  # Mailer Settings
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #
-  # Additional mailer settings for parent_mailer, delivery_method, layout, sender and admin
-  # are required fields in config/initializers/effective_resources.rb
-
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Effective::EventsMailer'
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
 
   # Use effective email templates for event notifications
   config.use_effective_email_templates = true

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.8'.freeze
 end

data/lib/effective_events.rb

@@ -8,9 +8,9 @@ module EffectiveEvents
     [
       :events_table_name, :event_registrants_table_name, :event_tickets_table_name,
       :event_registrations_table_name, :event_products_table_name, :event_addons_table_name,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates,
       :layout, :per_page, :use_effective_roles,
       :event_registration_class_name,
-      :mailer, :use_effective_email_templates
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails