effective_events 2.29.2 → 2.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c5cab2a4f52670bdb757aadfb5e3d0d8c2c2fcc5ace2a4767d0493c89c245b3
-  data.tar.gz: eb553379563b38a9d25a90169a443ad100c29f2ded09331763c0472ed3596e90
+  metadata.gz: 5fe803195a47b89ebfbef90c0273828a1a463864b34c97eee1d1845bd0802d9d
+  data.tar.gz: 13e3440736211a77566adaf6824d83f3372eec0b1f9b04757256cd72c3acecc8
 SHA512:
-  metadata.gz: 17da816f22e61e8a3d3235aeab9e737c60b6ab94c6616a9ad394da62996e4aff9d17e69409fdebc3da719b0514156e3cb19941838d6a612a61878fa47908f5c6
-  data.tar.gz: 0b5191245dd117b9a5b1a5f9fb1350d839f6a56053116fbfbe098315fcf6dd40a82be974f9c8be2a56912b40bd33f9f59ae1cddd410fd623ce173843afb0343d
+  metadata.gz: 3feee602decdd8cab6a09cfbb3f2188466ad1854576891415b731c59ec31f88ce7f35a5b6541366d008f3a08a707efdc2d99f601e3e76d1abc246b59aa53bccf
+  data.tar.gz: c59ff8cb25b345807ce274d35ae620a6430dc162105277749e361f21f7963bc48ca11576541d5cded0f860bcb4c93466114dac170be699d46fd7c03788ecb76f

data/app/controllers/effective/event_registrations_controller.rb

@@ -31,6 +31,7 @@ module Effective
       return if resource.was_submitted?
       return if resource.event.blank?
       return if resource.selection_not_expired?
+      return if resource.orders.any? { |order| order.declined? && order.delayed? }
 
       resource.ticket_selection_expired!
 

data/app/models/concerns/effective_events_event_registration.rb

@@ -167,6 +167,14 @@ module EffectiveEventsEventRegistration
       return false if step == :complete && !completed?
       return true if step == :complete && completed?
 
+      if draft? && orders.any? { |order| order.declined? && order.delayed? }
+        return [:billing, :checkout].include?(step)
+      end
+
+      if submitted? && submit_order&.declined?
+        return [:billing, :checkout, :submitted].include?(step)
+      end
+
       # If submitted with a cheque/phone deferred (but not delayed) processor then lock down the steps.
       if submitted? && !delayed_payment_date_upcoming?
         return (step == :submitted) 
@@ -218,6 +226,24 @@ module EffectiveEventsEventRegistration
       true
     end
 
+    # Ready to check out
+    # This is called by the "ready_checkout" before_action in wizard_controller/before_actions.rb
+    # We have to handle the edge case where a delayed payment was declined
+    # Because we use submitted & completed here instead of submitted as our exit state, it's a bit weird
+    def ready!
+      without_current_step do
+        if submitted? && submit_order&.declined?
+          build_submit_fees_and_order(force: true)
+          wizard_steps.delete(:checkout)
+          wizard_steps.delete(:submitted)
+          unsubmitted!
+        else
+          build_submit_fees_and_order
+          save!
+        end
+      end
+    end
+
     def after_submit_deferred!
       update_deferred_event_registration!
       send_event_registration_confirmation!
@@ -230,6 +256,8 @@ module EffectiveEventsEventRegistration
       notifications.each { |notification| notification.notify!(event_registrants: event_registrants) }
 
       send_event_registration_confirmation! unless submit_order&.delayed? || submit_order&.deferred?
+
+      true
     end
   end
 
@@ -250,6 +278,7 @@ module EffectiveEventsEventRegistration
     return false if done?
     return false unless selected_at.present?
     return false unless current_step.present?
+    return false if draft? && orders.any? { |order| order.declined? && order.delayed? }
 
     [:start, :tickets, :submitted, :complete].exclude?(current_step)
   end

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

@@ -50,8 +50,10 @@
         = f.show_if_any(:category, ['Member Only', 'Member or Non-Member']) do
           = f.price_field :member_price, hint: 'A price of $0 will allow a checkout for free when selecting a member.'
 
-    .row
-      .col-md-6= qb_item_name_field(f)
+    - if EffectiveOrders.use_item_names?
+      .row
+        .col-md-6= qb_item_name_field(f)
+
     = f.check_box :tax_exempt, label: "Yes, this #{etd(f.object)} is tax exempt"
     = f.check_box :archived, label: 'Archive this ticket. While archived, it cannot be purchased by users but registrants can only be added by an admin.'
 

data/app/views/effective/event_registrations/submitted.html.haml

@@ -12,6 +12,14 @@
 
   = render 'effective/event_registrations/summary', event_registration: resource
 
+  - # This should only happen with a delayed order that was then declined
+  - if resource.submit_order&.declined?
+    = card do
+      %h3 Declined
+      %p Your card was declined by the payment processor: #{resource.submit_order.declined_reason}
+      %p Please try again.
+      %p= link_to('Click here to checkout again', wizard_path(:checkout))
+
   - if resource.event.allow_blank_registrants? && EffectiveResources.authorized?(self, :update_blank_registrants, resource)
     = card do
       %h3 Incomplete Ticket Information

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '2.29.2'.freeze
+  VERSION = '2.29.4'.freeze
 end

metadata

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