effective_events 2.33.1 → 2.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421007fd05e3c277084e11940c77285df4515295b9b406056cde323862230e15
-  data.tar.gz: 07a45f5e08e4fc1fab12917f1d6a0379f027a9c4a1ed2ae12f9bd2ea47c4f705
+  metadata.gz: 28f9bea4ad9ae836687a2976d8375defb38dadd9024380d02daae3edfc5d2826
+  data.tar.gz: cab0b307582df198e1de51213a473102b5699e433091297e888995278c994978
 SHA512:
-  metadata.gz: 7b15bffd4cba843b709255b8d2526126147fa6377bc029431dc97fc3677ac67378cf774432f53927590295f018d161ec5e8f1bffa672ed2948491b0e5f4b2bc7
-  data.tar.gz: 5390b0e6114a9379f83dd7b5f5062f57fb8b497c95603bb5708fdd225b141028a40bf6e92ab2ae6354e92cf81aa9a1246bbea4e575abfd0dece9587d677eeee1
+  metadata.gz: 78059802ffd220f3bb1cacf8e3d7e2160513b213f0d95c740669a206f5bbcab341c9a8d981f9f270dfc11c1c5aacb35ff3260936aa2e99ff0a57755356cb304e
+  data.tar.gz: 6080c2d6d2338ca6c94571dbb84901d04524022136f39b9e2431c88fd1025d0da192970f6bad8ca6552083d2d3d568c1085f779341b66c661d6cca2c60be7037

data/app/models/effective/event_registrant.rb

@@ -324,9 +324,72 @@ module Effective
     def promote!
       raise('expected a waitlist? event_ticket') unless event_ticket.waitlist?
 
+      if purchased? && event_registration.present?
+        promote_purchased_event_registration!
+      elsif purchased? && event_registration.blank?
+        promote_purchased_order!
+      else
+        promote_not_purchased!
+      end
+    end
+
+    def promote_purchased_event_registration!
+      # Remove myself from any existing orders. 
+      # I must be $0 so we don't need to update any prices.
+      orders.each do |order|
+        order.order_items.find { |oi| oi.purchasable == self }.destroy!
+      end
+
+      # I'm now promoted and unpurchased
+      update!(promoted: true, purchased_order: nil)
+
+      # Check if the ticket owner has an unpurchased event registration for the event or create a new one
+      event_registration = EffectiveEvents.EventRegistration.draft.where(event: event, owner: owner).where.not(id: event_registration_id).first
+      event_registration ||= EffectiveEvents.EventRegistration.new(event: event, owner: owner)
+
+      # Put the event registration on the checkout step
+      event_registration.all_steps_before(:checkout).each do |step|
+        event_registration.wizard_steps[step] ||= Time.zone.now
+      end
+
+      event_registration.save!
+
+      # Move this registrant into the new event registration
+      update!(event_registration: event_registration)
+
+      # Build the order for the event registration
+      # It can be checked out by admin immediately, or the user can go through it themselves
+      event_registration.reload
+      event_registration.find_or_build_submit_order
+
+      event_registration.save!
+    end
+
+    def promote_purchased_order!
+      # Remove myself from any existing orders. 
+      # I must be $0 so we don't need to update any prices.
+      orders.each do |order|
+        order.order_items.find { |oi| oi.purchasable == self }.destroy!
+      end
+
+      # I'm now promoted and unpurchased
+      update!(promoted: true, purchased_order: nil)
+
+      # Check if the ticket owner has an unpurchased order for the event or create a new one
+      order = owner.orders.reject { |order| order.purchased? }.find do |order| 
+        order.purchasables.any? { |purchasable| purchasable.class.name == "Effective::EventRegistrant" && purchasable.try(:event) == event }
+      end
+      order ||= Effective::Order.new(user: owner)
+
+      # Move this registrant into the new order
+      order.add(self)
+
+      order.save!
+    end
+
+    def promote_not_purchased!
       update!(promoted: true)
       orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
-
       true
     end
 
@@ -335,7 +398,6 @@ module Effective
 
       update!(promoted: false)
       orders.reject(&:purchased?).each { |order| order.update_purchasable_attributes! }
-
       true
     end
 
@@ -377,6 +439,16 @@ module Effective
       send_order_emails!
     end
 
+    # Manual admin action only. From datatable.
+    def send_payment_request!
+      raise('already purchased or deferred') if purchased_or_deferred?
+
+      order = (Array(event_registration_submit_order) + Array(orders)).find { |order| order.in_progress? && !order.purchased_or_deferred? && !order.refund? }
+      return false if order.blank?
+
+      order.send_payment_request_to_buyer!
+    end
+
     def send_order_emails!
       event_registration&.submit_order&.send_order_emails!
     end

data/config/routes.rb

@@ -51,7 +51,7 @@ EffectiveEvents::Engine.routes.draw do
       post :unarchive, on: :member
 
       post :send_confirmation_email, on: :member
-      post :send_order_emails, on: :member
+      post :send_payment_request, on: :member
     end
 
     resources :event_addons, except: [:show] do

data/lib/effective_events/version.rb

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

metadata

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