effective_events 0.7.3 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4f5a475a49b8d4131dadec9390bf8916153d9c04a167a46af2fd3703237f789c
4
- data.tar.gz: 6c38b298d358a5f736523e99c5f7656f24b8bd92f457a547a343a4a06ccfb6bc
3
+ metadata.gz: 8486b09491f278c338284361feb8b520bb9cc0151eca757dd2f6b380905aed8f
4
+ data.tar.gz: e9f952a31aa370708d9433bd9c7057af7285d7c93b90bed8a7408d6f7be53a98
5
5
  SHA512:
6
- metadata.gz: d2e9775a98175c79f18bcf4cd1879da7970bb84d50032025ff53aa142b4140ee5de2e18bbede03c63ac84ed7faf83b19bf2f58fcdee7194c962088d6c498de98
7
- data.tar.gz: 01e15cd687946db9c26fd350530049828b1b5b2095bf9b6554e187bf77c804d220b89cfa45714e060ed57acae08a86f6f7de5dea7e4258d5bfa579a20a1e4b72
6
+ metadata.gz: ae1c04a10b33d8a18259204548cb6c92197c6a565390c5fc3e30c679c46d65970fa10fb4cfbc51ef007683db2fe83cf57eb6a556e1fe30518b6db546d5894ddd
7
+ data.tar.gz: 2abaf99b4f5b183fb6519bd3035b4dc3c208695ad8a2fd7de0e4c78b7ed09e05e0b23e8900748a31e3b62b83cfaa0b2a83a79ece6f6c99e511f76958126448b7
@@ -12,10 +12,7 @@ class Admin::EffectiveEventNotificationsDatatable < Effective::Datatable
12
12
 
13
13
  col :event
14
14
  col :category
15
-
16
- col :from do |event|
17
- simple_format(event.from)
18
- end
15
+ col :from
19
16
 
20
17
  # col :reminder do |poll_notification|
21
18
  # case poll_notification.category
@@ -27,8 +27,8 @@ module Admin
27
27
  col :capacity, visible: false
28
28
  col :capacity_available, visible: false
29
29
 
30
- col :purchased_event_addons, label: 'Purchased by' do |product|
31
- product.purchased_event_addons.sort_by(&:to_s).map do |purchase|
30
+ col :purchased_event_addons, label: 'Name' do |product|
31
+ product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |purchase|
32
32
  content_tag(:div, purchase.owner.to_s, class: 'col-resource_item')
33
33
  end.join.html_safe
34
34
  end
@@ -34,9 +34,6 @@ module Effective
34
34
  scope :sorted, -> { order(:position) }
35
35
  scope :deep, -> { with_rich_text_body.includes(:purchased_event_addons) }
36
36
 
37
- scope :archived, -> { where(archived: true) }
38
- scope :unarchived, -> { where(archived: false) }
39
-
40
37
  before_validation(if: -> { event.present? }) do
41
38
  self.position ||= (event.event_products.map(&:position).compact.max || -1) + 1
42
39
  end
@@ -35,9 +35,6 @@ module Effective
35
35
  scope :sorted, -> { order(:position) }
36
36
  scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
37
37
 
38
- scope :archived, -> { where(archived: true) }
39
- scope :unarchived, -> { where(archived: false) }
40
-
41
38
  before_validation(if: -> { event.present? }) do
42
39
  self.position ||= (event.event_tickets.map(&:position).compact.max || -1) + 1
43
40
  end
@@ -15,30 +15,27 @@
15
15
  = render "/admin/event_notifications/form_#{template}", f: f
16
16
 
17
17
  - if f.object.category == category && f.object.persisted?
18
- = f.text_field :from
19
- = f.text_field :subject
20
- = f.text_area :body, rows: 10
21
-
18
+ - # Nothing to do
22
19
  - elsif EffectiveEvents.use_effective_email_templates == false
23
- = f.text_field :from, value: EffectiveResources.mailer_sender
24
- = f.text_field :subject, value: ''
25
- = f.text_area :body, rows: 10, value: ''
26
-
20
+ - # Nothing to do
27
21
  - else
28
22
  - email_template = Effective::EmailTemplate.where(template_name: template).first!
29
23
 
30
- = f.text_field :from, value: email_template.from
31
- = f.text_field :subject, value: email_template.subject
32
- = f.text_area :body, rows: 10, value: email_template.body
24
+ - f.object.from ||= email_template.from
25
+ - f.object.subject ||= email_template.subject
26
+ - f.object.body ||= email_template.body
33
27
 
34
- - if EffectiveEvents.use_effective_email_templates
28
+ = f.select :from, EffectiveEvents.mailer_froms
29
+ = f.text_field :subject
30
+ = f.text_area :body, rows: 10
35
31
 
32
+ - if EffectiveEvents.use_effective_email_templates
36
33
  %p The available variables are:
37
34
 
38
35
  %ul
39
36
  - Effective::EventNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
40
37
  %li {{ #{variable} }}
41
38
 
42
- %small.text-muted Only a developer can add additional variables
39
+ %small.text-muted Please contact us to add additional variables
43
40
 
44
41
  = effective_submit(f)
@@ -8,7 +8,7 @@
8
8
  - results = @event_search.results(page: params[:page])
9
9
 
10
10
  - if @event_search.present? && results.length == 0
11
- .alert.alert-info There are no results for your search. Please try again.
11
+ .alert.alert-info.mb-3 There are no results for your search. Please try again.
12
12
 
13
13
  .row
14
14
  .col-md-3
@@ -30,6 +30,7 @@ EffectiveEvents.setup do |config|
30
30
  # config.deliver_method = nil # The deliver method, deliver_later or deliver_now
31
31
  # config.mailer_layout = nil # Default mailer layout
32
32
  # config.mailer_sender = nil # Default From value
33
+ # config.mailer_froms = nil # Default Froms collection
33
34
  # config.mailer_admin = nil # Default To value for Admin correspondence
34
35
  # config.mailer_subject = nil # Proc.new method used to customize Subject
35
36
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '0.7.3'.freeze
2
+ VERSION = '0.8.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_events
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.3
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-08-28 00:00:00.000000000 Z
11
+ date: 2023-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails