effective_events 2.30.3 → 2.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91109a7761fa4e8cbc16e6ac9b9f8154da0f82e0137c2ffaa5988d6574608fd5
-  data.tar.gz: 4b69f5c89699e704194adf9c8c9f2e8f8b70eb5e4a1af6a176709798e1aab8d7
+  metadata.gz: 6feae20f90c75861691ba43722fadf4f005713189959ee86509ba54c698df955
+  data.tar.gz: 0e1e89be316bd788a0966a83d263c9c559f460b3e1a82eda807d77fbfb72826d
 SHA512:
-  metadata.gz: c0535e852a75453384146d633c341c18bbfc34c217033b0eb8c59175c6897913fbd65829ce4a8068fb13d54191e4f4435680e58c47e5cacbe35dd8fd089beac2
-  data.tar.gz: '09ca6a32572b6821ab732ac68d25e4d2856fc28fbfe413885f0b69f1d228c21e6304c742a087c1f6e10f00e3201f10f7be5d4e4d3a7f682657580ecca3d899ac'
+  metadata.gz: 63875f071ab6815042e5a538bcf6286f93b121f7133e824dfd0c6bddc6e2957d43ef75b715830556778ec5235a893a2e95fc07d0f468ea740d40179e6b73a426
+  data.tar.gz: d4efceee6c4a33a8cab578661baeba676de9ce447ed38ce968ad77fc6d68465e56a23780e6faddda6811973e9a24cbd5e2f7cdd29d86875ba08a102e09ad7e5f

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

@@ -66,7 +66,8 @@ module Admin
       end
       
       col :user, visible: false
-      col :organization, visible: false
+      col :organization, visible: EffectiveEvents.organization_enabled?
+      col :company, visible: !EffectiveEvents.organization_enabled?
 
       col :orders, visible: false
 
@@ -82,7 +83,6 @@ module Admin
       col :first_name, visible: false
       col :last_name, visible: false
       col :email, visible: false
-      col :company, visible: false
 
       col :response1
       col :response2

data/app/datatables/admin/effective_event_tickets_datatable.rb

@@ -71,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

@@ -10,10 +10,15 @@ module Admin
     end
 
     datatable do
+      order :start_at
+
       col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
 
+      col :start_at, label: 'Date'
+      col :end_at, label: 'End Date', visible: false
+
       col :title do |event|
         link_to event.title, effective_events.edit_admin_event_path(event)
       end
@@ -25,8 +30,6 @@ module Admin
       col :published_start_at, label: "Published start", as: :datetime
       col :published_end_at, label: "Published end", as: :datetime
 
-      col :start_at, label: 'Start', visible: false
-      col :end_at, label: 'End', visible: false
       col :excerpt, visible: false
 
       col :registration_start_at, label: 'Registration opens', visible: false
@@ -54,6 +57,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
@@ -70,7 +70,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:event_ticket_id, :id) }
-    scope :deep, -> { includes(:event, :event_ticket, :owner) }
+    scope :deep, -> { includes(:event, :event_ticket, :owner, event_registration: :orders) }
     scope :registered, -> { unarchived.where.not(registered_at: nil) }
     scope :not_registered, -> { archived.or(where(registered_at: nil)) }
     scope :purchased_or_created_by_admin, -> { purchased.or(unarchived.where(created_by_admin: true)) }

data/app/models/effective/event_ticket.rb

@@ -71,6 +71,8 @@ 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

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.30.3'.freeze
+  VERSION = '2.31.1'.freeze
 end

metadata

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