spree_cm_commissioner 2.12.2 → 2.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518b50594502cdd95eb7710824cb6f8a104974d44e9602f2babb3235bcc17559
-  data.tar.gz: 4906dc6a8f57707ebf5fcb9712b6a074bbef1af0437e14923f61f2ff6606c32e
+  metadata.gz: f4502090937a0e1728668be217bf74bf24b37a424b3b412c1df11e061e72268c
+  data.tar.gz: bca33ab83038577e339e01d24cc008c48d71e3af09a3131aa102f35d70433644
 SHA512:
-  metadata.gz: 67a54630258eda9e5bf72e26ce22177d6b1ce8da399d71434319403f1df8d4a71469ec115f7015b7b9064544688fe833f3230329e456e09eeb88b4f8a488212c
-  data.tar.gz: 6aa524ac8653f151fd629c4bef58258212ee3eb67f5f1bba328f7e3e964c4efb9f67ec9692c359c80f4b2d8abac088541b7b692503d02bb8afecedc21e550072
+  metadata.gz: ca38d3fff9dd926ed84e6bf3ff0565d9af7b8fa6e816448b386fb460a757fdb7b31788dab65d287bedcaba869cd47b4351960bb8ddf0eef86c05caf3db118257
+  data.tar.gz: ea4d544a09afe3fe32fce93f52587ffd1b25c0cf986c2ec94a291a2e07e2744d674acb6ef6c0c6a2886303360318d9b9f0d3cfabc2427a6fe775b7e025313e49

data/Gemfile.lock

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

data/app/controllers/spree/admin/inventory_lock_movements_controller.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Admin
+    # Read-only history of InventoryItems::MoveToLocked for one product — kept on its own page,
+    # separate from InventoryLocksController, so changing a lock and auditing past changes don't
+    # compete for space on one screen.
+    class InventoryLockMovementsController < Spree::Admin::ResourceController
+      skip_before_action :load_resource
+
+      before_action :load_parent
+
+      # GET /admin/products/:product_id/inventory_lock_movements
+      def index
+        # Not scoped to `active` inventory items — a movement stays visible after its date has
+        # passed, since the question "who locked this and when" doesn't expire with the stock.
+        @lock_movements = SpreeCmCommissioner::InventoryLockMovement
+                          .where(inventory_item: @product.inventory_items)
+                          .includes(:created_by, inventory_item: { variant: { option_values: :option_type } })
+                          .order(created_at: :desc)
+                          .page(params[:page]).per(50)
+      end
+
+      private
+
+      def load_parent
+        @product = Spree::Product.find_by(slug: params[:product_id])
+        return if @product
+
+        flash[:error] = t('spree.admin.inventory_locks.create.product_not_found')
+        redirect_to spree.admin_products_path
+      end
+
+      def model_class
+        SpreeCmCommissioner::InventoryLockMovement
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/inventory_locks_controller.rb

@@ -11,6 +11,8 @@ module Spree
     # product, calls it, and turns its named failures into flash messages.
     #
     class InventoryLocksController < Spree::Admin::ResourceController
+      helper SpreeCmCommissioner::Admin::InventoryLocksHelper
+
       skip_before_action :load_resource
 
       before_action :load_parent
@@ -71,7 +73,8 @@ module Spree
         SpreeCmCommissioner::InventoryItems::MoveToLocked.call(
           inventory_item: inventory_item,
           quantity: params[:quantity],
-          caller_source: "#{self.class.name}#create"
+          caller_source: "#{self.class.name}#create",
+          user: try_spree_current_user
         )
       end
 

data/app/controllers/spree/admin/private_sales_controller.rb

@@ -8,6 +8,8 @@ module Spree
     # allotment is actually set up now that the products are known.
     #
     class PrivateSalesController < Spree::Admin::ResourceController
+      helper SpreeCmCommissioner::Admin::InventoryLocksHelper
+
       # Also on update: ResourceController re-renders :edit when validation fails, and the stock
       # partial reads these ivars — without this a rejected save is a 500 instead of a form.
       before_action :load_stock_rows, only: %i[edit update]

data/app/helpers/spree_cm_commissioner/admin/inventory_locks_helper.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module Admin
+    module InventoryLocksHelper
+      # Share of this date's capacity still on public sale.
+      #
+      # max_capacity is the right denominator because MoveToLocked only ever moves units BETWEEN
+      # quantity_available and quantity_locked — it never touches max_capacity — so this figure falls
+      # by exactly what an operator withholds.
+      #
+      # nil when there is nothing to divide by, so the caller renders a dash instead of a 0% that
+      # would read as "sold out" on a date that simply has no stock configured.
+      def available_capacity_percentage(inventory_item)
+        return nil if inventory_item.nil?
+
+        capacity = inventory_item.max_capacity.to_i
+        return nil if capacity.zero?
+
+        (inventory_item.quantity_available.to_f / capacity * 100).round
+      end
+
+      # High/medium/low as risk of running out of public stock, not as a grade — a bare number in a
+      # dense table doesn't say whether 22% is fine or a problem, so the color carries that instead.
+      # Reuses the badge-success/warning/danger classes already styled for this admin (see
+      # gems/spree_backend's _badges.scss) rather than introducing new color tokens.
+      def availability_percentage_badge_class(percentage)
+        return 'badge-danger' if percentage <= 20
+        return 'badge-warning' if percentage <= 50
+
+        'badge-success'
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/inventory_holds/bulk_release_stale_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   module InventoryHolds
     class BulkReleaseStaleJob < SpreeCmCommissioner::ApplicationJob
-      queue_as :inventory_hold
+      queue_as :inventory_item
 
       def perform
         SpreeCmCommissioner::InventoryHolds::BulkReleaseStale.call!

data/app/jobs/spree_cm_commissioner/inventory_holds/bulk_release_stale_payment_locked_job.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   module InventoryHolds
     class BulkReleaseStalePaymentLockedJob < SpreeCmCommissioner::ApplicationJob
-      queue_as :inventory_hold
+      queue_as :inventory_item
 
       def perform
         SpreeCmCommissioner::InventoryHolds::BulkReleaseStalePaymentLocked.call!

data/app/jobs/spree_cm_commissioner/inventory_holds/release_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     # Primary release for :active holds. Scheduled at hold creation (wait_until: expires_at).
     # Safety net: BulkReleaseStaleJob catches any active holds this job misses.
     class ReleaseJob < SpreeCmCommissioner::ApplicationJob
-      queue_as :inventory_hold
+      queue_as :inventory_item
 
       def perform(options = {})
         hold = SpreeCmCommissioner::InventoryHold.find(options[:hold_id])

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_by_variant_job.rb

@@ -1,6 +1,8 @@
 module SpreeCmCommissioner
   module InventoryItems
     class BulkAdjustQuantitiesByVariantJob < ApplicationUniqueJob
+      queue_as :inventory_item
+
       def perform(options = {})
         variant = Spree::Variant.find_by(id: options[:variant_id])
 

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_job.rb

@@ -3,6 +3,8 @@ module SpreeCmCommissioner
     class BulkAdjustQuantitiesJob < ApplicationUniqueJob
       include SpreeCmCommissioner::IdempotentJob
 
+      queue_as :inventory_item
+
       def perform(options = {})
         with_idempotency(idempotency_key_for(options)) do
           bulk_adjust_quantities!(options)

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert_job.rb

@@ -0,0 +1,47 @@
+module SpreeCmCommissioner
+  module InventoryItems
+    class BulkAdjustQuantitiesOnConvertJob < ApplicationUniqueJob
+      include SpreeCmCommissioner::IdempotentJob
+
+      queue_as :inventory_item
+
+      def perform(options = {})
+        with_idempotency(idempotency_key_for(options)) do
+          bulk_adjust_quantities_on_convert(options)
+        end
+      end
+
+      private
+
+      # Dedup on the order + the exact adjustment set, same shape as BulkAdjustQuantitiesOnHoldJob.
+      # An explicit key wins; with no order_id we fall back to the per-enqueue job_id (returning
+      # nil lets with_idempotency apply that default).
+      def idempotency_key_for(options)
+        return options[:idempotency_key] if options[:idempotency_key].present?
+        return nil if options[:order_id].blank?
+
+        "order:#{options[:order_id]}:convert:#{adjustments_fingerprint(options[:inventory_id_and_quantities])}"
+      end
+
+      # Readable, order-independent fingerprint of the adjustment payload, e.g. "1=2,2=-1:locked".
+      def adjustments_fingerprint(adjustments)
+        Array(adjustments)
+          .map { |adj| adj.with_indifferent_access.values_at(:inventory_id, :quantity, :locked) }
+          .sort_by { |inventory_id, quantity, locked| [inventory_id.to_s, quantity.to_s, locked.to_s] }
+          .map { |inventory_id, quantity, locked| locked ? "#{inventory_id}=#{quantity}:locked" : "#{inventory_id}=#{quantity}" }
+          .join(',')
+      end
+
+      # :order_id, :inventory_id_and_quantities, :caller_source
+      def bulk_adjust_quantities_on_convert(options = {})
+        raise ArgumentError, 'order_id is required' if options[:order_id].blank?
+        raise ArgumentError, 'inventory_id_and_quantities is required' if options[:inventory_id_and_quantities].blank?
+
+        SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnConvert.call(
+          inventory_id_and_quantities: options[:inventory_id_and_quantities],
+          caller_source: options[:caller_source]
+        )
+      end
+    end
+  end
+end

data/app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold_job.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     class BulkAdjustQuantitiesOnHoldJob < ApplicationUniqueJob
       include SpreeCmCommissioner::IdempotentJob
 
-      queue_as :default
+      queue_as :inventory_item
 
       def perform(options = {})
         with_idempotency(idempotency_key_for(options)) do

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -20,6 +20,8 @@ module SpreeCmCommissioner
     # not re-query a already-loaded association.
     has_many :locked_reserved_blocks, -> { locked }, class_name: 'SpreeCmCommissioner::ReservedBlock', inverse_of: :inventory_item
 
+    has_many :lock_movements, class_name: 'SpreeCmCommissioner::InventoryLockMovement', inverse_of: :inventory_item
+
     # Validation
     validates :quantity_available, numericality: { greater_than_or_equal_to: 0 }
     validates :quantity_on_hold, numericality: { greater_than_or_equal_to: 0 }
@@ -120,8 +122,11 @@ module SpreeCmCommissioner
         self.quantity_available = quantity_available + quantity
         save!
 
-        # When user has been searched or booked a product, it has cached the quantity in redis,
-        # So we need to update redis cache if inventory key has been created in redis
+        # Deliberately still inside with_lock, unlike the checkout-path deductors (e.g.
+        # InventoryItems::BulkAdjustQuantities): this is a rare admin-only edit, not a
+        # high-contention hot path, so keeping it in the same transaction as `save!` means a
+        # Redis failure rolls the DB change back too, instead of leaving the DB and Redis counts
+        # out of sync with nothing to reconcile them.
         adjust_quantity_in_redis(quantity)
       end
     end

data/app/models/spree_cm_commissioner/inventory_lock_movement.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  # An immutable ledger row for one InventoryItems::MoveToLocked call — the audit trail that pool
+  # transfer otherwise leaves no trace of. See docs/concepts/locked-stock-flow.md.
+  class InventoryLockMovement < Base
+    belongs_to :inventory_item, class_name: 'SpreeCmCommissioner::InventoryItem'
+    belongs_to :created_by, class_name: 'Spree::User', optional: true
+
+    validates :quantity, numericality: { other_than: 0 }
+
+    # Matches Spree::StockMovement's own immutability guard — an audit ledger that can be edited
+    # after the fact isn't an audit ledger.
+    def readonly?
+      persisted?
+    end
+
+    def locked?
+      quantity.positive?
+    end
+  end
+end

data/app/overrides/spree/admin/shared/_product_tabs/clock_history.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_after "erb[silent]:contains('Spree::Digital')" -->
+
+<%= content_tag :li, class: 'nav-item' do %>
+  <%= link_to_with_icon 'clock-history.svg',
+    t('spree.admin.inventory_lock_movements.tab'),
+    admin_product_inventory_lock_movements_url(@product),
+    class: "nav-link #{'active' if current == :inventory_lock_movements}" %>
+<% end %>

data/app/services/spree_cm_commissioner/events/publish_stock_statuses_to_firestore.rb

@@ -21,8 +21,10 @@ module SpreeCmCommissioner
 
       # The complete set of stock-status buckets this service can publish — listed in the order
       # `bucket_stock_status` checks them (most-depleted first), so the full state space is visible
-      # here without reading every branch. Each has a translation at config/locales/*.yml#stock_status
-      # except IN_STOCK, which intentionally has none — see `localized_message`.
+      # here without reading every branch. SOLD_OUT and PENDING_HOLD have a translation at
+      # config/locales/*.yml#stock_status; IN_STOCK and LOW_STOCK intentionally have none — the
+      # low-stock message is disabled for now, so that status still publishes but with a nil
+      # message, same as IN_STOCK — see `localized_message`.
       SOLD_OUT = :sold_out
       PENDING_HOLD = :pending_hold
       LOW_STOCK = :low_stock
@@ -170,9 +172,11 @@ module SpreeCmCommissioner
       end
 
       # Bucket transitions always count; a same-bucket change only counts while LOW_STOCK (the one
-      # bucket whose Firestore payload shows an exact "N left" count) AND the quantity actually
-      # differs from what's already stored — otherwise a poll tick that finds truly nothing new
-      # would still write every live event's every product on every cycle.
+      # bucket whose raw `quantity_available`/`quantity_on_hold` fields still move meaningfully
+      # within the bucket, even though its `message` is nil like IN_STOCK's — see
+      # `localized_message`) AND the quantity actually differs from what's already stored —
+      # otherwise a poll tick that finds truly nothing new would still write every live event's
+      # every product on every cycle.
       def changed?(existing_entry, status, available, on_hold)
         existing_entry ||= {}
         previous_status = existing_entry['status']&.to_sym
@@ -196,14 +200,12 @@ module SpreeCmCommissioner
 
       # Pre-translated, per-locale copy baked in at publish time — see
       # config/locales/*.yml#stock_status. nil for in_stock: the design has no badge for the common
-      # case, and omitting the field is what tells the client that directly.
-      #
-      # low_stock interpolates `available` into the translation (`%{count}`, pluralized) so the
-      # exact "N left" pill text is built once here rather than duplicated client-side from the
-      # bare `quantity_available` field — the client just displays this string verbatim (see
+      # case, and omitting the field is what tells the client that directly. Also nil for low_stock
+      # for now — the "N left" pill text is disabled; clients fall back to their own generic
+      # "Available" copy when message is nil for that status (see
       # `cm_ticket_availability_card.dart`'s `_StatusDisplay._label`).
       def localized_message(status, available)
-        return nil if status == IN_STOCK
+        return nil if [IN_STOCK, LOW_STOCK].include?(status)
 
         I18n.available_locales.index_with do |locale|
           I18n.t("stock_status.#{status}", count: available, locale: locale)

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

@@ -14,8 +14,8 @@ module SpreeCmCommissioner
 
           unless hold.finalized?
             hold.update!(status: :converted)
-            clear_hold_redis!(order)
-            enqueue_sync_inventory_on_hold(order)
+            convert_hold_redis!(order)
+            enqueue_sync_inventory(order)
           end
         end
 
@@ -28,8 +28,19 @@ module SpreeCmCommissioner
 
       private
 
-      def clear_hold_redis!(order)
-        keys = []
+      # Moves a held unit to a permanent sale by decrementing the hold counter AND the stock
+      # counter together, in one atomic Lua call. These used to be two separate Redis round trips
+      # (hold decrement here, stock decrement in RedisStock::Unstock, called a moment later from
+      # OrderStateMachine#unstock_inventory!) — a concurrent Acquire could read Redis in the gap
+      # between them and see the hold count already down but the stock count not yet down, i.e. a
+      # phantom unit of "available" capacity that was never actually freed, letting one order too
+      # many acquire a hold.
+      #
+      # RedisStock::Unstock skips any line item that should_hold_inventory? for exactly this reason
+      # — this method is now the only place their stock key gets decremented.
+      def convert_hold_redis!(order)
+        stock_keys = []
+        hold_keys = []
         quantities = []
         warmable_items = []
 
@@ -42,34 +53,44 @@ module SpreeCmCommissioner
 
           # Skip .active scope: holds on past-dated items must also be cleared (e.g. delayed conversion after trip date).
           li.inventory_items.each do |item|
-            keys << item.redis_hold_key(locked: locked)
+            stock_keys << item.redis_key(locked: locked)
+            hold_keys << item.redis_hold_key(locked: locked)
             quantities << li.quantity
             warmable_items << item
           end
         end
 
-        return if keys.empty?
-
-        clear_hold_lua_script = <<~LUA
-          local keys = KEYS
-          local quantities = ARGV
-          for i, key in ipairs(keys) do
-            redis.call('DECRBY', key, tonumber(quantities[i]))
-          end
-          return 1
-        LUA
+        return if hold_keys.empty?
 
         SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(warmable_items).call
+
+        interleaved_keys = stock_keys.zip(hold_keys).flatten
         SpreeCmCommissioner.inventory_redis_pool.with do |redis|
-          redis.eval(clear_hold_lua_script, keys: keys, argv: quantities)
+          redis.eval(convert_hold_lua_script, keys: interleaved_keys, argv: quantities)
         end
       end
 
-      def enqueue_sync_inventory_on_hold(order)
-        inventory_id_and_quantities = order.line_items.flat_map do |line_item|
+      def convert_hold_lua_script
+        <<~LUA
+          -- KEYS = [stock_key_1, hold_key_1, stock_key_2, hold_key_2, ...]
+          -- ARGV = [qty_1, qty_2, ...]
+          for i = 1, #ARGV do
+            redis.call('DECRBY', KEYS[(i-1)*2+1], tonumber(ARGV[i]))
+            redis.call('DECRBY', KEYS[(i-1)*2+2], tonumber(ARGV[i]))
+          end
+          return 1
+        LUA
+      end
+
+      # Keeps the DB mirrors in sync with both halves of convert_hold_redis! (quantity_on_hold drops
+      # because the hold is gone, quantity_available drops because the unit is permanently sold) via
+      # ONE job that applies both under a single row lock per item — see
+      # InventoryItems::BulkAdjustQuantitiesOnConvert for why this isn't the usual two separate jobs.
+      def enqueue_sync_inventory(order)
+        adjustments = order.line_items.flat_map do |line_item|
           next [] unless line_item.should_hold_inventory?
 
-          # Skip .active scope for the same reason as clear_hold_redis!.
+          # Skip .active scope for the same reason as convert_hold_redis!.
           line_item.inventory_items.map do |inventory_item|
             {
               inventory_id: inventory_item.id,
@@ -79,12 +100,12 @@ module SpreeCmCommissioner
           end
         end
 
-        return if inventory_id_and_quantities.blank?
+        return if adjustments.blank?
 
-        SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHoldJob.perform_later(
+        SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnConvertJob.perform_later(
           order_id: order.id,
-          caller_source: "#{self.class.name}#enqueue_sync_inventory_on_hold",
-          inventory_id_and_quantities: inventory_id_and_quantities
+          caller_source: "#{self.class.name}#enqueue_sync_inventory",
+          inventory_id_and_quantities: adjustments
         )
       end
     end

data/app/services/spree_cm_commissioner/inventory_items/adjust_available_quantity.rb

@@ -37,27 +37,32 @@ module SpreeCmCommissioner
         # thing RedisStock::Unstock and InventoryHolds::Convert do before their own Lua scripts.
         warm_redis_key!(inventory_item) if warm_redis
 
+        before = after = nil
+
         apply = lambda do
           before = inventory_item.quantity_available
           after = before + delta
 
           inventory_item.update!(quantity_available: after)
           inventory_item.adjust_quantity_in_redis(delta)
-
-          CmAppLogger.log(
-            label: "#{self.class.name}#call",
-            data: {
-              caller_source: caller_source,
-              inventory_item_id: inventory_item.id,
-              quantity_available_before: before,
-              delta: delta,
-              quantity_available_after: after
-            }
-          )
         end
 
         lock ? inventory_item.with_lock(&apply) : apply.call
 
+        # Logged after the lock releases: I/O here would otherwise extend how long the row's
+        # SELECT ... FOR UPDATE is held under high-traffic contention (this also covers
+        # Seats::LockBlocks/UnlockBlocks, which call in with lock: false while already holding it).
+        CmAppLogger.log(
+          label: "#{self.class.name}#call",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            quantity_available_before: before,
+            delta: delta,
+            quantity_available_after: after
+          }
+        )
+
         success(inventory_item)
       rescue ActiveRecord::RecordInvalid => e
         CmAppLogger.error(

data/app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities.rb

@@ -49,25 +49,29 @@ module SpreeCmCommissioner
         # 1. with_lock (Pessimistic): SELECT ... FOR UPDATE prevents concurrent writes
         # 2. lock_version (Optimistic): Catches race conditions if row is modified between
         #    SELECT and UPDATE (e.g., admin adjusts stock while job runs)
+        before = after = nil
+
         inventory_item.with_lock do
           before = inventory_item[column]
           after = before + quantity
 
-          CmAppLogger.log(
-            label: "#{self.class.name}#adjust_quantity_available",
-            data: {
-              caller_source: caller_source,
-              inventory_item_id: inventory_item.id,
-              locked: locked,
-              column: column,
-              quantity_available_before: before,
-              delta: quantity,
-              quantity_available_after: after
-            }
-          )
-
           inventory_item.update!(column => after)
         end
+
+        # Logged after the lock releases: I/O here would otherwise extend how long the row's
+        # SELECT ... FOR UPDATE is held under high-traffic contention.
+        CmAppLogger.log(
+          label: "#{self.class.name}#adjust_quantity_available",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            locked: locked,
+            column: column,
+            quantity_available_before: before,
+            delta: quantity,
+            quantity_available_after: after
+          }
+        )
       rescue ActiveRecord::RecordInvalid
         CmAppLogger.error(
           label: "#{self.class.name}#adjust_quantity_available failed",

data/app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert.rb

@@ -0,0 +1,96 @@
+module SpreeCmCommissioner
+  module InventoryItems
+    # DB mirror of InventoryHolds::Convert#convert_hold_redis!: applies the same delta to
+    # quantity_on_hold and quantity_available together, under ONE row lock per inventory item.
+    # Doing this as two separate jobs (BulkAdjustQuantitiesOnHoldJob + BulkAdjustQuantitiesJob),
+    # each locking and saving independently, left a window between the two locks where a reader
+    # could see one column updated and the other not yet — the same class of gap that made the
+    # Redis side non-atomic. One lock, one update, removes that window on the DB side too.
+    class BulkAdjustQuantitiesOnConvert
+      prepend ::Spree::ServiceModule::Base
+      extend SpreeCmCommissioner::ServiceModuleThrowable
+
+      def call(inventory_id_and_quantities:, caller_source: nil)
+        CmAppLogger.log(
+          label: "#{self.class.name}#call started",
+          data: { caller_source: caller_source, inventory_id_and_quantities: inventory_id_and_quantities }
+        )
+
+        ActiveRecord::Base.transaction do
+          items_by_id = inventory_items(inventory_id_and_quantities).index_by(&:id)
+
+          grouped_deltas(inventory_id_and_quantities).each do |(inventory_id, locked), quantity|
+            inventory_item = items_by_id[inventory_id]
+            next if inventory_item.nil?
+
+            adjust_quantities(inventory_item, quantity, caller_source, locked: locked)
+          end
+        end
+
+        success(nil)
+      end
+
+      private
+
+      # Grouped by pool flag as well as by item, same as BulkAdjustQuantities/OnHold: a mixed cart
+      # can carry a public and a locked adjustment for the same inventory item in one payload.
+      def grouped_deltas(inventory_id_and_quantities)
+        inventory_id_and_quantities
+          .group_by { |entry| [entry[:inventory_id], entry[:locked] || false] }
+          .transform_values { |entries| entries.sum { |entry| entry[:quantity] } }
+      end
+
+      def adjust_quantities(inventory_item, quantity, caller_source, locked: false)
+        available_column = locked ? :quantity_locked : :quantity_available
+        hold_column = locked ? :quantity_locked_on_hold : :quantity_on_hold
+
+        before_available = before_hold = after_available = after_hold = nil
+
+        # IMPORTANT: Apply both quantity changes directly without defensive clamping — model
+        # validation surfaces bugs in upstream Redis deduction logic rather than hiding them.
+        inventory_item.with_lock do
+          before_available = inventory_item[available_column]
+          before_hold = inventory_item[hold_column]
+          after_available = before_available + quantity
+          after_hold = before_hold + quantity
+
+          inventory_item.update!(available_column => after_available, hold_column => after_hold)
+        end
+
+        CmAppLogger.log(
+          label: "#{self.class.name}#adjust_quantities",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            locked: locked,
+            available_column: available_column,
+            quantity_available_before: before_available,
+            quantity_available_after: after_available,
+            hold_column: hold_column,
+            quantity_on_hold_before: before_hold,
+            quantity_on_hold_after: after_hold,
+            delta: quantity
+          }
+        )
+      rescue ActiveRecord::RecordInvalid
+        CmAppLogger.error(
+          label: "#{self.class.name}#adjust_quantities failed",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            locked: locked,
+            delta: quantity,
+            quantity_available_current: inventory_item[available_column],
+            quantity_on_hold_current: inventory_item[hold_column],
+            errors: inventory_item.errors.full_messages
+          }
+        )
+        raise
+      end
+
+      def inventory_items(inventory_id_and_quantities)
+        SpreeCmCommissioner::InventoryItem.where(id: inventory_id_and_quantities.pluck(:inventory_id)).includes(variant: :product)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold.rb

