spree_cm_commissioner 2.3.0.pre.pre15 → 2.3.0.pre.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de0699d1dc713a380bc232895c2662c173b22e6d01e93f2fc2d0f2d18b723bde
-  data.tar.gz: 82a2a10e8ff8b9f7bd2786ebc5004fb44cb2133d819db1012b3179b1f2fe0b80
+  metadata.gz: 654baee3237bba36ebcc85458b09f73b076c6d1ffb782351cf697fa7ab287c7d
+  data.tar.gz: ef9275e9c3d748cdd7947780dca206ea2ae75b4362731e9d9d1b04b2eab04aee
 SHA512:
-  metadata.gz: e4613e0a9d0b52f781a2d2c1f89de0078d4b5c65ef16f1a26090ffbddda0c4c9494f9ca8458264f6023fbf949ea4e4228111116153da1b6e3be6dec51af7715a
-  data.tar.gz: 608e42e844de2015b7a94de6e350034b7a2b74d63998834fbff71fc599f77ffac57385e65a70df53a10a34582f7bb2d13deff9c44773ddbe4661b28bbb9238b9
+  metadata.gz: b35dd2fe6fc1815f72f0c1e33a88eb629437040de5ea73fc48f8cb249b6f322aedfe2be423847b74ef609a78783f62de13399b0c17c6fdebdf0c54c4a826cdf8
+  data.tar.gz: 11131275c0fc9afec3d0ed082e10ac0471490e07fc04ebbc64ccb10d01ac1442acb102fd4178bfedad3a0e685939df1ad42459f5c62494dd168c699cbb105b57

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.0.pre.pre15)
+    spree_cm_commissioner (2.3.0.pre.pre16)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/models/concerns/spree_cm_commissioner/order_seatable.rb

@@ -23,13 +23,26 @@ module SpreeCmCommissioner
     # Makes sure seat blocks are held if not held yet or if the hold has expired.
     # Called before moving to payment state to ensure seats are held properly,
     # even if hold was started from :address state or an old hold expired.
-    def ensure_blocks_held!
+    def ensure_blocks_held
       return unless should_manage_blocks?
       return if hold_expires_at.present? && hold_expires_at > Time.zone.now
 
+      hold_blocks
+    end
+
+    def hold_blocks
       hold_blocks!
+    rescue SpreeCmCommissioner::Seats::BlocksAreReservedByOtherGuestError,
+           SpreeCmCommissioner::Seats::BlocksAreOnHoldByOtherGuestError,
+           SpreeCmCommissioner::Seats::BlocksAreReservedBySameGuestError,
+           SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError => e
+      errors.add(:seats, e.message)
+      false
     end
 
+    # Hold blocks for the order. Called during checkout (user-initiated).
+    # Catches seat errors and adds them to order.errors to prevent state transition.
+    # Returns false if error occurs, true otherwise.
     def hold_blocks!
       return unless should_manage_blocks?
 
@@ -46,6 +59,8 @@ module SpreeCmCommissioner
       end
     end
 
+    # Cancel blocks for the order. Called from system (order cancellation/archive).
+    # Raises errors to alert the system if something goes wrong.
     def cancel_blocks!
       return unless should_manage_blocks?
 
@@ -55,6 +70,8 @@ module SpreeCmCommissioner
       end
     end
 
+    # Reserve blocks for the order. Called from system (order completion).
+    # Raises errors to alert the system if something goes wrong.
     def reserve_blocks!
       return unless should_manage_blocks?
 

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -5,8 +5,8 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      state_machine.before_transition to: :address, do: :hold_blocks!
-      state_machine.before_transition to: :payment, do: :ensure_blocks_held!
+      state_machine.before_transition to: :address, do: :hold_blocks
+      state_machine.before_transition to: :payment, do: :ensure_blocks_held
 
       state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
       state_machine.before_transition to: :complete, do: :generate_bib_number

data/app/services/spree_cm_commissioner/checkout/advance_decorator.rb

@@ -1,12 +1,16 @@
 module SpreeCmCommissioner
   module Checkout
     module AdvanceDecorator
-      # override
+      # override to capture seats error only, other errors is fine we can return success with latest order object instead of throw error.
+      # seat is special case because we want to return error message.
       def call(order:)
         Spree::Dependencies.checkout_next_service.constantize.call(order: order) until cannot_make_transition?(order)
-        success(order)
-      rescue StandardError => e
-        failure(order, e.message)
+
+        if order.errors[:seats].present?
+          failure(order)
+        else
+          success(order)
+        end
       end
     end
   end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre15'.freeze
+  VERSION = '2.3.0-pre16'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre15
+  version: 2.3.0.pre.pre16
 platform: ruby
 authors:
 - You