effective_events 2.26.0 → 2.27.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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/concerns/effective_events_event_registration.rb +2 -0
  3. data/app/views/effective/events_mailer/event_registrant_confirmation.html.haml +32 -15
  4. data/app/views/effective/events_mailer/event_registration_confirmation.html.haml +31 -23
  5. data/config/effective_events.rb +3 -0
  6. data/lib/effective_events/version.rb +1 -1
  7. data/lib/effective_events.rb +5 -1
  8. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 93702d0f34b53536a8534ad5d983be17e75f66bf133e8cd67c46e3d38f6ec5dc
4
- data.tar.gz: 243eb4b9796e5b0752ec0bfa4d121508253550e5765a62be4252e2835a6391d8
3
+ metadata.gz: 8ca685f788c0c911540a269b943046c6182232e524f377fedc73d4df69040f32
4
+ data.tar.gz: d959c84ffa9a9a5f6c99107ba30f000795c4aaae1e5fbbe50c80a03642146dd9
5
5
  SHA512:
6
- metadata.gz: 408c0a3b0d923e692e1c853945e0b2899e83d02743049cc7d834ccb1163f00ca6e941b5291e9ece8abe98177f4d475b99eeaa15c9d3f047aa153f0e0f94cfc15
7
- data.tar.gz: d1d0ddeb5f16cfd4d803e76222b27c5450f584f45adc9f63961fe7f0c033490554f1ab2780d964fcea91113d8553ce1e53d55c4de5afc744e0dddd5075b5f178
6
+ metadata.gz: '08cff54abfee17f8058f581832a3bb313011cb6297259dbc856e550c27e6bca2dfd62dea52eaf680e9f80be6fa95f4f236d632793bc465ffd29585dedc597eb8'
7
+ data.tar.gz: 92d401b99b9bc124fe35754837a3c561f9000018f3081501b18ec6b1e81a234c8d9be0d7a1e077b937d9ffc89bbd96d54e9ffd72f9d43ad0f06b669786368a87
data/app/models/concerns/effective_events_event_registration.rb CHANGED
@@ -488,6 +488,8 @@ module EffectiveEventsEventRegistration
488
488
  # Sent on delayed payment date registration update
489
489
  # Sent on update blank registrants
490
490
  def send_event_registration_confirmation!
491
+ return false unless EffectiveEvents.send_confirmation_email?
492
+
491
493
  EffectiveEvents.send_email(:event_registration_confirmation, self)
492
494
  end
493
495
 
data/app/views/effective/events_mailer/event_registrant_confirmation.html.haml CHANGED
@@ -1,22 +1,39 @@
1
- %h2 Event Registrant Confirmation
1
+ %h1{style: "text-align: center"} Your tickets have been confirmed!
2
2
 
3
- %p Event: #{@event.title}
4
- %p Date: #{effective_events_event_schedule(@event)}
5
- %p Ticket: #{@event_registrant.purchasable_name.gsub('<br>', ' - ').html_safe} - #{price_to_currency(@event_registrant.price)}
6
-
7
- - if @event_registrant.responses.present?
8
- %p= @event_registrant.responses
9
-
10
- - if @event_registration.present? && @event_registrant.user == @event_registration.owner
11
- %p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
3
+ %p{style: "text-align: center"}
4
+ %strong{style: "font-size: 18px"}= @event.title
5
+ %br
6
+ #{effective_events_event_schedule(@event)}
12
7
 
13
8
  - if @event.rich_text_confirmation_email.present?
14
9
  %hr
15
10
  = @event.rich_text_confirmation_email.to_s.html_safe
16
11
 
17
- - if @event.delayed_payment?
18
- %strong Please note:
19
- %ul
20
- %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}
12
+ - if @event.delayed_payment? && @event_registration.present? && @event_registrant.user == @event_registration.owner && @event_registration.submit_order.delayed? && @event_registration.submit_order.deferred?
13
+ %hr
14
+ %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
15
+ %ul{style: "margin-top: 0;"}
16
+ %li Your credit card will be charged on <strong>#{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
21
17
  %li Changes and cancellations must be made before this date.
22
- %li A receipt will be sent to you after the transaction is completed.
18
+ %li A receipt will be sent after the transaction is completed.
19
+
20
+ %hr
21
+
22
+ %table.table
23
+ %thead
24
+ %tr
25
+ %th{style: "text-align: left;"} Qty
26
+ %th{style: "text-align: left;"} Ticket
27
+ %th{style: "text-align: right;"} Price
28
+ %tbody
29
+ %tr
30
+ %td{style: "text-align: left;"} 1
31
+ %td{style: "text-align: left;"}
32
+ = @event_registrant.purchasable_name
33
+ = @event_registrant.responses if @event_registrant.responses.present?
34
+ %td{style: "text-align: right;"}= price_to_currency(@event_registrant.price)
35
+
36
+ - if @event_registration.present? && @event_registrant.user == @event_registration.owner
37
+ %hr
38
+ %p{style: "text-align: center;"}
39
+ = link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
data/app/views/effective/events_mailer/event_registration_confirmation.html.haml CHANGED
@@ -1,19 +1,21 @@
1
- %h2 Event Registration Confirmation
1
+ %h1{style: "text-align: center"} Your tickets have been confirmed!
2
2
 
