effective_events 2.30.2 → 2.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f5674dd0103143460a411264938785c8b8fe264caf401aa3ac7c39c4118be6
-  data.tar.gz: a0298a712e199e4b3e6fcef70aa1f11e9feb3d27d75266cdabb6d418b36e5518
+  metadata.gz: 8a36dc11b007f823f99ed956625b93e5e2431bc7c5aa7710edc2eb4ff812a858
+  data.tar.gz: 2d34832f0266bd9418cebc6588772103d2b25ae9f0aca411e1e77d3194791850
 SHA512:
-  metadata.gz: 7631eec53e65b21d0546a009fe233989eefe5e448f34fe50c83562993ea2e01ea405c5b0f6f9dee9de5e4c5e3ca41c6e30aad6e640d5fab904fecc454bf7cdc8
-  data.tar.gz: b972ba664a0d9312a5fd66d04bd4442b521badb1ce34aabff9f8933e5c2b1e51b8235c37cc2d8999c4e8778769ca47cc58fcb1610e8db14675569e2bfac5e974
+  metadata.gz: 9a70510c44b6b475036dcc055de368a37bf90e1f107990d13383f1b33e443b0c0002cc443fd69a7d0e8d5a4e7b8748d44b431306047bcd31822cf12b63d3b8b9
+  data.tar.gz: d81d01a9babdfdb79f84eaead78770a05955c36d9cea477437515f0c66c8323cfb67a27d6e076c57894dbb36a1aff05e06b0e815088a4486a241af9ce4efea5b

data/app/datatables/admin/effective_event_products_datatable.rb

@@ -42,6 +42,8 @@ module Admin
       #   end.join.html_safe
       # end
 
+      col :qb_item_name, label: qb_item_name_label, search: Effective::ItemName.sorted.map(&:to_s), visible: EffectiveOrders.use_item_names?
+
       actions_col
     end
 

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -16,7 +16,6 @@ module Admin
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
-      col :archived, visible: false
 
       col :registered_at
 
@@ -45,9 +44,12 @@ module Admin
         else
           '-'
         end
+      end.search do |collection, term|
+        EffectiveResources.truthy?(term) ? collection.waitlisted : collection.non_waitlisted
       end
 
       col :promoted, visible: false
+      col :archived, visible: false
 
       col :name do |er|
         if er.user.present?

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -1,14 +1,13 @@
 module Admin
   class EffectiveEventTicketsDatatable < Effective::Datatable
     datatable do
-      reorder :position
+      order :title
 
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
       col :archived
 
-
       col :event
       col :title
       col :category, visible: false
@@ -49,12 +48,12 @@ module Admin
         if ticket.capacity.present?
           "
             #{ticket.capacity} capacity<br />
-            #{ticket.non_waitlisted_event_registrants_count.count} registered<br />
-            #{ticket.capacity_available} available<br />
-            #{ticket.waitlisted_event_registrants_count} waitlisted
+            #{ticket.registered_non_waitlisted_count} registered<br />
+            #{ticket.registered_available_count} available<br />
+            #{ticket.registered_waitlisted_count} waitlisted
           "
         else
-          "#{ticket.non_waitlisted_event_registrants_count.count} registered"
+          "#{ticket.registered_count} registered"
         end
       end
 
@@ -64,7 +63,7 @@ module Admin
         event.event_registrants.registered.count
       end
 
-      col :purchased_event_registrants_count, label: 'Deferred', visible: false, as: :integer do |event|
+      col :deferred_event_registrants_count, label: 'Deferred', visible: false, as: :integer do |event|
         event.event_registrants.deferred.count
       end
 
@@ -72,6 +71,8 @@ module Admin
         event.event_registrants.purchased.count
       end
 
+      col :qb_item_name, label: qb_item_name_label, search: Effective::ItemName.sorted.map(&:to_s), visible: EffectiveOrders.use_item_names?
+
       col :question1, visible: false
       col :question2, visible: false
       col :question3, visible: false

data/app/datatables/admin/effective_events_datatable.rb

@@ -54,6 +54,13 @@ module Admin
       col :roles, visible: false
       col :authenticate_user, visible: false
 
+      col :qb_item_names, 
+        search: { fuzzy: true, collection:Effective::ItemName.sorted.map(&:to_s) },
+        label: qb_item_names_label,
+        visible: EffectiveOrders.use_item_names? do |event|
+          event.qb_item_names.map { |qb_item_name| content_tag(:div, qb_item_name) } .join.html_safe
+      end
+
       actions_col do |event|
         dropdown_link_to('View Event', effective_events.event_path(event), target: '_blank')
       end

data/app/models/effective/event.rb

@@ -326,5 +326,8 @@ module Effective
       delayed_payment_date > Time.zone.now.to_date
     end
 
+    def qb_item_names
+      (event_tickets + event_products).map(&:qb_item_name).uniq - ['', nil]
+    end
   end
 end

data/app/models/effective/event_addon.rb

@@ -36,8 +36,8 @@ module Effective
 
       # Acts as Purchasable
       price             :integer
-      qb_item_name      :string
       tax_exempt        :boolean
+      # The qb_item_name is deferred to event_product
 
       timestamps
     end
@@ -85,7 +85,7 @@ module Effective
     end
 
     def qb_item_name
-      event_product.qb_item_name
+      event_product&.qb_item_name
     end
 
     def registered?

data/app/models/effective/event_product.rb

@@ -41,6 +41,7 @@ module Effective
 
     validates :title, presence: true, uniqueness: { scope: [:event_id] }
     validates :price, presence: true
+    validates :qb_item_name, presence: true, if: -> { EffectiveOrders.require_item_names? }
 
     def to_s
       title.presence || 'New Event Product'

data/app/models/effective/event_registrant.rb

@@ -59,8 +59,8 @@ module Effective
 
       # Acts as Purchasable
       price                 :integer
-      qb_item_name          :string
       tax_exempt            :boolean
+      # The qb_item_name is deferred to ticket
 
       # Historical. Not used anymore. TO BE DELETED.
       number                :string
@@ -76,6 +76,9 @@ module Effective
     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) }
 
+    scope :waitlisted, -> { where(waitlisted: true, promoted: false) }
+    scope :non_waitlisted, -> { where(waitlisted: false).or(where(waitlisted: true, promoted: true)) }
+
     before_validation(if: -> { event_registration.present? }) do
       self.event ||= event_registration.event
       self.owner ||= event_registration.owner

data/app/models/effective/event_ticket.rb

@@ -48,7 +48,7 @@ module Effective
       timestamps
     end
 
-    scope :sorted, -> { order(:position) }
+    scope :sorted, -> { order(:title) }
     scope :deep, -> { with_rich_text_body.includes(:event, :purchased_event_registrants) }
 
     before_validation(if: -> { event.present? }) do
@@ -71,10 +71,13 @@ module Effective
     validates :capacity, numericality: { greater_than_or_equal_to: 0, allow_blank: true }
     validates :capacity, presence: { message: 'must be present when using the waitlist'}, if: -> { waitlist? }
 
+    validates :qb_item_name, presence: true, if: -> { EffectiveOrders.require_item_names? }
+
     def to_s
       title.presence || 'New Event Ticket'
     end
 
+    # These capacity methods are used by the front end EventRegistrations screens
     def capacity_selectable(except: nil)
       return nil if capacity.blank?
       return nil if waitlist?
@@ -88,7 +91,7 @@ module Effective
     end
 
     def capacity_taken(except: nil)
-      registered_or_selected_event_registrants(except: except).reject(&:waitlisted?).length
+      registered_or_selected_event_registrants(except: except).reject { |er| er.waitlisted? && !er.promoted? }.length
     end
 
     def registered_or_selected_event_registrants(except: nil)
@@ -99,24 +102,31 @@ module Effective
       end
     end
 
-    def registered_or_selected_event_registrants_count
-      registered_or_selected_event_registrants.count
-    end
+    # These registered methods are for the admin registrations screens
 
-    def registered_event_registrants_count
+    # Total registered count, including waitlisted and non waitlisted
+    def registered_count
       registered_event_registrants.length
     end
 
-    def purchased_event_registrants_count
-      purchased_event_registrants.length
+    # Registered and not waitlisted count
+    def registered_non_waitlisted_count
+      registered_event_registrants.non_waitlisted.length
+    end
+
+    # Registered and waitlisted count
+    def registered_waitlisted_count
+      registered_event_registrants.waitlisted.length
     end
 
-    def non_waitlisted_event_registrants_count
-      registered_event_registrants.where(waitlisted: false).or(registered_event_registrants.where(waitlisted: true, promoted: true))
+    # Registered and available count
+    def registered_available_count
+      return nil if capacity.blank?
+      [capacity - registered_non_waitlisted_count, 0].max
     end
 
-    def waitlisted_event_registrants_count
-      registered_event_registrants.where(waitlisted: true, promoted: false).length
+    def purchased_event_registrants_count
+      purchased_event_registrants.length
     end
 
     def questions
@@ -134,6 +144,5 @@ module Effective
     def member_or_non_member?
       category == 'Member or Non-Member'
     end
-
   end
 end

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.30.2'.freeze
+  VERSION = '2.31.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 2.30.2
+  version: 2.31.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails