effective_events 0.22.2 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b9faa624904b433109451d6e7a064141af823256bc6482091e3edfe5cfe877
-  data.tar.gz: a55f320e5007311f0c53ab662642b5192b6f9310fdb40e8171f6f6119d0546e7
+  metadata.gz: ac58bdfbd54d957533cc8ccc62152fd17b4d123133d55e7599159d4c495c690f
+  data.tar.gz: 3fe705a1de037e35954d50bd0e5ad1092968f373cdc098bbe6ea69a1d5b742e5
 SHA512:
-  metadata.gz: e26a9f437b4f21a3a74f6fa666cb602927ecdd22334ea1151761cbc750b6fafa0aefc6f6fc4b616b8b84742aa62359eeb351d79b74656c5bdaea9db4bf423608
-  data.tar.gz: c7e80b197ccb38b79f9f5f21c5c63247b259a0e728aea20dd148d6b78cee077983f764f9740d8aaf7fa04a4363836009ded9f764a970f64ec53c615640d2f0c2
+  metadata.gz: 6eb6bc3ac0e9c42265e2b3c7493ec91029eda738f3608ccf1c0d1cf2255fc20d42b8bfb2ab8a55695692fafd795a34977bcf7aa011ec914369e217ccf9657a10
+  data.tar.gz: 60da0662095d319488c227d631d2b80bd4404dacfdde8418508568da51cfb310254d3e3683abcfb933112fcdc0d89f3cab2d1d8795166e53383546d2f41e4f07

data/app/datatables/admin/effective_event_addons_datatable.rb

@@ -1,11 +1,12 @@
 module Admin
   class EffectiveEventAddonsDatatable < Effective::Datatable
     filters do
-      scope :unarchived, label: "All"
-      scope :purchased
+      scope :registered
+      scope :purchased_or_created_by_admin, label: 'Purchased'
       scope :deferred
-      scope :not_purchased
+      scope :not_purchased_not_created_by_admin, label: 'Not Purchased'
       scope :archived
+      scope :all
     end
 
     datatable do
@@ -36,7 +37,7 @@ module Admin
     end
 
     collection do
-      scope = Effective::EventAddon.deep.registered.includes(:purchased_order, :owner)
+      scope = Effective::EventAddon.deep.includes(:purchased_order, :owner)
 
       if attributes[:event_id].present?
         scope = scope.where(event: event)

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -30,17 +30,17 @@ module Admin
       col :capacity, visible: false
       col :capacity_available, visible: false
 
-      col :registered_event_addons, label: 'Registered Names' do |product|
-        product.registered_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
-          content_tag(:div, addon.name.to_s, class: 'col-resource_item')
-        end.join.html_safe
-      end
-
-      col :purchased_event_addons, label: 'Purchased Names', visible: false do |product|
-        product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
-          content_tag(:div, addon.name.to_s, class: 'col-resource_item')
-        end.join.html_safe
-      end
+      # col :registered_event_addons, label: 'Registered Names' do |product|
+      #   product.registered_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
+      #     content_tag(:div, addon.name.to_s, class: 'col-resource_item')
+      #   end.join.html_safe
+      # end
+
+      # col :purchased_event_addons, label: 'Purchased Names', visible: false do |product|
+      #   product.purchased_event_addons.reject(&:archived?).sort_by(&:to_s).map do |addon|
+      #     content_tag(:div, addon.name.to_s, class: 'col-resource_item')
+      #   end.join.html_safe
+      # end
 
       actions_col
     end

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -1,12 +1,12 @@
 module Admin
   class EffectiveEventRegistrantsDatatable < Effective::Datatable
     filters do
-      scope :unarchived, label: "All"
       scope :registered
-      scope :purchased
+      scope :purchased_or_created_by_admin, label: 'Purchased'
       scope :deferred
-      scope :not_purchased
+      scope :not_purchased_not_created_by_admin, label: 'Not Purchased'
       scope :archived
+      scope :all
     end
 
     datatable do
@@ -60,7 +60,15 @@ module Admin
       col :organization, visible: false
 
       col :orders, visible: false
-      col :price, as: :price
+
+      col(:price, as: :price) do |registrant|
+        [
+          (badge('ADMIN') if registrant.created_by_admin?),
+          price_to_currency(registrant.price)
+        ].compact.join(' ').html_safe
+      end
+
+      col :created_by_admin, visible: false
 
       col :first_name, visible: false
       col :last_name, visible: false

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -37,15 +37,15 @@ module Admin
       col :category, visible: false
 
       col :registered_event_registrants_count, label: 'Registered' do |event|
-        event.event_registrants.registered.unarchived.count
+        event.event_registrants.registered.count
       end
 
       col :purchased_event_registrants_count, label: 'Deferred', visible: false do |event|
-        event.event_registrants.deferred.unarchived.count
+        event.event_registrants.deferred.count
       end
 
       col :purchased_event_registrants_count, label: 'Purchased', visible: false do |event|
-        event.event_registrants.purchased.unarchived.count
+        event.event_registrants.purchased.count
       end
 
 

data/app/models/effective/event.rb

@@ -214,6 +214,14 @@ module Effective
       event_tickets.none? { |event_ticket| event_ticket_available?(event_ticket, except: except, quantity: 1) }
     end
 
+    def upcoming?
+      end_at > Time.zone.now
+    end
+
+    def past?
+      end_at < Time.zone.now
+    end
+
     def early_bird?
       return false if early_bird_end_at.blank?
       early_bird_end_at > Time.zone.now

data/app/models/effective/event_addon.rb

@@ -32,6 +32,8 @@ module Effective
 
       archived          :boolean
 
+      created_by_admin  :boolean
+
       # Acts as Purchasable
       price             :integer
       qb_item_name      :string
@@ -42,7 +44,9 @@ module Effective
 
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:event, :event_product) }
-    scope :registered, -> { purchased_or_deferred }
+    scope :registered, -> { purchased_or_deferred.or(where(created_by_admin: true)) }
+    scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
+    scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event

data/app/models/effective/event_registrant.rb

@@ -55,6 +55,8 @@ module Effective
 
       archived              :boolean
 
+      created_by_admin      :boolean
+
       # Acts as Purchasable
       price                 :integer
       qb_item_name          :string
@@ -69,7 +71,9 @@ module Effective
 
     scope :sorted, -> { order(:event_ticket_id, :id) }
     scope :deep, -> { includes(:event, :event_ticket, :owner) }
-    scope :registered, -> { where.not(registered_at: nil) }
+    scope :registered, -> { unarchived.where.not(registered_at: nil) }
+    scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }
+    scope :not_purchased_not_created_by_admin, -> { not_purchased.where(created_by_admin: false) }
 
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event

data/app/models/effective/event_search.rb

@@ -55,27 +55,30 @@ module Effective
       events = collection()
       raise('expected an ActiveRecord collection') unless events.kind_of?(ActiveRecord::Relation)
 
-      # Filter by upcoming or past
-      events = (category == 'past') ? events.past : events.upcoming
-
       # Filter by term
       if term.present?
         events = Effective::Resource.new(events).search_any(term)
       end
 
-      # Filter by category
-      if category.present? && category != 'past'
-        events = events.where(category: category)
+      # Filter by upcoming or past and then apply default sorting
+      if category.present?
+        if category == 'past'
+          events = events.past.sorted
+        else
+          events = events.where(category: category).sorted
+        end
+      else
+        events = events.upcoming.reorder(start_at: :asc)
       end
 
-      # Apply Sorting
+      # Apply sorting from the search form
       events = case order.to_s
       when 'Sort by Published Date'
         events.reorder(published_start_at: :asc)
       when 'Sort by Event Date'
         events.reorder(start_at: :asc)
       else
-        events.reorder(start_at: :asc) # Default Sort by Event Date
+        events
       end
 
       events

