effective_events 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5a475a49b8d4131dadec9390bf8916153d9c04a167a46af2fd3703237f789c
-  data.tar.gz: 6c38b298d358a5f736523e99c5f7656f24b8bd92f457a547a343a4a06ccfb6bc
+  metadata.gz: 8486b09491f278c338284361feb8b520bb9cc0151eca757dd2f6b380905aed8f
+  data.tar.gz: e9f952a31aa370708d9433bd9c7057af7285d7c93b90bed8a7408d6f7be53a98
 SHA512:
-  metadata.gz: d2e9775a98175c79f18bcf4cd1879da7970bb84d50032025ff53aa142b4140ee5de2e18bbede03c63ac84ed7faf83b19bf2f58fcdee7194c962088d6c498de98
-  data.tar.gz: 01e15cd687946db9c26fd350530049828b1b5b2095bf9b6554e187bf77c804d220b89cfa45714e060ed57acae08a86f6f7de5dea7e4258d5bfa579a20a1e4b72
+  metadata.gz: ae1c04a10b33d8a18259204548cb6c92197c6a565390c5fc3e30c679c46d65970fa10fb4cfbc51ef007683db2fe83cf57eb6a556e1fe30518b6db546d5894ddd
+  data.tar.gz: 2abaf99b4f5b183fb6519bd3035b4dc3c208695ad8a2fd7de0e4c78b7ed09e05e0b23e8900748a31e3b62b83cfaa0b2a83a79ece6f6c99e511f76958126448b7

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/datatables/admin/effective_event_products_datatable.rb

@@ -27,8 +27,8 @@ module Admin
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :purchased_event_addons, label: 'Purchased by' do |product|
-        product.purchased_event_addons.sort_by(&:to_s).map do |purchase|
+      col :purchased_event_addons, label: 'Name' do |product|
+        product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |purchase|
           content_tag(:div, purchase.owner.to_s, class: 'col-resource_item')
         end.join.html_safe
       end

data/app/models/effective/event_product.rb

@@ -34,9 +34,6 @@ module Effective
     scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(:purchased_event_addons) }
 
-    scope :archived, -> { where(archived: true) }
-    scope :unarchived, -> { where(archived: false) }
-
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_products.map(&:position).compact.max || -1) + 1
     end

data/app/models/effective/event_ticket.rb

@@ -35,9 +35,6 @@ module Effective
     scope :sorted, -> { order(:position) }
     scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
-    scope :archived, -> { where(archived: true) }
-    scope :unarchived, -> { where(archived: false) }
-
     before_validation(if: -> { event.present? }) do
       self.position ||= (event.event_tickets.map(&:position).compact.max || -1) + 1
     end

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

@@ -15,30 +15,27 @@
       = render "/admin/event_notifications/form_#{template}", f: f
 
       - if f.object.category == category && f.object.persisted?
-        = f.text_field :from
-        = f.text_field :subject
-        = f.text_area :body, rows: 10
-
+        - # Nothing to do
       - 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: ''
-
+        - # Nothing to do
       - else
         - email_template = Effective::EmailTemplate.where(template_name: template).first!
 
-        = f.text_field :from, value: email_template.from
-        = f.text_field :subject, value: email_template.subject
-        = f.text_area :body, rows: 10, value: email_template.body
+        - f.object.from ||= email_template.from
+        - f.object.subject ||= email_template.subject
+        - f.object.body ||= email_template.body
 
-      - if EffectiveEvents.use_effective_email_templates
+      = 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
           - 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/app/views/effective/events/index.html.haml

@@ -8,7 +8,7 @@
   - results = @event_search.results(page: params[:page])
 
   - if @event_search.present? && results.length == 0
-    .alert.alert-info There are no results for your search. Please try again.
+    .alert.alert-info.mb-3 There are no results for your search. Please try again.
 
   .row
     .col-md-3

data/config/effective_events.rb

@@ -30,6 +30,7 @@ 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
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails