effective_events 2.32.1 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81ec9bb4f71c619dc8ffc2632f2fa53898ba7c7f78978130fef63aba5cd5ba76
-  data.tar.gz: 3a3b4b10cacc93bc04d4c9ca6081e6ce3a7d1991af032f13bf02aa22d7bc5927
+  metadata.gz: 1b0ae587daebc365cd145d2efb8296557760cbcb7bf690ca6027ebba50c84249
+  data.tar.gz: e24cc7c0844d9ed29b528d26b2261095fe2b58583c46b92db4af77ae76b6ffb0
 SHA512:
-  metadata.gz: b53a568ab95d67da9773ab9a32f7b126fda3992b18d2d992d194a432f9e0821cce2f06b6aeab2f899da10a7e126e22d7bb63f385250db2c9168c05c02bbf40be
-  data.tar.gz: 283afdc9a85aefeaea037c610526cb6822d1e0ac8dc58da4489d931742566da9d74bb6a360750fa5bd146aae1518bf2d690dd1f0cd4f470083545df3863ee4c7
+  metadata.gz: 05a1da730a4b6cf47f3796cab27377627be6629d6d134abecd2c413ff3bce85a5379a093dd1822b0d962ee174317d0d473f34dd69743db296b4a68b177017615
+  data.tar.gz: 17cbe3baf5030f61ce4402bf3ce6cf5b04d1ec9738002f468d7447a3feae5aa881f550011f52035d6c5a3e40ff8d1496671a658cafde64e2b65111799990da06

data/app/datatables/admin/effective_event_registrants_datatable.rb

@@ -11,7 +11,7 @@ module Admin
     end
 
     datatable do
-      order :registered_at, :asc
+      order :registered_at, :desc
 
       col :updated_at, visible: false
       col :created_at, visible: false

data/app/models/effective/event.rb

@@ -174,6 +174,14 @@ module Effective
       errors.add(:category, 'is not included in the list') unless EffectiveEvents.categories.include?(category)
     end
 
+    validate(if: -> { persisted? && delayed_payment_changed? && delayed_payment_was && !delayed_payment? }) do
+      errors.add(:delayed_payment, "cannot be disabled because there are existing delayed orders") if delayed_orders.present?
+    end
+
+    after_commit(if: -> { persisted? && delayed? && delayed_payment_date_previously_changed? }) do
+      update_delayed_orders_delayed_payment_date!
+    end
+
     def to_s
       title.presence || model_name.human
     end
@@ -326,6 +334,24 @@ module Effective
       delayed_payment_date > Time.zone.now.to_date
     end
 
+    def update_delayed_orders_delayed_payment_date!
+      raise('expected delayed payment date to be present') unless delayed_payment_date.present?
+
+      transaction do
+        delayed_orders.find_each { |order| order.update!(delayed_payment_date: delayed_payment_date) }
+      end
+    end
+
+    # When an event payment date is changed, all pending orders should also be updated
+    def delayed_orders
+      order_ids = (
+        Effective::OrderItem.where(purchasable_id: event_registrants, purchasable_type: 'Effective::EventRegistrant').pluck(:order_id) +
+        Effective::OrderItem.where(purchasable_id: event_addons, purchasable_type: 'Effective::EventAddon').pluck(:order_id)
+      ).uniq
+
+      Effective::Order.where.not(status: [:purchased, :declined, :voided]).delayed.where(id: order_ids) # deferred delayed orders
+    end
+
     def qb_item_names
       (event_tickets + event_products).map(&:qb_item_name).uniq - ['', nil]
     end

data/app/models/effective/event_registrant.rb

@@ -49,9 +49,9 @@ module Effective
       registered_at         :datetime     # When the order is deferred or purchased
 
       # Question Responses
-      question1             :text
-      question2             :text
-      question3             :text
+      response1             :text
+      response2             :text
+      response3             :text
 
       archived              :boolean
 
@@ -292,6 +292,10 @@ module Effective
 
     # Admin update event registrant action
     def save_and_update_orders!
+      if event_ticket_id_changed?
+        assign_attributes(response1: nil, response2: nil, response3: nil)
+      end
+
       save!
 
       orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }

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

@@ -46,7 +46,7 @@
           = f.hidden_field :delayed_payment_date, value: ''
 
         = f.show_if(:delayed_payment, true) do
-          = f.date_field :delayed_payment_date, label: "Delayed Payment Charge Date", hint: "The date that the credit card will be charged. Expects a date in the future, after the registration end date. Changing this date will not affect previously generated event registration delayed payment orders."
+          = f.date_field :delayed_payment_date, label: "Delayed Payment Charge Date", hint: "The date that the credit card will be charged. Expects a date in the future, after the registration end date.<br>Changing this will update the charge date for all existing delayed payment orders."
 
   = f.submit do
     = f.save 'Save'

data/db/migrate/101_create_effective_events.rb

@@ -64,6 +64,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :event_tickets, :event_id, if_not_exists: true
+    add_index :event_tickets, :title, if_not_exists: true
+
     create_table :event_registrants do |t|
       t.integer :event_id
       t.integer :event_ticket_id
@@ -110,6 +113,12 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :event_registrants, [:user_type, :user_id, :owner_type, :owner_id], if_not_exists: true
+    add_index :event_registrants, :event_registration_id, if_not_exists: true
+    add_index :event_registrants, :event_ticket_id, if_not_exists: true
+    add_index :event_registrants, :archived, if_not_exists: true
+    add_index :event_registrants, :registered_at, if_not_exists: true
+
     create_table :event_products do |t|
       t.integer :event_id
 
@@ -127,6 +136,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :event_products, :event_id, if_not_exists: true
+    add_index :event_products, :position, if_not_exists: true
+
     create_table :event_addons do |t|
       t.integer :event_id
       t.integer :event_product_id
@@ -152,6 +164,9 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    add_index :event_addons, :event_registration_id, if_not_exists: true
+    add_index :event_addons, :event_product_id, if_not_exists: true
+
     create_table :event_registrations do |t|
       t.string :token
 
@@ -178,6 +193,10 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
+    add_index :event_registrations, [:owner_id, :owner_type]
+    add_index :event_registrations, :status
+    add_index :event_registrations, :token
+
     create_table :event_ticket_selections do |t|
       t.integer :event_registration_id
       t.string :event_registration_type
@@ -189,9 +208,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :event_registrations, [:owner_id, :owner_type]
-    add_index :event_registrations, :status
-    add_index :event_registrations, :token
+    add_index :event_ticket_selections, :event_registration_id, if_not_exists: true
 
     create_table :event_notifications do |t|
       t.references :event

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.32.1'.freeze
+  VERSION = '2.33.0'.freeze
 end

metadata

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