@@ -55,25 +55,29 @@ module SpreeCmCommissioner
         # 1. with_lock (Pessimistic): SELECT ... FOR UPDATE prevents concurrent writes
         # 2. lock_version (Optimistic): Catches race conditions if row is modified between
         #    SELECT and UPDATE (e.g., admin adjusts stock while job runs)
+        before = after = nil
+
         inventory_item.with_lock do
           before = inventory_item[column]
           after = before + quantity
 
-          CmAppLogger.log(
-            label: "#{self.class.name}#adjust_quantity_on_hold",
-            data: {
-              caller_source: caller_source,
-              inventory_item_id: inventory_item.id,
-              locked: locked,
-              column: column,
-              quantity_on_hold_before: before,
-              delta: quantity,
-              quantity_on_hold_after: after
-            }
-          )
-
           inventory_item.update!(column => after)
         end
+
+        # Logged after the lock releases: I/O here would otherwise extend how long the row's
+        # SELECT ... FOR UPDATE is held under high-traffic contention.
+        CmAppLogger.log(
+          label: "#{self.class.name}#adjust_quantity_on_hold",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            locked: locked,
+            column: column,
+            quantity_on_hold_before: before,
+            delta: quantity,
+            quantity_on_hold_after: after
+          }
+        )
       rescue ActiveRecord::RecordInvalid
         CmAppLogger.error(
           label: "#{self.class.name}#adjust_quantity_on_hold failed",

data/app/services/spree_cm_commissioner/inventory_items/move_to_locked.rb

@@ -16,7 +16,7 @@ module SpreeCmCommissioner
       prepend ::Spree::ServiceModule::Base
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
-      def call(inventory_item:, quantity:, caller_source: nil)
+      def call(inventory_item:, quantity:, caller_source: nil, user: nil)
         quantity = quantity.to_i
         return failure(nil, :invalid_quantity) if quantity.zero?
 
@@ -32,7 +32,7 @@ module SpreeCmCommissioner
         # moved. The savepoint makes the rollback real wherever this is called from.
         inventory_item.transaction(requires_new: true) do
           inventory_item.lock!
-          outcome = transfer!(inventory_item, quantity, caller_source)
+          outcome = transfer!(inventory_item, quantity, caller_source, user)
           raise ActiveRecord::Rollback unless outcome == :moved
         end
 
@@ -45,7 +45,7 @@ module SpreeCmCommissioner
       private
 
       # Runs inside the locked transaction. Returns the outcome symbol.
-      def transfer!(inventory_item, quantity, caller_source)
+      def transfer!(inventory_item, quantity, caller_source, user)
         new_locked = inventory_item.quantity_locked + quantity
         return :quantity_exceeds_lock if new_locked.negative?
 
@@ -67,11 +67,24 @@ module SpreeCmCommissioner
 
         return insufficient_stock_reason(quantity) unless move_stock_in_redis(inventory_item, quantity)
 
+        # Inside the same savepoint as the row update above, so a later failure in this same call would
+        # roll this row back with it — the ledger can never disagree with quantity_locked.
+        create_movement!(inventory_item, quantity, caller_source, user)
         log_adjustment(inventory_item, quantity, caller_source)
 
         :moved
       end
 
+      # The one durable record of this transfer — CmAppLogger below is a log line, not a queryable row.
+      def create_movement!(inventory_item, quantity, caller_source, user)
+        inventory_item.lock_movements.create!(
+          quantity: quantity,
+          quantity_locked_after: inventory_item.quantity_locked,
+          created_by: user,
+          caller_source: caller_source
+        )
+      end
+
       # Both pools as Redis currently holds them, SET-NX'd from the row where a key was cold.
       def warm_pools(inventory_item)
         SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new([inventory_item]).call.first

data/app/services/spree_cm_commissioner/redis_stock/unstock.rb

@@ -12,6 +12,10 @@ module SpreeCmCommissioner
         warmable_items = []
 
         line_items.each do |li|
+          # Already deducted on convert (InventoryHolds::Convert#convert_hold_redis!), so no need to
+          # deduct again here.
+          next if li.should_hold_inventory?
+
           # Each line item deducts from its own pool: a locked-stock line was never counted in public
           # stock, so unstocking it there would either fail the Lua guard on a paid order or, where
           # public stock happens to cover it, oversell silently.

data/app/views/spree/admin/inventory_lock_movements/index.html.erb

@@ -0,0 +1,43 @@
+<%# current: :inventory_lock_movements deliberately matches no tab — this is its own page, not a
+    sub-view of Stock Managements, so nothing in the tab bar should light up as if it were. %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :inventory_lock_movements } %>
+
+<h1 class="mb-3"><%= t('.title') %></h1>
+
+<div class="bg-white border rounded table-responsive">
+  <table class="table">
+    <thead class="text-muted">
+      <tr>
+        <th><%= Spree.t(:variant) %></th>
+        <th><%= Spree.t(:date) %></th>
+        <th class="text-right"><%= t('.quantity') %></th>
+        <th class="text-right"><%= t('.locked') %></th>
+        <th><%= t('.by') %></th>
+        <th><%= t('.at') %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% if @lock_movements.empty? %>
+        <tr>
+          <td colspan="6" class="text-center text-muted"><%= t('.no_movements') %></td>
+        </tr>
+      <% else %>
+        <% @lock_movements.each do |movement| %>
+          <% item = movement.inventory_item %>
+          <tr>
+            <td><%= item.variant.sku_and_options_text %></td>
+            <td><%= item.inventory_date %></td>
+            <td class="text-right <%= movement.locked? ? 'text-success' : 'text-danger' %>">
+              <%= movement.locked? ? "+#{movement.quantity}" : movement.quantity %>
+            </td>
+            <td class="text-right"><%= movement.quantity_locked_after %></td>
+            <td><%= movement.created_by&.email || t('.system') %></td>
+            <td><%= movement.created_at.strftime('%d %b %H:%M:%S') %></td>
+          </tr>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @lock_movements, theme: 'admin-twitter-bootstrap-4' %>
+</div>

data/app/views/spree/admin/inventory_locks/index.html.erb

@@ -34,7 +34,8 @@
             <small class="form-text text-muted"><%= t('.quantity_hint') %></small>
           </div>
 
-          <%= submit_tag t('.apply'), class: 'btn btn-primary' %>
+          <%= submit_tag t('.apply'), class: 'btn btn-primary',
+                data: { confirm: @product.permanent_stock? ? t('.apply_confirm_per_date') : t('.apply_confirm') } %>
         <% end %>
       </div>
     </div>
@@ -47,6 +48,8 @@
       <tr>
         <th><%= Spree.t(:variant) %></th>
         <th><%= Spree.t(:date) %></th>
+        <%# The denominator behind the "% left" figure in the Available column. %>
+        <th class="text-right"><%= t('.max_capacity') %></th>
         <th class="text-right"><%= t('.public_available') %></th>
         <th class="text-right"><%= t('.locked') %></th>
         <%# In an agent's cart right now. Without this column, a refused release looks arbitrary. %>
@@ -58,7 +61,8 @@
         <tr>
           <td><%= item.variant.sku_and_options_text %></td>
           <td><%= item.inventory_date %></td>
-          <td class="text-right"><%= item.quantity_available %></td>
+          <td class="text-right text-muted"><%= item.max_capacity %></td>
+          <td class="text-right"><%= render partial: 'spree/admin/shared/availability_percentage', locals: { inventory_item: item } %></td>
           <td class="text-right"><strong><%= item.quantity_locked %></strong></td>
           <td class="text-right"><%= item.quantity_locked_on_hold %></td>
         </tr>

data/app/views/spree/admin/private_sales/_form.html.erb

@@ -21,6 +21,7 @@
         data: {
           autocomplete_url_value: 'products_api_v2',
           autocomplete_multiple_value: true,
+          autocomplete_search_query_value: 'name_or_slug_i_cont',
           autocomplete_placeholder_value: t('.products_placeholder')
         } %>
   <small class="form-text text-muted"><%= t('.products_hint') %></small>

data/app/views/spree/admin/private_sales/_stock.html.erb

@@ -16,32 +16,51 @@
 <% else %>
   <p class="text-muted small"><%= t('.hint') %></p>
 
-  <% @private_sale.product_ids.each do |product_id| %>
-    <% product = @products_by_id[product_id] %>
-    <% next if product.nil? %>
+  <%# One shared table for every product, not one table per product: separate tables each size their
+      own columns from their own content, so the same column (e.g. Max capacity) lands at a different
+      x-position under every product — misaligned the moment two products' SKUs differ in length. A
+      product is a header row inside this table instead of its own card, so every row shares one set
+      of column widths. %>
+  <div class="bg-white border rounded table-responsive">
+    <table class="table mb-0">
+      <thead class="text-muted">
+        <tr>
+          <%# Same wording as the product's Stock screen, which names the columns after the data they
+              hold. Two screens showing the same numbers under different names is how an operator ends
+              up mistrusting both. %>
+          <th><%= Spree.t(:variant) %></th>
+          <th class="text-center"><%= t('.max_capacity') %></th>
+          <th class="text-center"><%= t('.quantity_available') %></th>
+          <th class="text-center"><%= t('.quantity_locked') %></th>
+          <th class="text-center"><%= t('.quantity_locked_on_hold') %></th>
+          <th class="text-center"><%= t('.lock_release') %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @private_sale.product_ids.each do |product_id| %>
+          <% product = @products_by_id[product_id] %>
+          <% next if product.nil? %>
 
-    <div class="card mb-3">
-      <div class="card-header d-flex justify-content-between align-items-center">
-        <strong><%= product.name %></strong>
-        <%= link_to t('.manage_product_stock'), admin_product_stock_managements_path(product),
-              class: 'btn btn-sm btn-outline-secondary' %>
-      </div>
-
-      <table class="table mb-0">
-        <thead class="text-muted">
-          <tr>
-            <%# Same wording as the product's Stock screen, which names the columns after the data
-                they hold. Two screens showing the same numbers under different names is how an
-                operator ends up mistrusting both. %>
-            <th><%= Spree.t(:variant) %></th>
-            <th class="text-center"><%= t('.max_capacity') %></th>
-            <th class="text-center"><%= t('.quantity_available') %></th>
-            <th class="text-center"><%= t('.quantity_locked') %></th>
-            <th class="text-center"><%= t('.quantity_locked_on_hold') %></th>
-            <th class="text-center"><%= t('.lock_release') %></th>
+          <tr class="bg-light">
+            <td colspan="6"><strong><%= product.name %></strong></td>
+            <td class="text-right">
+              <%# Own column so these line up under the same x-position for every product, rather than
+                  sharing space with the name — icon-only, matching the with-tip pattern used for row
+                  actions elsewhere in this admin (e.g. import_existing_orders#index). Regardless of
+                  stock type — the per-date link below only appears for permanent-stock products with
+                  no undated row, but every product's lock/release history lives here. %>
+              <%= link_to admin_product_inventory_lock_movements_path(product),
+                    class: 'btn btn-sm btn-outline-secondary with-tip icon-link', title: t('.lock_history') do %>
+                <%= svg_icon name: 'clock-history.svg', width: '14', height: '14' %>
+              <% end %>
+              <%= link_to admin_product_stock_managements_path(product),
+                    class: 'btn btn-sm btn-outline-secondary with-tip icon-link', title: t('.manage_product_stock') do %>
+                <%= svg_icon name: 'box-seam.svg', width: '14', height: '14' %>
+              <% end %>
+            </td>
           </tr>
-        </thead>
-        <tbody>
+
           <% (@variants_by_product[product_id] || []).each do |variant| %>
             <% item = @inventory_item_by_variant[variant.id] %>
             <tr class="<%= 'text-muted' if item.nil? || item.quantity_locked.zero? %>">
@@ -50,12 +69,12 @@
               <% if item.nil? %>
                 <%# No undated row means this product's stock is per date — hundreds of rows a single
                     input cannot express. Those are managed on the product's own screen. %>
-                <td colspan="5" class="text-center text-muted">
+                <td colspan="6" class="text-center text-muted">
                   <%= link_to t('.per_date_stock'), admin_product_inventory_locks_path(product) %>
                 </td>
               <% else %>
                 <td class="text-center text-muted"><%= item.max_capacity %></td>
-                <td class="text-center"><%= item.quantity_available %></td>
+                <td class="text-center"><%= render partial: 'spree/admin/shared/availability_percentage', locals: { inventory_item: item } %></td>
                 <td class="text-center"><strong><%= item.quantity_locked %></strong></td>
                 <td class="text-center"><%= item.quantity_locked_on_hold %></td>
                 <td class="text-center">
@@ -73,11 +92,12 @@
                     <% end %>
                   </div>
                 </td>
+                <td></td>
               <% end %>
             </tr>
           <% end %>
-        </tbody>
-      </table>
-    </div>
-  <% end %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% end %>

data/app/views/spree/admin/shared/_availability_percentage.html.erb

@@ -0,0 +1,18 @@
+<%# Public quantity available, with a small color-coded badge next to it for what share of capacity
+    that represents — red/yellow/green by high/medium/low, so an operator scanning a table of dates
+    spots the ones worth a second look without reading every number.
+
+    Sized down via inline style rather than a new CSS class: Bootstrap's default .badge already reads
+    as a chunky block, and this admin already sizes one-off controls this way (e.g. the width on the
+    +/- input groups in this same directory).
+
+    Shared by the product's lock screen and the private sale's stock table so it never renders two
+    different ways on two screens an operator compares side by side. %>
+<% percentage = available_capacity_percentage(inventory_item) %>
+
+<%= inventory_item.quantity_available %>
+<% if percentage %>
+  <span class="badge <%= availability_percentage_badge_class(percentage) %> ml-1" style="font-size: 0.7em; padding: 0.2em 0.45em;">
+    <%= percentage %>%
+  </span>
+<% end %>

data/config/locales/en.yml

@@ -597,6 +597,7 @@ en:
           quantity_locked_on_hold: "Quantity locked on hold"
           lock_release: "Lock (+) / Release (−)"
           manage_product_stock: "Product stock"
+          lock_history: "Lock history"
           per_date_stock: "This product's stock is per date — manage it on the product"
         revoke:
           revoked: "Private sale revoked. Its link no longer works."
@@ -609,7 +610,10 @@ en:
           to_date: "To date"
           per_date_hint: "The quantity applies to EACH date in the range, not across the range as a whole. Leave both dates empty to change only undated stock."
           apply: "Apply"
-          public_available: "Public available"
+          apply_confirm: "Apply this change to locked stock? This takes effect immediately."
+          apply_confirm_per_date: "Apply this change to EVERY date in the range? This takes effect immediately."
+          max_capacity: "Max capacity"
+          public_available: "Available"
           locked: "Locked"
           locked_on_hold: "On hold"
         create:
@@ -618,6 +622,16 @@ en:
           no_inventory_item: "Pick a variant that has stock on sale."
           invalid_date_range: "Check the dates: both are required together, and From must not be after To."
           product_not_found: "That product no longer exists."
+      inventory_lock_movements:
+        tab: "Lock history"
+        index:
+          title: "Lock history"
+          quantity: "Quantity"
+          locked: "Locked"
+          no_movements: "No locked stock has been moved yet."
+          by: "By"
+          at: "At"
+          system: "System"
       display_on:
         frontend_for_early_adopter: "Storefront for Early Adopter"
       external_integrations_title: "External Integrations"
@@ -992,9 +1006,6 @@ en:
   # SpreeCmCommissioner::Products::PublishStockStatusToFirestore) — not read via I18n at request
   # time, so every locale we publish for must have an entry here.
   stock_status:
-    low_stock:
-      one: "%{count} left"
-      other: "%{count} left"
     pending_hold: "In high demand"
     sold_out: "Sold out"
 

data/config/locales/km.yml

@@ -607,9 +607,6 @@ km:
       hold_cooldown: "ការកក់មុនរបស់អ្នកទើបតែផុតកំណត់។ សូមរង់ចាំពីរបីនាទី មុនពេលកក់ម្តងទៀត។"
 
   stock_status:
-    low_stock:
-      one: "នៅសល់ %{count}"
-      other: "នៅសល់ %{count}"
     pending_hold: "តម្រូវការខ្ពស់"
     sold_out: "លក់អស់"
 

data/config/routes.rb

@@ -234,6 +234,8 @@ Spree::Core::Engine.add_routes do
       # Withholding stock from public sale, and the private sales that sell it.
       resources :inventory_locks, only: %i[index create]
 
+      resources :inventory_lock_movements, only: %i[index]
+
       resources :product_completion_steps do
         collection do
           post :update_positions

data/db/migrate/20260831080000_create_cm_inventory_lock_movements.rb

@@ -0,0 +1,16 @@
+class CreateCmInventoryLockMovements < ActiveRecord::Migration[7.0]
+  # Immutable audit ledger for SpreeCmCommissioner::InventoryItems::MoveToLocked — one row per lock
+  # or release, mirroring Spree::StockMovement's shape (signed quantity + actor + append-only) since
+  # that table cannot be reused: its after_create callback adjusts count_on_hand, which locking must
+  # never touch.
+  def change
+    create_table :cm_inventory_lock_movements, if_not_exists: true do |t|
+      t.references :inventory_item, null: false, foreign_key: { to_table: :cm_inventory_items }
+      t.integer :quantity, null: false
+      t.integer :quantity_locked_after, null: false
+      t.references :created_by, foreign_key: { to_table: :spree_users }
+      t.string :caller_source
+      t.datetime :created_at, null: false
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.12.2'.freeze
+  VERSION = '2.12.4'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.12.4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-29 00:00:00.000000000 Z
+date: 2026-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -867,6 +867,7 @@ files:
 - app/controllers/spree/admin/integrations_controller.rb
 - app/controllers/spree/admin/inventory_holds_controller.rb
 - app/controllers/spree/admin/inventory_items_controller.rb
+- app/controllers/spree/admin/inventory_lock_movements_controller.rb
 - app/controllers/spree/admin/inventory_locks_controller.rb
 - app/controllers/spree/admin/inventory_monitorings_controller.rb
 - app/controllers/spree/admin/kyc_controller.rb
@@ -1229,6 +1230,7 @@ files:
 - app/helpers/spree/transit/sortable_tree_helper.rb
 - app/helpers/spree_cm_commissioner/admin/guest_helper.rb
 - app/helpers/spree_cm_commissioner/admin/homepage_segment_helper.rb
+- app/helpers/spree_cm_commissioner/admin/inventory_locks_helper.rb
 - app/helpers/spree_cm_commissioner/admin/kycable_helper.rb
 - app/helpers/spree_cm_commissioner/admin/service_calendars_helper.rb
 - app/helpers/spree_cm_commissioner/admin/ticket_transfers_helper.rb
@@ -1402,6 +1404,7 @@ files:
 - app/jobs/spree_cm_commissioner/inventory_holds/release_job.rb
 - app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_by_variant_job.rb
 - app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_job.rb
+- app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert_job.rb
 - app/jobs/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold_job.rb
 - app/jobs/spree_cm_commissioner/inventory_items/bulk_generate_permanent_items_job.rb
 - app/jobs/spree_cm_commissioner/inventory_items/generate_inventory_items_job.rb
@@ -1604,6 +1607,7 @@ files:
 - app/models/spree_cm_commissioner/inventory.rb
 - app/models/spree_cm_commissioner/inventory_hold.rb
 - app/models/spree_cm_commissioner/inventory_item.rb
+- app/models/spree_cm_commissioner/inventory_lock_movement.rb
 - app/models/spree_cm_commissioner/invite.rb
 - app/models/spree_cm_commissioner/invite_guest.rb
 - app/models/spree_cm_commissioner/invite_guest_group.rb
@@ -1881,6 +1885,7 @@ files:
 - app/overrides/spree/admin/shared/_order_tabs/guests.html.erb.deface
 - app/overrides/spree/admin/shared/_order_tabs/notifications.html.erb.deface
 - app/overrides/spree/admin/shared/_order_tabs/ticket_transfers.html.erb.deface
+- app/overrides/spree/admin/shared/_product_tabs/clock_history.html.erb.deface
 - app/overrides/spree/admin/shared/_product_tabs/google_wallet_html.erb.deface
 - app/overrides/spree/admin/shared/_product_tabs/guest_card.html.erb.deface
 - app/overrides/spree/admin/shared/_product_tabs/kyc.html.erb.deface
@@ -2302,6 +2307,7 @@ files:
 - app/services/spree_cm_commissioner/inventory_items/adjust_available_quantity.rb
 - app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities.rb
 - app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_by_variant.rb
+- app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_convert.rb
 - app/services/spree_cm_commissioner/inventory_items/bulk_adjust_quantities_on_hold.rb
 - app/services/spree_cm_commissioner/inventory_items/bulk_generate_permanent_items.rb
 - app/services/spree_cm_commissioner/inventory_items/generate_non_permanent_item.rb
@@ -2580,6 +2586,7 @@ files:
 - app/views/spree/admin/inventory_holds/index.html.erb
 - app/views/spree/admin/inventory_items/prices.html.erb
 - app/views/spree/admin/inventory_items/stocks.html.erb
+- app/views/spree/admin/inventory_lock_movements/index.html.erb
 - app/views/spree/admin/inventory_locks/index.html.erb
 - app/views/spree/admin/inventory_monitorings/index.html.erb
 - app/views/spree/admin/kyc/_form.html.erb
@@ -2644,6 +2651,7 @@ files:
 - app/views/spree/admin/promotions/rules/_guest_occupations.html.erb
 - app/views/spree/admin/promotions/rules/_vendors.html.erb
 - app/views/spree/admin/promotions/rules/_weekend.html.erb
+- app/views/spree/admin/shared/_availability_percentage.html.erb
 - app/views/spree/admin/shared/_cms_pages_tabs.html.erb
 - app/views/spree/admin/shared/_customer_notification_tabs.html.erb
 - app/views/spree/admin/shared/_direct_upload.html.erb
@@ -3548,6 +3556,7 @@ files:
 - db/migrate/20260824120000_add_user_id_to_cm_waiting_room_sessions.rb
 - db/migrate/20260825092416_add_live_stock_window_to_spree_taxons.rb
 - db/migrate/20260828080349_add_normalized_login_to_spree_users.rb
+- db/migrate/20260831080000_create_cm_inventory_lock_movements.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md