3
- %p Event: #{@event.title}
4
- %p Date: #{effective_events_event_schedule(@event)}
5
- %p= link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
3
+ %p{style: "text-align: center"}
4
+ %strong{style: "font-size: 18px"}= @event.title
5
+ %br
6
+ #{effective_events_event_schedule(@event)}
6
7
 
7
8
  - if @event.rich_text_confirmation_email.present?
8
9
  %hr
9
10
  = @event.rich_text_confirmation_email.to_s.html_safe
10
11
 
11
12
  - if @event.delayed_payment?
12
- %strong Please note:
13
- %ul
14
- %li Credit card payment will be processed on #{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}
13
+ %hr
14
+ %p{style: "margin-bottom: 4px; font-weight: bold;"} Please note:
15
+ %ul{style: "margin-top: 0;"}
16
+ %li Your credit card will be charged on <strong>#{@event.delayed_payment_date.strftime("%A, %B %d, %Y")}</strong>.
15
17
  %li Changes and cancellations must be made before this date.
16
- %li A receipt will be sent to you after the transaction is completed.
18
+ %li A receipt will be sent after the transaction is completed.
17
19
 
18
20
  %hr
19
21
 
@@ -22,24 +24,30 @@
22
24
  %table.table
23
25
  %thead
24
26
  %tr
25
- %th Qty
26
- %th Ticket
27
- - if responses
28
- %th Details
29
- %th Price
27
+ %th{style: "text-align: left;"} Qty
28
+ %th{style: "text-align: left;"} Ticket
29
+ %th{style: "text-align: right;"} Price
30
30
  %tbody
31
31
  - Array(@event_registrants).each do |er|
32
32
  %tr
33
- %td 1
34
- %td= er.purchasable_name
35
- - if responses
36
- %td= er.responses
37
- %td= price_to_currency(er.price)
33
+ %td{style: "text-align: left;"} 1
34
+ %td{style: "text-align: left;"}
35
+ = er.purchasable_name
36
+ = er.responses if responses
37
+ %td{style: "text-align: right;"}= price_to_currency(er.price)
38
38
 
39
39
  - Array(@event_addons).each do |ea|
40
40
  %tr
41
- %td 1
42
- %td= ea.purchasable_name
43
- - if responses
44
- %td= ea.notes
45
- %td= price_to_currency(ea.price)
41
+ %td{style: "text-align: left;"} 1
42
+ %td{style: "text-align: left;"}
43
+ = ea.purchasable_name
44
+ = ea.notes if responses
45
+ %td{style: "text-align: right;"}= price_to_currency(ea.price)
46
+
47
+ %hr
48
+
49
+ %p{style: "text-align: center;"}
50
+ - if @event.delayed_payment?
51
+ = link_to('View or modify your registration', effective_events.event_event_registration_url(@event, @event_registration))
52
+ - else
53
+ = link_to('View your registration', effective_events.event_event_registration_url(@event, @event_registration))
data/config/effective_events.rb CHANGED
@@ -29,6 +29,9 @@ EffectiveEvents.setup do |config|
29
29
  # Hint text for event images attachments
30
30
  config.events_hint_text = 'Optional. Shown on the events index and event pages. Dimensions are 220px tall and 350px wide.'
31
31
 
32
+ # Send confirmation emails
33
+ config.send_confirmation_email = false
34
+
32
35
  # Mailer Settings
33
36
  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
34
37
  #
data/lib/effective_events/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '2.26.0'.freeze
2
+ VERSION = '2.27.0'.freeze
3
3
  end
data/lib/effective_events.rb CHANGED
@@ -9,7 +9,7 @@ module EffectiveEvents
9
9
  :events_table_name, :event_registrants_table_name, :event_tickets_table_name, :event_ticket_selections_table_name,
10
10
  :event_registrations_table_name, :event_products_table_name, :event_addons_table_name, :event_notifications_table_name,
11
11
  :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
12
- :layout, :per_page, :use_effective_roles, :categories, :events_hint_text,
12
+ :layout, :per_page, :use_effective_roles, :categories, :events_hint_text, :send_confirmation_email,
13
13
  :organization_enabled, :create_users, :company_or_organization_required,
14
14
  :event_registration_class_name
15
15
  ]
@@ -39,4 +39,8 @@ module EffectiveEvents
39
39
  !!EffectiveOrders.try(:delayed?)
40
40
  end
41
41
 
42
+ def self.send_confirmation_email?
43
+ send_confirmation_email == true
44
+ end
45
+
42
46
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_events
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.26.0
4
+ version: 2.27.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect