effective_events 0.6.8 → 0.6.10

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: 595dd7e4d4e93323e3fcc9bc8c9370bcde42d2797cdb434c9380e7f3e3d06522
4
- data.tar.gz: cf5edb8b0863d0d969f2ba28a958465b0b120627aeae3cf26ec9d65d9c699f6d
3
+ metadata.gz: f0dcb4b39d0bebefd34f769851c967679ec51ac936b5146aa3be13f538aff990
4
+ data.tar.gz: 1f93e52aa76f683e25b3360a0c3ea09e992ff235d7858ddb6f2f2e36cf7e2d56
5
5
  SHA512:
6
- metadata.gz: 453d3a180ea4788aed2dc74bac3d40b205be148465d069b80b0d758db6c9c06a8b85bd35fc7cb78e5d18396736ef4fb7acc98fe8720fc3b3e44a109c8f7019c1
7
- data.tar.gz: e2b47ac4598f043f99bc98fd183aa60ea8f317be540a6f7d5719b2b6a4bb734025f6a1b1cb4bf564af58ee369bef05b2a97feb8c4390cf2f29396ac89270c44a
6
+ metadata.gz: a1243af12cbe2c17b0c414f7369d395b8778bd5521c97c891a0817ead4a1fdb81e48ae8a52378ec087f98cb24b19b7d484064db1943cca5258111b7b34c6f760
7
+ data.tar.gz: adc0557cec7804354ff38991c633d94b64a22693c0126502a851a9c7b5d6cf90ed0b2fdf94eeda6575cf2cfdde02f586ed51403b7898b90669d91a76cc35e302
@@ -1,3 +1,11 @@
1
+ $font-weight-bold: 600 !default;
2
+ $gray-200: #e9ecef !default;
3
+
4
+ $blue: #007bff !default;
5
+ $white: #fff !default;
6
+
7
+ $primary: $blue !default;
8
+
1
9
  .effective__simple-calendar {
2
10
  text-align: center;
3
11
  max-width: 18rem;
@@ -11,7 +19,6 @@
11
19
 
12
20
  .calendar-title {
13
21
  text-transform: uppercase;
14
-
15
22
  }
16
23
 
17
24
  .calendar-arrow {
@@ -2,6 +2,8 @@ module Admin
2
2
  class EffectiveEventAddonsDatatable < Effective::Datatable
3
3
  filters do
4
4
  scope :unarchived, label: "All"
5
+ scope :purchased
6
+ scope :deferred
5
7
  scope :archived
6
8
  end
7
9
 
@@ -32,7 +34,7 @@ module Admin
32
34
  end
33
35
 
34
36
  collection do
35
- scope = Effective::EventAddon.deep.purchased.includes(:purchased_order, :owner)
37
+ scope = Effective::EventAddon.deep.purchased_or_deferred.includes(:purchased_order, :owner)
36
38
 
37
39
  if attributes[:event_id].present?
38
40
  scope = scope.where(event: event)
@@ -2,6 +2,8 @@ module Admin
2
2
  class EffectiveEventRegistrantsDatatable < Effective::Datatable
3
3
  filters do
4
4
  scope :unarchived, label: "All"
5
+ scope :purchased
6
+ scope :deferred
5
7
  scope :archived
6
8
  end
7
9
 
@@ -34,7 +36,7 @@ module Admin
34
36
  end
35
37
 
36
38
  collection do
37
- scope = Effective::EventRegistrant.deep.purchased
39
+ scope = Effective::EventRegistrant.deep.purchased_or_deferred.includes(:purchased_order, :owner)
38
40
 
39
41
  if attributes[:event_id].present?
40
42
  scope = scope.where(event: event)
@@ -38,7 +38,7 @@ module Effective
38
38
  end
39
39
 
40
40
  scope :sorted, -> { order(:last_name) }
41
- scope :deep, -> { all }
41
+ scope :deep, -> { includes(:event, :event_ticket) }
42
42
 
43
43
  validates :first_name, presence: true
44
44
  validates :last_name, presence: true
@@ -68,11 +68,11 @@ module Effective
68
68
  # Apply Sorting
69
69
  events = case order.to_s
70
70
  when 'Sort by Published Date'
71
- events.reorder(published_at: :desc)
71
+ events.reorder(published_at: :asc)
72
72
  when 'Sort by Event Date'
73
- events.reorder(start_at: :desc)
73
+ events.reorder(start_at: :asc)
74
74
  else
75
- events.reorder(start_at: :desc) # Default Sort by Event Date
75
+ events.reorder(start_at: :asc) # Default Sort by Event Date
76
76
  end
77
77
 
78
78
  events
@@ -31,7 +31,7 @@ module Effective
31
31
  end
32
32
 
33
33
  scope :sorted, -> { order(:position) }
34
- scope :deep, -> { with_rich_text_body.includes(:purchased_event_registrants) }
34
+ scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
35
35
 
36
36
  scope :archived, -> { where(archived: true) }
37
37
  scope :unarchived, -> { where(archived: false) }
@@ -2,7 +2,12 @@
2
2
  = f.hidden_field :event_id
3
3
 
4
4
  - if f.object.new_record?
5
- = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
5
+ -# User
6
+ - klass = (f.object.owner || current_user).class
7
+ - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
8
+
9
+ = f.hidden_field :owner_type, value: klass.name
10
+ = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
6
11
  - else
7
12
  = f.static_field :owner
8
13
 
@@ -2,7 +2,12 @@
2
2
  = f.hidden_field :event_id
3
3
 
4
4
  - if f.object.new_record?
5
- = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
5
+ -# User
6
+ - klass = (f.object.owner || current_user).class
7
+ - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
8
+
9
+ = f.hidden_field :owner_type, value: klass.name
10
+ = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
6
11
  - else
7
12
  = f.static_field :owner
8
13
 
@@ -7,33 +7,25 @@
7
7
  = render '/admin/events/form_content', event: event
8
8
 
9
9
  - if event.persisted? && !event.external_registration?
10
- = tab 'Tickets' do
10
+ = tab 'Tickets & Products' do
11
11
  %h2 Tickets
12
12
  - datatable = Admin::EffectiveEventTicketsDatatable.new(event_id: event.id)
13
13
  = render_inline_datatable(datatable)
14
14
 
15
- = tab 'Products' do
16
15
  %h2 Products
17
16
  - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
18
17
  = render_inline_datatable(datatable)
19
18
 
20
- = tab 'Email' do
21
- %p Click New to add one or more emails.
22
-
23
- - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
24
- = render_datatable(datatable, inline: true, simple: true)
25
-
26
- = tab 'Registrations' do
27
- %h2 Registrations
28
- - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
29
- .mb-4= render_inline_datatable(datatable)
19
+ -# = tab 'Registrations' do
20
+ -# %h2 Registrations
21
+ -# - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
22
+ -# .mb-4= render_inline_datatable(datatable)
30
23
 
31
- = tab 'Registrants' do
24
+ = tab 'Registrants & Addons' do
32
25
  %h2 Registrants
33
26
  - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
34
27
  .mb-4= render_inline_datatable(datatable)
35
28
 
36
- = tab 'Add-ons' do
37
29
  %h2 Add-ons
38
30
  - datatable = Admin::EffectiveEventAddonsDatatable.new(event_id: event.id)
39
31
  .mb-4= render_inline_datatable(datatable)
@@ -41,7 +33,12 @@
41
33
  = tab 'Wizard' do
42
34
  = render '/admin/events/form_event_registration_content', event: event
43
35
 
44
- - if event.persisted?
36
+ = tab 'Email' do
37
+ %p Click New to add one or more emails.
38
+
39
+ - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
40
+ = render_datatable(datatable, inline: true, simple: true)
41
+
45
42
  = tab 'Access' do
46
43
  = render '/admin/events/form_access', event: event
47
44
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '0.6.8'.freeze
2
+ VERSION = '0.6.10'.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.6.8
4
+ version: 0.6.10
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-07-04 00:00:00.000000000 Z
11
+ date: 2023-08-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -109,7 +109,7 @@ dependencies:
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
- name: haml-rails
112
+ name: pry-byebug
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - ">="
@@ -123,7 +123,7 @@ dependencies:
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
- name: pry-byebug
126
+ name: effective_test_bot
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - ">="
@@ -137,7 +137,7 @@ dependencies:
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
- name: effective_test_bot
140
+ name: effective_developer
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - ">="
@@ -151,7 +151,7 @@ dependencies:
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
- name: effective_developer
154
+ name: effective_email_templates
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - ">="
@@ -165,19 +165,19 @@ dependencies:
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
- name: effective_email_templates
168
+ name: psych
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - "<"
172
172
  - !ruby/object:Gem::Version
173
- version: '0'
173
+ version: '4'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - "<"
179
179
  - !ruby/object:Gem::Version
180
- version: '0'
180
+ version: '4'
181
181
  description: Event registrations, tickets and products
182
182
  email:
183
183
  - info@codeandeffect.com
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
292
292
  - !ruby/object:Gem::Version
293
293
  version: '0'
294
294
  requirements: []
295
- rubygems_version: 3.4.10
295
+ rubygems_version: 3.3.7
296
296
  signing_key:
297
297
  specification_version: 4
298
298
  summary: Event registrations, tickets and products