effective_events 0.6.8 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 595dd7e4d4e93323e3fcc9bc8c9370bcde42d2797cdb434c9380e7f3e3d06522
-  data.tar.gz: cf5edb8b0863d0d969f2ba28a958465b0b120627aeae3cf26ec9d65d9c699f6d
+  metadata.gz: f0dcb4b39d0bebefd34f769851c967679ec51ac936b5146aa3be13f538aff990
+  data.tar.gz: 1f93e52aa76f683e25b3360a0c3ea09e992ff235d7858ddb6f2f2e36cf7e2d56
 SHA512:
-  metadata.gz: 453d3a180ea4788aed2dc74bac3d40b205be148465d069b80b0d758db6c9c06a8b85bd35fc7cb78e5d18396736ef4fb7acc98fe8720fc3b3e44a109c8f7019c1
-  data.tar.gz: e2b47ac4598f043f99bc98fd183aa60ea8f317be540a6f7d5719b2b6a4bb734025f6a1b1cb4bf564af58ee369bef05b2a97feb8c4390cf2f29396ac89270c44a
+  metadata.gz: a1243af12cbe2c17b0c414f7369d395b8778bd5521c97c891a0817ead4a1fdb81e48ae8a52378ec087f98cb24b19b7d484064db1943cca5258111b7b34c6f760
+  data.tar.gz: adc0557cec7804354ff38991c633d94b64a22693c0126502a851a9c7b5d6cf90ed0b2fdf94eeda6575cf2cfdde02f586ed51403b7898b90669d91a76cc35e302

data/app/assets/stylesheets/effective_events/simple_calendar.scss

@@ -1,3 +1,11 @@
+$font-weight-bold: 600 !default;
+$gray-200: #e9ecef !default;
+
+$blue: #007bff !default;
+$white: #fff !default;
+
+$primary: $blue !default;
+
 .effective__simple-calendar {
   text-align: center;
   max-width: 18rem;
@@ -11,7 +19,6 @@
 
   .calendar-title {
     text-transform: uppercase;
-
   }
 
   .calendar-arrow {

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -2,6 +2,8 @@ module Admin
   class EffectiveEventAddonsDatatable < Effective::Datatable
     filters do
       scope :unarchived, label: "All"
+      scope :purchased
+      scope :deferred
       scope :archived
     end
 
@@ -32,7 +34,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.purchased.includes(:purchased_order, :owner)
+      scope = Effective::EventAddon.deep.purchased_or_deferred.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -2,6 +2,8 @@ module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
     filters do
       scope :unarchived, label: "All"
+      scope :purchased
+      scope :deferred
       scope :archived
     end
 
@@ -34,7 +36,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventRegistrant.deep.purchased
+      scope = Effective::EventRegistrant.deep.purchased_or_deferred.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/models/effective/event_registrant.rb

@@ -38,7 +38,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:last_name) }
-    scope :deep, -> { all }
+    scope :deep, -> { includes(:event, :event_ticket) }
 
     validates :first_name, presence: true
     validates :last_name, presence: true

data/app/models/effective/event_search.rb

@@ -68,11 +68,11 @@ module Effective
       # Apply Sorting
       events = case order.to_s
       when 'Sort by Published Date'
-        events.reorder(published_at: :desc)
+        events.reorder(published_at: :asc)
       when 'Sort by Event Date'
-        events.reorder(start_at: :desc)
+        events.reorder(start_at: :asc)
       else
-        events.reorder(start_at: :desc) # Default Sort by Event Date
+        events.reorder(start_at: :asc) # Default Sort by Event Date
       end
 
       events

data/app/models/effective/event_ticket.rb

@@ -31,7 +31,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:position) }
-    scope :deep, -> { with_rich_text_body.includes(:purchased_event_registrants) }
+    scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
     scope :archived, -> { where(archived: true) }
     scope :unarchived, -> { where(archived: false) }

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

@@ -2,7 +2,12 @@
   = f.hidden_field :event_id
 
   - if f.object.new_record?
-    = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
+    -# User
+    - klass = (f.object.owner || current_user).class
+    - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
+    = f.hidden_field :owner_type, value: klass.name
+    = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
   - else
     = f.static_field :owner
 

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

@@ -2,7 +2,12 @@
   = f.hidden_field :event_id
 
   - if f.object.new_record?
-    = f.select :owner, { 'Users' => current_user.class.all }, polymorphic: true
+    -# User
+    - klass = (f.object.owner || current_user).class
+    - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
+    = f.hidden_field :owner_type, value: klass.name
+    = f.select :owner_id, klass.all, ajax_url: ajax_url, label: 'User'
   - else
     = f.static_field :owner
 

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

@@ -7,33 +7,25 @@
       = render '/admin/events/form_content', event: event
 
   - if event.persisted? && !event.external_registration?
-    = tab 'Tickets' do
+    = tab 'Tickets & Products' do
       %h2 Tickets
       - datatable = Admin::EffectiveEventTicketsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
-    = tab 'Products' do
       %h2 Products
       - datatable = Admin::EffectiveEventProductsDatatable.new(event_id: event.id)
       = render_inline_datatable(datatable)
 
-    = tab 'Email' do
-      %p Click New to add one or more emails.
-
-      - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
-      = render_datatable(datatable, inline: true, simple: true)
-
-    = tab 'Registrations' do
-      %h2 Registrations
-      - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
-      .mb-4= render_inline_datatable(datatable)
+    -# = tab 'Registrations' do
+    -#   %h2 Registrations
+    -#   - datatable = Admin::EffectiveEventRegistrationsDatatable.new(event_id: event.id)
+    -#   .mb-4= render_inline_datatable(datatable)
 
-    = tab 'Registrants' do
+    = tab 'Registrants & Addons' do
       %h2 Registrants
       - datatable = Admin::EffectiveEventRegistrantsDatatable.new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
 
-    = tab 'Add-ons' do
       %h2 Add-ons
       - datatable = Admin::EffectiveEventAddonsDatatable.new(event_id: event.id)
       .mb-4= render_inline_datatable(datatable)
@@ -41,7 +33,12 @@
     = tab 'Wizard' do
       = render '/admin/events/form_event_registration_content', event: event
 
-  - if event.persisted?
+    = tab 'Email' do
+      %p Click New to add one or more emails.
+
+      - datatable = Admin::EffectiveEventNotificationsDatatable.new(event_id: event.id)
+      = render_datatable(datatable, inline: true, simple: true)
+
     = tab 'Access' do
       = render '/admin/events/form_access', event: event
 

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.6.8'.freeze
+  VERSION = '0.6.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_test_bot
+  name: effective_developer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_developer
+  name: effective_email_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,19 +165,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_email_templates
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 description: Event registrations, tickets and products
 email:
 - info@codeandeffect.com
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Event registrations, tickets and products