data/app/models/effective/event_ticket.rb

@@ -95,7 +95,7 @@ module Effective
       raise('expected except to be an EventRegistration') if except && !except.class.try(:effective_events_event_registration?)
 
       event_registrants.select do |er| 
-        (er.registered? || er.selected_not_expired?) && (except.blank? || er.event_registration_id != except.id)
+        (er.registered? || er.selected_not_expired?) && (except.blank? || er.event_registration_id != except.id) && !er.archived?
       end
     end
 

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

@@ -23,6 +23,9 @@
 
   = f.check_box :archived, label: "Archive this addon. It will be displayed as archived on the owner's event registration"
 
+  - if f.object.new_record?
+    = f.hidden_field :created_by_admin, value: true
+
   - if f.object.new_record?
     = f.submit 'Save and Mark Registered'
   - else

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

@@ -37,4 +37,7 @@
 
   = f.check_box :archived, label: "Archive this registrant. It will be displayed as archived on the owner's event registration"
 
+  - if f.object.new_record?
+    = f.hidden_field :created_by_admin, value: true
+
   = f.submit 'Save'

data/app/views/effective/events/_event.html.haml

@@ -1,10 +1,14 @@
 .row.mb-5.effective-events{class: "effective-events-#{event.category.to_s.parameterize}"}
-  - if event.file.present?
+  - # Do not show banners for past events
+  - if event.file.attached? && event.upcoming?
     .col-lg-4
       = link_to effective_events.event_path(event) do
         = image_tag url_for(event.file), class: "effective-events-image d-none d-lg-flex align-self-start", alt: event.title, width: "350", height: "220"
 
   .col
+    - if event.past?
+      .badge.badge-primary.badge-event.mb-2 Past Event
+
     - if event.category.present? && EffectiveEvents.categories.length > 1
       = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-primary badge-event mb-2 effective-events-#{event.category.parameterize}")
 

data/app/views/effective/events/_sidebar.html.haml

@@ -1,7 +1,7 @@
-.effective-event-sidebar
+.effective-event-sidebar.font-weight-bold.text-center.text-lg-left
   %ul.nav.flex-column{role: 'navigation'}
     = nav_link_to("Upcoming #{ets(Effective::Event)}", effective_events.events_path, class: "effective-event-all")
     = nav_link_to("Past #{ets(Effective::Event)}", effective_events.events_path + '/past', class: "effective-event-past")
 
-    - EffectiveEvents.categories.each do |category|
+    - EffectiveEvents.categories.sort.each do |category|
       = nav_link_to(category, effective_events.events_path + '/' + category.parameterize, class: "effective-event-#{category.parameterize}")

data/app/views/effective/events/index.html.haml

@@ -1,11 +1,11 @@
 = render 'layout' do
   .row
     - if EffectiveEvents.categories.length > 1
-      .d-none.d-lg-block.col-lg-3
+      .d-lg-block.col-lg-3.order-2.order-lg-1
         -#= render('effective/events/form', event_search: @event_search)
         = render('effective/events/sidebar')
 
-    .col
+    .col.order-1.order-lg-2
       %h1.effective-title.mb-4= @page_title
 
       - results = @event_search.results(page: params[:page])
@@ -15,5 +15,5 @@
       - else
         = render(results) # This renders effective/events/event
 
-      %nav.d-flex.justify-content-center
+      %nav.d-flex.justify-content-center.mb-4
         = bootstrap_paginate(results, per_page: @event_search.per_page)

data/db/migrate/101_create_effective_events.rb

@@ -105,6 +105,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :price
 
       t.boolean :archived, default: false
+      t.boolean :created_by_admin, default: false
 
       t.timestamps
     end
@@ -146,6 +147,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.integer :price
 
       t.boolean :archived, default: false
+      t.boolean :created_by_admin, default: false
 
       t.timestamps
     end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.22.2'.freeze
+  VERSION = '0.23.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails