effective_events 0.7.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15fe8d43e650bb0998d9464cafc91c5232ca05faa2d85f523aa650aac6c6eb5f
-  data.tar.gz: 307ff0337e444a3683fe7703c656f429269abaab6f5ee23367a87a378787a079
+  metadata.gz: f42d98587b765df9670e7d3cd51b5b519145f1bb1e8c9017fc7b13de97502412
+  data.tar.gz: 01da88148ac02c59737016db4bc98267dede20b8f62fa902855ab994db4b7d8e
 SHA512:
-  metadata.gz: 365a0e8f1dcc818e000e75fa20082eb065cf08b71956a983acd87c66f2df77dc39533bab9c6253149d7f790f2634cdc66c27446f68d7072ffa7beedb395e2795
-  data.tar.gz: dd6a7eeebf745211c02263bc9cdaac30e856cfa9b3e1dd94713f3cdb56b6a6586e61681ef56cf38ccc7514cd5942c0416409e21ff9ad6cbd0b1b9505bd8f34e5
+  metadata.gz: 02c857311725f412f2f2c121e79d95b9e9c2e95800f56df93c9ab97705537e02e759b64256a33e352a8040153ca9c622189486b5f805b10e5124450f1ebc7c77
+  data.tar.gz: 27e30468d04ed4939a5480fb54a5a1688247c6be9eca8ef1c2773dcef097103ed3a4a0557a5b778bca4dc71b1bfe88664c89420ca6d28ff9e2e867aad002613d

data/app/datatables/admin/effective_event_notifications_datatable.rb

@@ -12,10 +12,7 @@ class Admin::EffectiveEventNotificationsDatatable < Effective::Datatable
 
     col :event
     col :category
-
-    col :from do |event|
-      simple_format(event.from)
-    end
+    col :from
 
     # col :reminder do |poll_notification|
     #   case poll_notification.category

data/app/mailers/effective/events_mailer.rb

@@ -2,18 +2,13 @@ module Effective
   class EventsMailer < EffectiveEvents.parent_mailer_class
 
     include EffectiveMailer
-    include EffectiveEmailTemplatesMailer if EffectiveEvents.use_effective_email_templates
+    include EffectiveEmailTemplatesMailer
 
     def event_registrant_purchased(resource, opts = {})
       raise('expected an Effective::EventRegistrant') unless resource.kind_of?(Effective::EventRegistrant)
 
       @assigns = assigns_for(resource)
-      @event_registrant = resource
-
-      subject = subject_for(__method__, 'Event Registrant Purchased', resource, opts)
-      headers = headers_for(resource, opts)
-
-      mail(to: resource.email, subject: subject, **headers)
+      mail(to: resource.email, **headers_for(resource, opts))
     end
 
     protected

data/app/models/effective/event_notification.rb

@@ -76,10 +76,8 @@ module Effective
     validates :subject, presence: true
     validates :body, presence: true
 
-    if EffectiveEvents.use_effective_email_templates
-      validates :body, liquid: true
-      validates :subject, liquid: true
-    end
+    validates :body, liquid: true
+    validates :subject, liquid: true
 
     # validates :reminder, if: -> { reminder? || upcoming_reminder? || before_event_ends? },
     #   presence: true, uniqueness: { scope: [:event_id, :category], message: 'already exists' }

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

@@ -15,30 +15,23 @@
       = render "/admin/event_notifications/form_#{template}", f: f
 
       - if f.object.category == category && f.object.persisted?
-        = f.text_field :from
+        = f.select :from, mailer_froms_collection(), label: 'From'
         = f.text_field :subject
         = f.text_area :body, rows: 10
-
-      - elsif EffectiveEvents.use_effective_email_templates == false
-        = f.text_field :from, value: EffectiveResources.mailer_sender
-        = f.text_field :subject, value: ''
-        = f.text_area :body, rows: 10, value: ''
-
       - else
         - email_template = Effective::EmailTemplate.where(template_name: template).first!
+        - from_value = email_template.from || EffectiveResources.mailer_froms.first
 
-        = f.text_field :from, value: email_template.from
+        = f.select :from, mailer_froms_collection(), label: 'From', value: from_value
         = f.text_field :subject, value: email_template.subject
         = f.text_area :body, rows: 10, value: email_template.body
 
-      - if EffectiveEvents.use_effective_email_templates
-
         %p The available variables are:
 
         %ul
           - Effective::EventNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
             %li {{ #{variable} }}
 
-        %small.text-muted Only a developer can add additional variables
+        %small.text-muted Please contact us to add additional variables
 
   = effective_submit(f)

data/config/effective_events.rb

@@ -30,9 +30,9 @@ EffectiveEvents.setup do |config|
   # 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_froms = nil       # Default Froms collection
   # 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
+  # We always use effective email templates for event notifications
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/effective_events.rb

@@ -8,7 +8,7 @@ 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, :event_notifications_table_name,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
       :event_registration_class_name
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: effective_email_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_resources
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: effective_email_templates
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement