spree_cm_commissioner 2.8.11 → 2.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db31429085eb3f3365a250a214b1025f0f0ab0252f2519581755240ff83cf1a
-  data.tar.gz: a99971540c37e2cb085b29c3bae51087dbcbab5141cd6b08ae1611fa5c5bb1bb
+  metadata.gz: 4d17bf5be351fe1e468d5772155df5cb6dad36710f3211444d7c6277c3019992
+  data.tar.gz: 73090f05ce40a930e5041040d531d5b4823e3aa7fb95c57b1b710613d75dc13b
 SHA512:
-  metadata.gz: 75b2c0ba0b20eac7fa49f22e6ead3253b06b8cbc61831b87d98c8e6010401c2c24f42a74b6e0441ed67da2aef02f4ae32700679651576a0ba167678056b45cf7
-  data.tar.gz: 0d7e16f4f6bd9aa8124f958b9c8b3ab4ed93783bc9b1b3167bc7b95bc592590a5b0aad4852fe17abe4013b9f8563a677be70218c74102c604c4f10f8a551ee9b
+  metadata.gz: 5329436173e30eb89975c67d5fda96b8217c19507414a2631ad4cbb808b59be492f47ba18239114f4325851df932df657e10dd71b5551140d1c3f52e277ae867
+  data.tar.gz: 6db4e5c326dcc47fd5956b2253d793db7f3a0c86cd3b08eae34d4e629396c2c62347ccf2ecc9a01329e724f40232b1eca1296098b5779e233e91096596a39cdf

data/Gemfile.lock

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

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

@@ -62,6 +62,12 @@ module SpreeCmCommissioner
       SpreeCmCommissioner::OrderHolds::Release.call!(order: self, reason: reason)
     end
 
+    # Non-raising variant. OrderHolds::Release rescues internally and returns a failure
+    # result, so callers can guard on `.success?` instead of handling exceptions.
+    def release_order_holds(reason: :user_canceled)
+      SpreeCmCommissioner::OrderHolds::Release.call(order: self, reason: reason)
+    end
+
     # Converts all holds to reserved/complete state on order completion.
     # Raises on failure so the surrounding transaction rolls back.
     def reserve_order_holds!

data/app/models/spree_cm_commissioner/inventory_hold.rb

@@ -9,7 +9,7 @@ module SpreeCmCommissioner
     belongs_to :user, class_name: 'Spree::User', optional: true
 
     enum status: { pending: 0, active: 1, payment_locked: 2, converted: 3, released: 4 }
-    enum release_reason: { user_canceled: 0, hold_expired: 1, payment_timeout: 2 }
+    enum release_reason: { user_canceled: 0, hold_expired: 1, payment_timeout: 2, cart_changed: 3 }
 
     validates :expires_at, presence: true
     validates :held_at, presence: true

data/app/services/spree_cm_commissioner/cart/add_guest.rb

@@ -4,6 +4,14 @@ module SpreeCmCommissioner
       prepend Spree::ServiceModule::Base
 
       def call(order:, line_item:)
+        # Release holds BEFORE mutating, using the quantities the hold was placed against
+        # (Release reads live line items). Only release when this guest will actually bump
+        # the quantity. Guard on success and abort if it fails.
+        if should_increase_quantity?(line_item)
+          release = order.release_order_holds(reason: :cart_changed)
+          return release unless release.success?
+        end
+
         # Lock the line item (SELECT ... FOR UPDATE) so concurrent guest add/remove
         # on the same line item are serialized. with_lock reloads the record inside
         # the lock, so quantity/guests reflect the latest committed state before we

data/app/services/spree_cm_commissioner/cart/add_item_decorator.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  module Cart
+    module AddItemDecorator
+      # Release the order's holds BEFORE mutating the cart, so the hold is reversed using
+      # the quantities it was actually placed against (Release reads live line items, it
+      # stores no snapshot). Releasing after the change would restock the wrong amounts.
+      # A fresh hold is re-acquired when the order transitions toward checkout.
+      # Guard on success: if the release fails, abort and surface the error — the cart
+      # stays untouched.
+      def call(order:, **)
+        release = order.release_order_holds(reason: :cart_changed)
+        return release unless release.success?
+
+        super
+      end
+    end
+  end
+end
+
+unless Spree::Cart::AddItem.included_modules.include?(SpreeCmCommissioner::Cart::AddItemDecorator)
+  Spree::Cart::AddItem.prepend(SpreeCmCommissioner::Cart::AddItemDecorator)
+end

data/app/services/spree_cm_commissioner/cart/create_guest.rb

@@ -11,6 +11,14 @@ module SpreeCmCommissioner
       def call(line_item:, options: {})
         guest = line_item.guests.new(options)
 
+        # Release holds BEFORE mutating, using the quantities the hold was placed against
+        # (Release reads live line items). Only release when this guest will actually bump
+        # the quantity. Guard on success and abort if it fails.
+        if will_change_quantity?(line_item)
+          release = line_item.order.release_order_holds(reason: :cart_changed)
+          return release unless release.success?
+        end
+
         line_item.with_lock do
           next unless guest.save
 
@@ -45,6 +53,17 @@ module SpreeCmCommissioner
         true
       end
 
+      # True only when the guest about to be created will push the guest count past the
+      # current capacity (number_of_guests = variant.number_of_guests * quantity), i.e. the
+      # quantity will actually be bumped. One guest needs at most one extra unit, so a single
+      # `+1` comparison is enough. Used to gate the hold release so it fires only on a real
+      # quantity change, mirroring Cart::AddGuest#should_increase_quantity?.
+      def will_change_quantity?(line_item)
+        return false unless need_to_bump_quantity?(line_item)
+
+        (line_item.guests.count + 1) > line_item.number_of_guests
+      end
+
       def bump_quantity_to_cover_guests(line_item)
         guest_count = line_item.guests.count
         original_quantity = line_item.quantity

data/app/services/spree_cm_commissioner/cart/empty_decorator.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  module Cart
+    module EmptyDecorator
+      # Emptying the cart removes all line items, so any inventory/seat holds must be
+      # released first — reversed against the quantities the hold was placed against
+      # (Release reads live line items). Skip completed orders (Cart::Empty refuses them
+      # anyway, and their holds are already converted, not active). Guard on success and
+      # abort if the release fails.
+      def call(order:)
+        if order.present? && !order.completed?
+          release = order.release_order_holds(reason: :cart_changed)
+          return release unless release.success?
+        end
+
+        super
+      end
+    end
+  end
+end
+
+unless Spree::Cart::Empty.included_modules.include?(SpreeCmCommissioner::Cart::EmptyDecorator)
+  Spree::Cart::Empty.prepend(SpreeCmCommissioner::Cart::EmptyDecorator)
+end

data/app/services/spree_cm_commissioner/cart/remove_guest.rb

@@ -4,6 +4,16 @@ module SpreeCmCommissioner
       prepend ::Spree::ServiceModule::Base
 
       def call(order:, line_item:, guest_id: nil)
+        # Release holds BEFORE mutating, using the quantities the hold was placed against
+        # (Release reads live line items). Only release when the quantity will actually
+        # decrease. The gate projects the pending guest removal (we evaluate before it
+        # happens), unlike should_decrease_quantity? which assumes the guest is already
+        # gone. Guard on success and abort if it fails.
+        if will_decrease_quantity?(order, line_item, guest_id)
+          release = order.release_order_holds(reason: :cart_changed)
+          return release unless release.success?
+        end
+
         # Lock the line item (SELECT ... FOR UPDATE) so concurrent guest add/remove
         # on the same line item are serialized. with_lock reloads the record inside
         # the lock, so quantity/guests reflect the latest committed state before we
@@ -44,6 +54,16 @@ module SpreeCmCommissioner
         total_guests(line_item) <= required_guests_for_previous_unit(line_item)
       end
 
+      # Same decision as should_decrease_quantity? but evaluated BEFORE the guest is
+      # removed, so we subtract the guest about to be destroyed from the current count.
+      # Used only to gate the pre-mutation hold release.
+      def will_decrease_quantity?(order, line_item, guest_id)
+        return false if order.completed?
+
+        projected_guests = total_guests(line_item) - (guest_id.present? ? 1 : 0)
+        projected_guests <= required_guests_for_previous_unit(line_item)
+      end
+
       def total_guests(line_item)
         line_item.guests.size
       end

data/app/services/spree_cm_commissioner/cart/remove_item_decorator.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module Cart
+    module RemoveItemDecorator
+      # See AddItemDecorator: release holds (guarded) before mutating the cart.
+      def call(order:, **)
+        release = order.release_order_holds(reason: :cart_changed)
+        return release unless release.success?
+
+        super
+      end
+    end
+  end
+end
+
+unless Spree::Cart::RemoveItem.included_modules.include?(SpreeCmCommissioner::Cart::RemoveItemDecorator)
+  Spree::Cart::RemoveItem.prepend(SpreeCmCommissioner::Cart::RemoveItemDecorator)
+end

data/app/services/spree_cm_commissioner/cart/remove_line_item_decorator.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module Cart
+    module RemoveLineItemDecorator
+      # See AddItemDecorator: release holds (guarded) before mutating the cart.
+      def call(order:, **)
+        release = order.release_order_holds(reason: :cart_changed)
+        return release unless release.success?
+
+        super
+      end
+    end
+  end
+end
+
+unless Spree::Cart::RemoveLineItem.included_modules.include?(SpreeCmCommissioner::Cart::RemoveLineItemDecorator)
+  Spree::Cart::RemoveLineItem.prepend(SpreeCmCommissioner::Cart::RemoveLineItemDecorator)
+end

data/app/services/spree_cm_commissioner/cart/set_quantity_decorator.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module Cart
+    module SetQuantityDecorator
+      # See AddItemDecorator: release holds (guarded) before mutating the cart.
+      def call(order:, **)
+        release = order.release_order_holds(reason: :cart_changed)
+        return release unless release.success?
+
+        super
+      end
+    end
+  end
+end
+
+unless Spree::Cart::SetQuantity.included_modules.include?(SpreeCmCommissioner::Cart::SetQuantityDecorator)
+  Spree::Cart::SetQuantity.prepend(SpreeCmCommissioner::Cart::SetQuantityDecorator)
+end

data/app/services/spree_cm_commissioner/inventory_holds/release.rb

@@ -31,7 +31,9 @@ module SpreeCmCommissioner
         # Notify AFTER the transaction commits (deliver_later must not be enqueued inside an open
         # transaction), and only when THIS invocation performed the release — the `next` guards above
         # commit without releasing, so this keeps notifications idempotent across stale/concurrent jobs.
-        notify_release(hold) if released
+        # Only scheduled (cron/job) releases may notify. Cart-driven releases never set
+        # scheduled_release, so customers editing their cart don't get a "released" push.
+        notify_release(hold) if released && scheduled_release
 
         success(hold)
       rescue ActiveRecord::StaleObjectError

data/config/locales/en.yml

@@ -726,9 +726,9 @@ en:
       db_save_error: "We encountered an issue saving your reservation. Please try again."
       redis_error: "We encountered an issue processing your reservation. Please try again."
     validate_limits:
-      exceeded_active_holds: "You have too many pending reservations. Please complete or cancel a reservation before trying another."
-      ip_rate_limit: "Too many reservation attempts from your location. Please wait and try again."
-      hold_cooldown: "Please wait before retrying. Your previous reservation may still be processing."
+      exceeded_active_holds: "You've reached the limit of reservations you can hold at once. Please complete or cancel one before reserving more."
+      ip_rate_limit: "Too many reservation attempts from your network in a short time. Please wait a while and try again."
+      hold_cooldown: "Your previous reservation just expired. Please wait a couple of minutes before reserving again."
 
   account_link:
     failure: "Failed to link your %{identity_type} account: %{reason}"

data/config/locales/km.yml

@@ -526,9 +526,9 @@ km:
       db_save_error: "មានបញ្ហាក្នុងការរក្សាទុកការកក់របស់អ្នក។ សូមព្យាយាមម្តងទៀត។"
       redis_error: "មានបញ្ហាក្នុងការដំណើរការការកក់របស់អ្នក។ សូមព្យាយាមម្តងទៀត។"
     validate_limits:
-      exceeded_active_holds: "អ្នកមានការកក់ដែលរង់ចាំច្រើនពេក។ សូមបញ្ចប់ ឬលុបការកក់មួយមុនពេលព្យាយាមវិញ។"
-      ip_rate_limit: "មានការព្យាយាមកក់ច្រើនពេកពីទីតាំងរបស់អ្នក។ សូមរង់ចាំ ហើយព្យាយាមម្តងទៀត។"
-      hold_cooldown: "សូមរង់ចាំមុនពេលព្យាយាមម្តងទៀត។ ការកក់របស់អ្នកមុនប្រហែលជាកំពុងដំណើរការ។"
+      exceeded_active_holds: "អ្នកកក់ដល់ចំនួនកំណត់អតិបរមាក្នុងពេលតែមួយហើយ។ សូមបញ្ចប់ ឬលុបការកក់មួយ មុនពេលកក់បន្ថែម។"
+      ip_rate_limit: "មានការព្យាយាមកក់ច្រើនពេកពីបណ្តាញរបស់អ្នកក្នុងរយៈពេលខ្លី។ សូមរង់ចាំបន្តិច រួចព្យាយាមម្តងទៀត។"
+      hold_cooldown: "ការកក់មុនរបស់អ្នកទើបតែផុតកំណត់។ សូមរង់ចាំពីរបីនាទី មុនពេលកក់ម្តងទៀត។"
 
   account_link:
     failure: "បរាជ័យក្នុងការភ្ជាប់គណនី %{identity_type}: %{reason}"

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.11'.freeze
+  VERSION = '2.8.12'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.11
+  version: 2.8.12
 platform: ruby
 authors:
 - You
@@ -2100,10 +2100,15 @@ files:
 - app/services/spree_cm_commissioner/assign_product_to_section/update.rb
 - app/services/spree_cm_commissioner/calculate_distance.rb
 - app/services/spree_cm_commissioner/cart/add_guest.rb
+- app/services/spree_cm_commissioner/cart/add_item_decorator.rb
 - app/services/spree_cm_commissioner/cart/create_guest.rb
 - app/services/spree_cm_commissioner/cart/destroy_decorator.rb
+- app/services/spree_cm_commissioner/cart/empty_decorator.rb
 - app/services/spree_cm_commissioner/cart/recalculate_decorator.rb
 - app/services/spree_cm_commissioner/cart/remove_guest.rb
+- app/services/spree_cm_commissioner/cart/remove_item_decorator.rb
+- app/services/spree_cm_commissioner/cart/remove_line_item_decorator.rb
+- app/services/spree_cm_commissioner/cart/set_quantity_decorator.rb
 - app/services/spree_cm_commissioner/check_ins/create_bulk.rb
 - app/services/spree_cm_commissioner/check_ins/destroy_bulk.rb
 - app/services/spree_cm_commissioner/checkout/advance_decorator.rb