effective_events 2.32.2 → 2.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68169fa558aa77fd2b9ea8194f8017091fde10073004fbb596f80dcb22e6d29b
-  data.tar.gz: c9197e50d7dbe855011c92fb96e0c93bc0a0491ce673b2e12d26d12919cd2b1c
+  metadata.gz: 421007fd05e3c277084e11940c77285df4515295b9b406056cde323862230e15
+  data.tar.gz: 07a45f5e08e4fc1fab12917f1d6a0379f027a9c4a1ed2ae12f9bd2ea47c4f705
 SHA512:
-  metadata.gz: 4149adf30e8f5dfd1af424d0da684eda25600d911ee521a7b701e34046a187a8694696eed4d5b22455759aae7e9d106d16265e5051af4d3c4ac39a73387b89c9
-  data.tar.gz: a831818688445301584adee6c60c600986a7ae47a2308e51738ef13cac236d3db39bca9709c999280cb630962941e3e20a099b675ced621aff2cd5a0e5b8d826
+  metadata.gz: 7b15bffd4cba843b709255b8d2526126147fa6377bc029431dc97fc3677ac67378cf774432f53927590295f018d161ec5e8f1bffa672ed2948491b0e5f4b2bc7
+  data.tar.gz: 5390b0e6114a9379f83dd7b5f5062f57fb8b497c95603bb5708fdd225b141028a40bf6e92ab2ae6354e92cf81aa9a1246bbea4e575abfd0dece9587d677eeee1

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/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/app/views/effective/event_registrations/_fields_event_ticket_selections.html.haml

@@ -35,12 +35,12 @@
             - # Early Bird
             - if event.early_bird? && ticket.early_bird_price.to_i > 0 && [ticket.member_price, ticket.regular_price].exclude?(ticket.early_bird_price)
               %li
-                - if ticket.regular_price.to_i > 0
+                - if ticket.regular_price.to_i > 0 && (ticket.member_or_non_member? || ticket.regular?)
                   %div
                     %s.text-muted
                       = price_to_currency(ticket.regular_price)
 
-                - if ticket.member_price.to_i > 0
+                - if ticket.member_price.to_i > 0 && (ticket.member_or_non_member? || ticket.member_only?)
                   %div
                     %s.text-muted
                       = price_to_currency(ticket.member_price)
@@ -50,11 +50,11 @@
                   = price_to_currency(ticket.early_bird_price)
                   .badge.badge-warning Early Bird
             - else
-              - if ticket.regular_price.present?
+              - if ticket.regular_price.to_i > 0 && (ticket.member_or_non_member? || ticket.regular?)
                 %li
                   = price_to_currency(ticket.regular_price)
 
-              - if ticket.member_price.present?
+              - if ticket.member_price.to_i > 0 && (ticket.member_or_non_member? || ticket.member_only?)
                 %li
                   = price_to_currency(ticket.member_price)
                   .badge.badge-secondary Members

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.32.2'.freeze
+  VERSION = '2.33.1'.freeze
 end

metadata

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