effective_events 2.29.3 → 2.29.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21c9f27754f7cae0b66a655235a24e2346977587791e6d69b84d2758dc71d3b
-  data.tar.gz: 2fdc5dfa02ceae9a90883a5322fb23193a5ad7a8d82e0339ac51b5fa95f5c5f0
+  metadata.gz: c14e31c639caed97a4e6f5b15206e6da6734c97a5cd60af0aebcc654ac41fc8a
+  data.tar.gz: 2f9ec428eb3d1794f77b8ed757af584c3323e98c75e6040e2d64994ba70ed303
 SHA512:
-  metadata.gz: 6e6d2dbc553ff34b73e8bedc10f3500a6544526558f5f22a0bc394c22d080f93e79524eda4fb86500c12542e519843ac7b047b8b3c146ac215319a5d57e98156
-  data.tar.gz: 8e0e032240ad64f32ef661d6508e2a0abfb5bcda91d61e1f89152b420b365d55153613f3bbf3211076d294cddfc8e99be9181c7a76056aeede1449074f8b5d5b
+  metadata.gz: 985572039dc88d35c6e339acfbf38fac38e6d96b388210ed2f6f416a3c215fd1acbf35dd8a3f1991ca622cfc75e8a3d818377faa636dc432a13226baaf3162de
+  data.tar.gz: 499e41790fd28b1c6d74af26bcfca71c76fc1256a8fe4280982e8072dcaa0b0150bc2f05d30bd33b583ac388a17f22e9aeb6b4bb97cc4055dffa5788ec3c0e01

data/app/controllers/effective/event_registrations_controller.rb

@@ -21,6 +21,7 @@ module Effective
       return if resource.event.blank?
       return if resource.submit_order&.deferred?
       return if resource.event.registerable? && !resource.event.sold_out?(except: resource)
+      return if resource.just_let_them_edit_tickets_and_register_anyway?
 
       flash[:danger] = "Your selected event is not available for registration. This event registration not available."
       return redirect_to(view_context.return_to_dashboard_path)
@@ -31,6 +32,8 @@ 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? }
+      return if resource.just_let_them_edit_tickets_and_register_anyway?
 
       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
@@ -493,6 +522,10 @@ module EffectiveEventsEventRegistration
     EffectiveEvents.send_email(:event_registration_confirmation, self)
   end
 
+  def just_let_them_edit_tickets_and_register_anyway?
+    false
+  end
+
   private
 
   def update_deferred_event_registration!

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

@@ -4,6 +4,9 @@
 
   - if resource.submit_order.deferred?
     = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
+  - elsif resource.just_let_them_edit_tickets_and_register_anyway?
+    = card do
+      = render_checkout_step2(resource.submit_order, purchased_url: wizard_path(:complete), deferred_url: wizard_path(:submitted), declined_url: wizard_path(:checkout))
   - elsif resource.event.registerable? == false
     .alert.alert-danger Your selected event is no longer available for registration.
   - elsif resource.unavailable_event_tickets.present?

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.3'.freeze
+  VERSION = '2.29.5'.freeze
 end

metadata

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