effective_events 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 418833792fdacf3ee145ead72e1bac6aee5933e9ca8eaad3cf26afc589ec8e3b
-  data.tar.gz: 1a105035e07a3ff8dde869ff9ed9b28830ff9739fde2bae7d6d7a59be2ba0437
+  metadata.gz: aeed000b9c4ccbe02f6fcc29eb381caf0612cb8c7caa35155e3b122299dcddd9
+  data.tar.gz: d4556b21e76cdb1484a315d4f9b74cdaea405f9fc569c0794b1f0946d8c6a54f
 SHA512:
-  metadata.gz: 36464803efef6e30bcac251faa6251080e1fdf8cf1f1504695e102ee82f0b65320102c13ccfe61410d0d7a29c22734e5cf27d535b854ec6f00652e0a05f5b1dc
-  data.tar.gz: d135b844f28edde57fa67bcda5a2bf03935db3a3d33b49db09d32be8381cf6e7e478c67e4ac7195f450a1ab74718f980c8a7de6c8aeb52ce7347e974dad5f0db
+  metadata.gz: a744ca3b393c87820ed2aa100bf9ea01e92d41688cbbd6c84412d5eafae3f74d8e3ea7af7900f45e7e6f810f47b51f34e6335a89983a39100948fdba21a2db32
+  data.tar.gz: e9f1bbe0bc3931f7f41c761eb502f50913259bb2f7dd22b315573d7c7c5e92fcf8b6260de7e631f36e9ab0f9ea6797a1687ae8c96fed065b6076bce7a0ef0337

data/app/datatables/admin/effective_event_notifications_datatable.rb

@@ -12,7 +12,10 @@ class Admin::EffectiveEventNotificationsDatatable < Effective::Datatable
 
     col :event
     col :category
-    col :from
+
+    col :from, visible: false do |notification|
+      ERB::Util.html_escape_once(notification.from)
+    end
 
     # col :reminder do |poll_notification|
     #   case poll_notification.category
@@ -37,8 +40,12 @@ class Admin::EffectiveEventNotificationsDatatable < Effective::Datatable
       simple_format(notification.body)
     end
 
-    # col :started_at, visible: false
-    # col :completed_at
+    col :cc, visible: false
+    col :bcc, visible: false
+    col :content_type, visible: false
+
+    col :started_at, visible: false
+    col :completed_at
 
     actions_col
   end

data/app/models/effective/event_notification.rb

@@ -2,6 +2,7 @@ module Effective
   class EventNotification < ActiveRecord::Base
     self.table_name = (EffectiveEvents.event_notifications_table_name || :event_notifications).to_s
 
+    acts_as_email_notification # effective_resources
     log_changes(to: :event) if respond_to?(:log_changes)
 
     belongs_to :event
@@ -54,6 +55,10 @@ module Effective
       subject           :string
       body              :text
 
+      cc                :string
+      bcc               :string
+      content_type      :string
+
       # Tracking background jobs email send out
       started_at        :datetime
       completed_at      :datetime
@@ -72,13 +77,6 @@ module Effective
 
     validates :category, presence: true, inclusion: { in: CATEGORIES }
 
-    validates :from, presence: true, email: true
-    validates :subject, presence: true
-    validates :body, presence: true
-
-    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' }
 
@@ -147,10 +145,14 @@ module Effective
 
       update_column(:started_at, Time.zone.now)
 
-      opts = { from: from, subject: subject, body: body }
-
       event_registrants.each do |event_registrant|
-        EffectiveEvents.send_email(email_template, event_registrant, opts)
+        begin
+          EffectiveEvents.send_email(email_template, event_registrant, email_notification_params)
+        rescue => e
+          EffectiveLogger.error(e.message, associated: event_registrant) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { event_registrant_id: event_registrant.id, event_notification_id: id }) if defined?(ExceptionNotifier)
+          raise(e) if Rails.env.test? || Rails.env.development?
+        end
       end
 
       update_column(:completed_at, Time.zone.now)

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

@@ -12,26 +12,7 @@
     - template = 'event_' + category.parameterize.underscore
 
     = f.show_if :category, category do
-      = render "/admin/event_notifications/form_#{template}", f: f
-
-      - if f.object.category == category && f.object.persisted?
-        = 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.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
-
-        %p The available variables are:
-
-        %ul
-          - Effective::EventNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
-            %li {{ #{variable} }}
-
-        %small.text-muted Please contact us to add additional variables
+      .my-3= render "/admin/event_notifications/form_#{template}", f: f
+      = email_notification_fields(f, template, variables: Effective::EventNotification::EMAIL_TEMPLATE_VARIABLES)
 
   = effective_submit(f)

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

@@ -21,11 +21,11 @@
       .mb-4
         %small.text-muted Please refresh the page after archiving/unarchiving here to display an accurate Registered count on the Tickets & Products tab
 
-      - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
+      - datatable = EffectiveResources.best('Admin::EffectiveEventRegistrantsDatatable').new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
 
       %h2 Add-ons
-      - datatable = Admin::EffectiveEventAddonsDatatable.new(event_id: event.id)
+      - datatable = EffectiveResources.best('Admin::EffectiveEventAddonsDatatable').new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
 
     = tab 'Wizard' do

data/db/migrate/101_create_effective_events.rb

@@ -183,6 +183,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.string :subject
       t.text :body
 
+      t.string :cc
+      t.string :bcc
+      t.string :content_type
+
       t.datetime :started_at
       t.datetime :completed_at
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails