effective_events 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8486b09491f278c338284361feb8b520bb9cc0151eca757dd2f6b380905aed8f
-  data.tar.gz: e9f952a31aa370708d9433bd9c7057af7285d7c93b90bed8a7408d6f7be53a98
+  metadata.gz: e5dcd64cdf1ccbe55bc223df3126dd42527a472fbdc7ab2d6b33145d49a66e01
+  data.tar.gz: 037d3a736841f99a94d1824140871a789c8256683a732f37e764512e8cb560d7
 SHA512:
-  metadata.gz: ae1c04a10b33d8a18259204548cb6c92197c6a565390c5fc3e30c679c46d65970fa10fb4cfbc51ef007683db2fe83cf57eb6a556e1fe30518b6db546d5894ddd
-  data.tar.gz: 2abaf99b4f5b183fb6519bd3035b4dc3c208695ad8a2fd7de0e4c78b7ed09e05e0b23e8900748a31e3b62b83cfaa0b2a83a79ece6f6c99e511f76958126448b7
+  metadata.gz: 98e99331f42c62f330dd1a2156dec3cef6ca246b24505629a54fd28f57d7bd7901a6951351fde089c9b171893f7d2dc41b0b9fba8a517b30d7f41075a3dcadea
+  data.tar.gz: 1a880b47a4a92783a933e9268a3e868500cdc4f0b17ba65191301733f2463f5c94193863caf2de8df9efd6a8465494492531a01418da48e45da05c60f88c7ed7

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,21 +15,17 @@
       = render "/admin/event_notifications/form_#{template}", f: f
 
       - if f.object.category == category && f.object.persisted?
-        - # Nothing to do
-      - elsif EffectiveEvents.use_effective_email_templates == false
-        - # Nothing to do
+        = f.select :from, mailer_froms_collection(), label: 'From'
+        = f.text_field :subject
+        = f.text_area :body, rows: 10
       - else
         - email_template = Effective::EmailTemplate.where(template_name: template).first!
+        - from_value = email_template.from || EffectiveResources.mailer_froms.first
 
-        - f.object.from ||= email_template.from
-        - f.object.subject ||= email_template.subject
-        - f.object.body ||= email_template.body
+        = 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
 
-      = f.select :from, EffectiveEvents.mailer_froms
-      = f.text_field :subject
-      = f.text_area :body, rows: 10
-
-      - if EffectiveEvents.use_effective_email_templates
         %p The available variables are:
 
         %ul

data/app/views/effective/events_mailer/event_registrant_purchased.liquid

@@ -1,6 +1,5 @@
 ---
 subject: 'You have been registered for {{ event.title }}'
-from: 'admin@example.com'
 ---
 Hello {{ registrant.name }},
 

data/config/effective_events.rb

@@ -34,6 +34,5 @@ EffectiveEvents.setup do |config|
   # 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.8.0'.freeze
+  VERSION = '0.9.1'.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.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-25 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