spree_cm_commissioner 2.8.2 → 2.8.3.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc101fbc1fb46a184c311e3cdf1827cd6515ae3b0399d77ca67c48560b3417bc
-  data.tar.gz: 5437f4e82b8c48ce55753432d2ce529935b0c63d472946f03153e817ba3c3038
+  metadata.gz: 6113b7370f204cdd539916ac0e1881763beec50c577ba5973160f10941015f99
+  data.tar.gz: 356ebf217c53946872067544869cec5695e063df4092ae8b05d3c5e6a5dbef4e
 SHA512:
-  metadata.gz: 74c7a8c0fbb21ae704c905b4f14b8d878b701adf82fc569a0db9d3bb780cae702eb93303c29db6bd08f602e9270fb89caed7bf5ebdb3a21d474057cef17d2157
-  data.tar.gz: 981dc574b4b68c1fec6ed7a665ec47ef52bfb60ef89476ab119e72da1311c9e2ae01e78a69436a8663ba185b460df46c6fd5836ccc52531c5e4a13eeaa5c3209
+  metadata.gz: d99e1e40d83080a9487bc6929fedb7f3f0e2e847635fde43f5b96479e0f19386e17357e0bb798dae74f3302429e166d851a0247ab5b0c1a49bb62e38fc83a29f
+  data.tar.gz: 1560f7edd9efb1eb30351da6a44081f4eee124be109351d835631b0b1f82db176de3a8d4cdfa1112d1f2c96be55f7268dfa6a2c5ec617864146ecea5cd5d1c8b

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb

@@ -64,8 +64,7 @@ module Spree
               'trips.vendor',
               'trips.vendor.logo',
               'trips.vehicle_type',
-              'trips.vehicle_type.vehicle_photos',
-              'trips.amenities'
+              'trips.vehicle_type.vehicle_photos'
             ]
           end
 
@@ -99,7 +98,11 @@ module Spree
 
           # override
           def serializer_params
-            params.permit(:include).to_hash
+            super.merge(
+              exclude_vendor_kind_option_types: true,
+              exclude_vendor_kind_option_values: true,
+              exclude_vehicle_type_amenities: true
+            )
           end
 
           # override

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -48,7 +48,7 @@ module SpreeCmCommissioner
     end
 
     def line_item_content(line_item)
-      return intercity_taxi_line_item_content(line_item) if intercity_taxi?(line_item)
+      return transit_line_item_content(line_item) if line_item.transit?
 
       text = []
 
@@ -64,8 +64,8 @@ module SpreeCmCommissioner
     def pretty_date_for(line_item)
       return nil unless line_item.date_present?
 
-      from_date = pretty_date(line_item.from_date)
-      to_date = pretty_date(line_item.to_date)
+      from_date = pretty_datetime(line_item.from_date)
+      to_date = pretty_datetime(line_item.to_date)
 
       if from_date == to_date
         "🗓️ #{from_date}"
@@ -84,7 +84,7 @@ module SpreeCmCommissioner
       text << "Email: #{inline_code(order.email)}" if order.email.present?
       text << "Delivery Address: #{formatted_shipping_address.presence || 'N/A'}" if order.delivery_required?
 
-      append_intercity_taxi_footer(text) if intercity_taxi_order?
+      append_transit_footer(text) if transit_order?
 
       if show_details_link && order.guests.any?
         text << ''
@@ -132,12 +132,12 @@ module SpreeCmCommissioner
 
     private
 
-    def intercity_taxi?(line_item)
-      trip_for(line_item)&.intercity_taxi?
+    def transit_order?
+      selected_line_items.any?(&:transit?)
     end
 
     def intercity_taxi_order?
-      selected_line_items.any? { |li| intercity_taxi?(li) }
+      selected_line_items.any? { |li| trip_for(li)&.intercity_taxi? }
     end
 
     def trip_for(line_item)
@@ -147,10 +147,10 @@ module SpreeCmCommissioner
       @trip_cache[line_item.trip_id] ||= SpreeCmCommissioner::Trip.find_by(id: line_item.trip_id)
     end
 
-    def intercity_taxi_line_item_content(line_item)
+    def transit_line_item_content(line_item)
       text = []
-      route_text = taxi_route_text(line_item)
-      departure_text = taxi_departure_text(line_item)
+      route_text = transit_route_text(line_item)
+      departure_text = transit_departure_text(line_item)
       text << bold('🚗 Trip Details')
       text << "Route: #{route_text}" if route_text.present?
       text << "Passengers: #{line_item.passenger_count || line_item.quantity}"
@@ -159,7 +159,7 @@ module SpreeCmCommissioner
       text.compact.join("\n")
     end
 
-    def taxi_route_text(line_item)
+    def transit_route_text(line_item)
       trip = trip_for(line_item)
       return line_item.product.name if trip.blank?
 
@@ -171,21 +171,35 @@ module SpreeCmCommissioner
       vehicle.present? ? "#{parts} (#{vehicle})" : parts
     end
 
-    def taxi_departure_text(line_item)
+    def transit_departure_text(line_item)
       return nil unless line_item.date_present?
 
       line_item.from_date.strftime('%b %d, %Y · %H:%M')
     end
 
     def nationality_text
-      values = order.saved_guests.map { |sg| sg.nationality&.name.presence || sg.nationality_group&.humanize }.compact.uniq
-      return nil if values.empty?
+      grouped = order.saved_guests.group_by { |sg| sg.nationality_group&.humanize }
+      grouped.delete(nil)
+      return nil if grouped.empty?
 
-      values.join(', ')
+      grouped.map { |nationality_group, guests| customer_type_summary(nationality_group, guests) }.join(', ')
     end
 
-    def append_intercity_taxi_footer(text)
-      text << "Nationality: #{nationality_text}" if nationality_text.present?
+    # e.g. "Local (Adult x1, Child x1)". age_group is NOT NULL, so it is always present.
+    def customer_type_summary(nationality_group, guests)
+      age_breakdown = guests
+                      .group_by { |sg| sg.age_group.humanize }
+                      .map { |age_group, age_guests| "#{age_group} x#{age_guests.count}" }
+                      .join(', ')
+
+      "#{nationality_group} (#{age_breakdown})"
+    end
+
+    def append_transit_footer(text)
+      nationality = nationality_text
+      text << "Nationality: #{nationality}" if nationality.present?
+
+      return unless intercity_taxi_order?
 
       pickup = selected_line_items.filter_map(&:pickup_map_place).first
       dropoff = selected_line_items.filter_map(&:dropoff_map_place).first

data/app/factory/spree_cm_commissioner/telegram_message_factory.rb

@@ -46,5 +46,11 @@ module SpreeCmCommissioner
 
       date.to_date.strftime('%b %d, %Y')
     end
+
+    def pretty_datetime(datetime)
+      return '' if datetime.blank?
+
+      datetime&.in_time_zone&.strftime('%b %d, %Y - %H:%M')
+    end
   end
 end

data/app/interactors/spree_cm_commissioner/invalidate_cache_request.rb

@@ -19,13 +19,17 @@ module SpreeCmCommissioner
       context.response = client.create_invalidation(
         distribution_id: ENV.fetch('ASSETS_SYNC_CF_DIST_ID'),
         invalidation_batch: {
-          caller_reference: Time.now.to_i.to_s,
+          # Must be globally unique per distribution,
+          # Time.now.to_i collides when multiple jobs fire in the same second.
+          caller_reference: SecureRandom.uuid,
           paths: {
             quantity: patterns.size,
             items: patterns
           }
         }
       )
+    rescue Aws::CloudFront::Errors::TooManyInvalidationsInProgress => e
+      context.fail!(message: "Too many invalidations in progress: #{e}")
     end
   end
 end

data/app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb

@@ -1,7 +1,10 @@
 module SpreeCmCommissioner
   class InvalidateCacheRequestJob < ApplicationUniqueJob
+    queue_as :cache_invalidation
+
     def perform(options = {})
-      SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: options[:patterns])
+      result = SpreeCmCommissioner::InvalidateCacheRequest.call(patterns: options[:patterns])
+      raise result.error if result.failure?
     end
   end
 end

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

@@ -1,13 +1,15 @@
 module SpreeCmCommissioner
   module InventoryItems
     class BulkAdjustQuantitiesJob < ApplicationUniqueJob
-      # :line_item_ids, :inventory_id_and_quantities
+      # :line_item_ids, :inventory_id_and_quantities, :caller_source
       #
       # :line_item_ids is included for unique job key generation to prevent duplicate jobs,
       # though it's not used in the perform method implementation.
+      # :caller_source is a string like "ClassName#method" identifying who enqueued the job.
       def perform(options = {})
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantities.call!(
-          inventory_id_and_quantities: options[:inventory_id_and_quantities]
+          inventory_id_and_quantities: options[:inventory_id_and_quantities],
+          caller_source: options[:caller_source]
         )
       end
     end

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

@@ -3,16 +3,18 @@ module SpreeCmCommissioner
     class BulkAdjustQuantitiesOnHoldJob < ApplicationUniqueJob
       queue_as :default
 
-      # :order_id, :inventory_id_and_quantities
+      # :order_id, :inventory_id_and_quantities, :caller_source
       #
       # :order_id is included for unique job key generation to prevent duplicate jobs,
       # though it's not used in the perform method implementation.
+      # :caller_source is a string like "ClassName#method" identifying who enqueued the job.
       def perform(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::BulkAdjustQuantitiesOnHold.call(
-          inventory_id_and_quantities: options[:inventory_id_and_quantities]
+          inventory_id_and_quantities: options[:inventory_id_and_quantities],
+          caller_source: options[:caller_source]
         )
       end
     end

data/app/jobs/spree_cm_commissioner/route_metrics/decrease_trip_count_job.rb

@@ -2,8 +2,14 @@ module SpreeCmCommissioner
   module RouteMetrics
     class DecreaseTripCountJob < ApplicationUniqueJob
       def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::RouteMetrics::DecreaseTripCount.call(trip: trip)
+        route_metric = SpreeCmCommissioner::RouteMetric.find_by(
+          origin_place_id: options[:origin_place_id],
+          destination_place_id: options[:destination_place_id],
+          route_type: options[:route_type]
+        )
+        return if route_metric.nil?
+
+        SpreeCmCommissioner::RouteMetrics::DecreaseTripCount.call(route_metric: route_metric)
       end
     end
   end

data/app/jobs/spree_cm_commissioner/route_metrics/increase_trip_count_job.rb

@@ -2,8 +2,11 @@ module SpreeCmCommissioner
   module RouteMetrics
     class IncreaseTripCountJob < ApplicationUniqueJob
       def perform(options = {})
-        trip = SpreeCmCommissioner::Trip.find(options[:trip_id])
-        SpreeCmCommissioner::RouteMetrics::IncreaseTripCount.call(trip: trip)
+        SpreeCmCommissioner::RouteMetrics::IncreaseTripCount.call(
+          origin_place_id: options[:origin_place_id],
+          destination_place_id: options[:destination_place_id],
+          route_type: options[:route_type]
+        )
       end
     end
   end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -34,6 +34,7 @@ module SpreeCmCommissioner
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
 
       base.has_many :saved_guests,
+                    -> { reorder(nil).distinct },
                     through: :guests,
                     source: :saved_guest,
                     class_name: 'SpreeCmCommissioner::SavedGuest'

data/app/models/spree_cm_commissioner/trip.rb

@@ -162,11 +162,19 @@ module SpreeCmCommissioner
     end
 
     def increment_route_metric_trip_count
-      SpreeCmCommissioner::RouteMetrics::IncreaseTripCountJob.perform_later(trip_id: id)
+      SpreeCmCommissioner::RouteMetrics::IncreaseTripCountJob.perform_later(
+        origin_place_id: origin_place_id,
+        destination_place_id: destination_place_id,
+        route_type: route_type
+      )
     end
 
     def decrement_route_metric_trip_count
-      SpreeCmCommissioner::RouteMetrics::DecreaseTripCountJob.perform_later(trip_id: id)
+      SpreeCmCommissioner::RouteMetrics::DecreaseTripCountJob.perform_later(
+        origin_place_id: origin_place_id,
+        destination_place_id: destination_place_id,
+        route_type: route_type
+      )
     end
 
     def update_route_price_range

data/app/queries/spree_cm_commissioner/multi_leg_trips_query.rb

@@ -56,6 +56,8 @@ module SpreeCmCommissioner
       return [] if trip_legs.empty?
 
       legs_by_parent = group_legs(trip_legs: trip_legs)
+      legs_by_parent = filter_complete_parents(legs_by_parent)
+      return [] if legs_by_parent.empty?
 
       leg_ids = legs_by_parent.values.flatten.uniq
       legs_by_id = preload_leg_trips(leg_ids: leg_ids)
@@ -159,6 +161,26 @@ module SpreeCmCommissioner
            .having('SUM(cm_inventory_items.quantity_available) >= ?', number_of_guests)
     end
 
+    # Discards parent trips whose found-leg count doesn't match their total leg count.
+    # This handles the case where one leg lacks sufficient inventory — the parent would
+    # otherwise be returned with only the legs that passed the HAVING filter, producing
+    # a partial (incorrect) multi-leg result.
+    #
+    # @return [Hash] { parent_trip_id => [leg_ids] } with incomplete parents removed
+    def filter_complete_parents(legs_by_parent)
+      parent_ids = legs_by_parent.keys
+      total_leg_counts = SpreeCmCommissioner::TripStop
+                         .where(trip_id: parent_ids)
+                         .where.not(board_to_trip_id: nil)
+                         .group(:trip_id)
+                         .count('DISTINCT board_to_trip_id')
+
+      legs_by_parent.select do |parent_id, leg_ids|
+        total = total_leg_counts[parent_id].to_i
+        total.positive? && leg_ids.size == total
+      end
+    end
+
     # @return [Hash] { parent_trip_id => [leg_ids] }
     def group_legs(trip_legs:)
       trip_legs.group_by(&:parent_trip_id).transform_values { |r| r.map(&:leg_id).uniq }

data/app/serializers/spree_cm_commissioner/v2/storefront/amenity_serializer.rb

@@ -3,12 +3,15 @@ module SpreeCmCommissioner
     module Storefront
       class AmenitySerializer < BaseSerializer
         set_type :amenity
+
         attributes :name, :presentation
         attribute :display_icon do |option_value|
           ::ActionController::Base.helpers.image_url(option_value.display_icon)
         rescue StandardError
           nil
         end
+
+        has_one :option_type, serializer: ::Spree::V2::Storefront::OptionTypeSerializer
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_query_result_serializer.rb

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
       class TripQueryResultSerializer < BaseSerializer
         set_type :trip_query_result
 
-        attributes :quantity_available, :max_capacity
+        attributes :quantity_available, :max_capacity, :price, :compare_at_price, :currency, :display_price, :display_compare_at_price
 
         attribute :direct, &:direct?
         has_many :trips, serializer: ::SpreeCmCommissioner::V2::Storefront::TripResultSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_result_serializer.rb

@@ -24,9 +24,9 @@ module SpreeCmCommissioner
 
         attribute :duration_in_hms, &:duration_in_hms
         attribute :arrival_time, &:arrival_time
+
         belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
         belongs_to :vehicle_type, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleTypeSerializer
-        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_type_serializer.rb

@@ -5,9 +5,12 @@ module SpreeCmCommissioner
         attributes :id, :name, :kind, :number_of_seats
 
         has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
-        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
-        has_many :option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer,
-                                if: proc { |_record, params| params.nil? || params[:include_option_types] != false }
+
+        has_many :option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer
+
+        # Included by default. Excluded ONLY when param is explicitly true or "true".
+        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer,
+                             if: proc { |_, params| !params || params[:exclude_vehicle_type_amenities].to_s != 'true' }
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_vendor_serializer.rb

@@ -8,8 +8,12 @@ module SpreeCmCommissioner
 
         has_one :logo, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
 
-        has_many :vendor_kind_option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer
-        has_many :vendor_kind_option_values, serializer: ::Spree::V2::Storefront::OptionValueSerializer
+        # Included by default. Excluded ONLY when param is explicitly true or "true".
+        has_many :vendor_kind_option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer,
+                                            if: proc { |_, params| !params || params[:exclude_vendor_kind_option_types].to_s != 'true' }
+
+        has_many :vendor_kind_option_values, serializer: ::Spree::V2::Storefront::OptionValueSerializer,
+                                             if: proc { |_, params| !params || params[:exclude_vendor_kind_option_values].to_s != 'true' }
       end
     end
   end

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

@@ -144,8 +144,11 @@ module SpreeCmCommissioner
           end
         end
 
+        return if inventory_id_and_quantities.blank?
+
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHoldJob.perform_later(
           order_id: order.id,
+          caller_source: "#{self.class.name}#enqueue_sync_inventory_on_hold",
           inventory_id_and_quantities: inventory_id_and_quantities
         )
       end

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

@@ -36,7 +36,8 @@ module SpreeCmCommissioner
         order.line_items.each do |li|
           next unless li.should_hold_inventory?
 
-          li.inventory_items.active.each do |item|
+          # 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
             quantities << li.quantity
             inventory_items << item
@@ -68,7 +69,8 @@ module SpreeCmCommissioner
         inventory_id_and_quantities = order.line_items.flat_map do |line_item|
           next [] unless line_item.should_hold_inventory?
 
-          line_item.inventory_items.active.map do |inventory_item|
+          # Skip .active scope for the same reason as clear_hold_redis!.
+          line_item.inventory_items.map do |inventory_item|
             {
               inventory_id: inventory_item.id,
               quantity: -line_item.quantity
@@ -76,8 +78,11 @@ module SpreeCmCommissioner
           end
         end
 
+        return if inventory_id_and_quantities.blank?
+
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHoldJob.perform_later(
           order_id: order.id,
+          caller_source: "#{self.class.name}#enqueue_sync_inventory_on_hold",
           inventory_id_and_quantities: inventory_id_and_quantities
         )
       end

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

@@ -64,7 +64,8 @@ module SpreeCmCommissioner
         order.line_items.includes(:variant).find_each do |li|
           next unless li.should_hold_inventory?
 
-          li.inventory_items.active.each do |item|
+          # Skip .active scope: holds on past-dated items must also be released (e.g. delayed job fires after trip date).
+          li.inventory_items.each do |item|
             keys << item.redis_hold_key
             quantities << li.quantity
             inventory_items << item
@@ -82,7 +83,8 @@ module SpreeCmCommissioner
         inventory_id_and_quantities = order.line_items.flat_map do |line_item|
           next [] unless line_item.should_hold_inventory?
 
-          line_item.inventory_items.active.map do |inventory_item|
+          # Skip .active scope for the same reason as hold_keys_and_quantities.
+          line_item.inventory_items.map do |inventory_item|
             {
               inventory_id: inventory_item.id,
               quantity: -line_item.quantity
@@ -90,8 +92,11 @@ module SpreeCmCommissioner
           end
         end
 
+        return if inventory_id_and_quantities.blank?
+
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesOnHoldJob.perform_later(
           order_id: order.id,
+          caller_source: "#{self.class.name}#enqueue_sync_inventory_on_hold",
           inventory_id_and_quantities: inventory_id_and_quantities
         )
       end

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

@@ -4,12 +4,17 @@ module SpreeCmCommissioner
       prepend ::Spree::ServiceModule::Base
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
-      def call(inventory_id_and_quantities:)
+      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
           inventory_items(inventory_id_and_quantities).each do |inventory_item|
             quantity = inventory_id_and_quantities.select { |item| item[:inventory_id] == inventory_item.id }
                                                   .sum { |item| item[:quantity] }
-            adjust_quantity_available(inventory_item, quantity)
+            adjust_quantity_available(inventory_item, quantity, caller_source)
           end
         end
 
@@ -18,7 +23,7 @@ module SpreeCmCommissioner
 
       private
 
-      def adjust_quantity_available(inventory_item, quantity)
+      def adjust_quantity_available(inventory_item, quantity, caller_source)
         # IMPORTANT: Apply the quantity change directly without defensive clamping.
         # The model validation will catch any attempts to go negative, surfacing bugs
         # in upstream Redis deduction logic.
@@ -28,8 +33,35 @@ module SpreeCmCommissioner
         # 2. lock_version (Optimistic): Catches race conditions if row is modified between
         #    SELECT and UPDATE (e.g., admin adjusts stock while job runs)
         inventory_item.with_lock do
-          inventory_item.update!(quantity_available: inventory_item.quantity_available + quantity)
+          before = inventory_item.quantity_available
+          after = before + quantity
+
+          CmAppLogger.log(
+            label: "#{self.class.name}#adjust_quantity_available",
+            data: {
+              caller_source: caller_source,
+              inventory_item_id: inventory_item.id,
+              quantity_available_before: before,
+              delta: quantity,
+              quantity_available_after: after
+            }
+          )
+
+          inventory_item.update!(quantity_available: after)
         end
+      rescue ActiveRecord::RecordInvalid
+        CmAppLogger.error(
+          label: "#{self.class.name}#adjust_quantity_available failed",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            quantity_available_current: inventory_item.quantity_available,
+            delta: quantity,
+            would_result_in: inventory_item.quantity_available + quantity,
+            errors: inventory_item.errors.full_messages
+          }
+        )
+        raise
       end
 
       def inventory_items(inventory_id_and_quantities)

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

@@ -4,11 +4,19 @@ module SpreeCmCommissioner
       prepend ::Spree::ServiceModule::Base
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
-      def call(inventory_id_and_quantities:)
+      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
           inventory_items(inventory_id_and_quantities).each do |inventory_item|
             quantity = inventory_id_and_quantities.find { |item| item[:inventory_id] == inventory_item.id }&.dig(:quantity) || 0
-            adjust_quantity_on_hold(inventory_item, quantity)
+            adjust_quantity_on_hold(inventory_item, quantity, caller_source)
           end
         end
 
@@ -17,7 +25,7 @@ module SpreeCmCommissioner
 
       private
 
-      def adjust_quantity_on_hold(inventory_item, quantity)
+      def adjust_quantity_on_hold(inventory_item, quantity, caller_source)
         # IMPORTANT: Apply the quantity change directly without defensive clamping.
         # The model validation will catch any attempts to go negative, surfacing bugs
         # in upstream Redis deduction logic.
@@ -27,8 +35,35 @@ module SpreeCmCommissioner
         # 2. lock_version (Optimistic): Catches race conditions if row is modified between
         #    SELECT and UPDATE (e.g., admin adjusts stock while job runs)
         inventory_item.with_lock do
-          inventory_item.update!(quantity_on_hold: inventory_item.quantity_on_hold + quantity)
+          before = inventory_item.quantity_on_hold
+          after = before + quantity
+
+          CmAppLogger.log(
+            label: "#{self.class.name}#adjust_quantity_on_hold",
+            data: {
+              caller_source: caller_source,
+              inventory_item_id: inventory_item.id,
+              quantity_on_hold_before: before,
+              delta: quantity,
+              quantity_on_hold_after: after
+            }
+          )
+
+          inventory_item.update!(quantity_on_hold: after)
         end
+      rescue ActiveRecord::RecordInvalid
+        CmAppLogger.error(
+          label: "#{self.class.name}#adjust_quantity_on_hold failed",
+          data: {
+            caller_source: caller_source,
+            inventory_item_id: inventory_item.id,
+            quantity_on_hold_current: inventory_item.quantity_on_hold,
+            delta: quantity,
+            would_result_in: inventory_item.quantity_on_hold + quantity,
+            errors: inventory_item.errors.full_messages
+          }
+        )
+        raise
       end
 
       def inventory_items(inventory_id_and_quantities)

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

@@ -32,8 +32,6 @@ module SpreeCmCommissioner
 
       def generate_inventory_items_for_variant(variant, count_on_hand)
         inventory_dates_for(variant).each do |inventory_date|
-          next if inventory_exist?(variant, inventory_date)
-
           create_inventory_item(variant, inventory_date, count_on_hand)
         end
       end
@@ -52,17 +50,17 @@ module SpreeCmCommissioner
         end
       end
 
-      def inventory_exist?(variant, inventory_date)
-        variant.inventory_items.exists?(inventory_date: inventory_date)
-      end
-
       def create_inventory_item(variant, inventory_date, count_on_hand)
+        return if variant.inventory_items.exists?(inventory_date: inventory_date)
+
         variant.inventory_items.create!(
           inventory_date: inventory_date,
           quantity_available: count_on_hand,
           max_capacity: count_on_hand,
           product_type: variant.product_type
         )
+      rescue ActiveRecord::RecordNotUnique
+        # concurrent worker won the race; record already exists
       end
 
       # Returns a hash: { variant_id => total_on_hand, ... }

data/app/services/spree_cm_commissioner/oauth_access_tokens/cleanup_expired.rb

@@ -3,22 +3,28 @@ module SpreeCmCommissioner
     class CleanupExpired
       prepend ::Spree::ServiceModule::Base
 
-      BATCH_SIZE = 1000
+      BATCH_SIZE = 500
+
+      # The access tokens set by doorkeeper to expire in 1 day (cm-market-server/config/initializers/doorkeeper.rb),
+      # so we set the threshold to 90 days to make sure all expired tokens are cleaned up.
       EXPIRATION_THRESHOLD_DAYS = 90
 
       def call
-        cutoff_date = EXPIRATION_THRESHOLD_DAYS.days.ago
+        cutoff_time = EXPIRATION_THRESHOLD_DAYS.days.ago
         total_deleted = 0
 
+        # oauth_access_tokens is a standalone table with no foreign keys or associations
+        # pointing to it (checked cm-market-server/db/schema.rb), so it is safe to use
+        # delete_all here for faster bulk cleanup.
         Spree::OauthAccessToken
-          .where('revoked_at IS NOT NULL OR (expires_in IS NOT NULL AND created_at + make_interval(secs => expires_in) < ?)', cutoff_date)
+          .where('created_at < ?', cutoff_time)
           .in_batches(of: BATCH_SIZE) do |relation|
           deleted_count = relation.delete_all
           total_deleted += deleted_count
         end
 
-        log_cleanup_result(total_deleted, cutoff_date)
-        success(total_deleted: total_deleted, cutoff_date: cutoff_date, batch_size: BATCH_SIZE, expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS)
+        log_cleanup_result(total_deleted, cutoff_time)
+        success(total_deleted: total_deleted, cutoff_time: cutoff_time, batch_size: BATCH_SIZE, expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS)
       rescue StandardError => e
         log_error(e)
         failure(nil, e.message)
@@ -26,12 +32,12 @@ module SpreeCmCommissioner
 
       private
 
-      def log_cleanup_result(total_deleted, cutoff_date)
+      def log_cleanup_result(total_deleted, cutoff_time)
         CmAppLogger.log(
           label: 'SpreeCmCommissioner::OauthAccessTokens::CleanupExpired completed',
           data: {
             total_deleted: total_deleted,
-            cutoff_date: cutoff_date,
+            cutoff_time: cutoff_time,
             batch_size: BATCH_SIZE,
             expiration_threshold_days: EXPIRATION_THRESHOLD_DAYS
           }

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

@@ -31,7 +31,8 @@ module SpreeCmCommissioner
       def schedule_sync_inventory(inventory_id_and_quantities)
         SpreeCmCommissioner::InventoryItems::BulkAdjustQuantitiesJob.perform_later(
           inventory_id_and_quantities: inventory_id_and_quantities,
-          line_item_ids: @line_item_ids
+          line_item_ids: @line_item_ids,
+          caller_source: "#{self.class.name}#schedule_sync_inventory"
         )
       end
     end

data/app/services/spree_cm_commissioner/route_metrics/decrease_trip_count.rb

@@ -3,29 +3,17 @@ module SpreeCmCommissioner
     class DecreaseTripCount
       prepend ::Spree::ServiceModule::Base
 
-      def call(trip:)
-        return failure(nil, 'Trip not found') unless trip
-
-        route_metric = find_or_create_route_metric(trip)
+      def call(route_metric:)
+        return failure(nil, 'Route metric not found') unless route_metric
 
         route_metric.with_lock do
           route_metric.update!(trip_count: [route_metric.trip_count - 1, 0].max)
         end
 
-        success(trip: trip)
+        success(route_metric: route_metric)
       rescue StandardError => e
         failure(nil, e.message)
       end
-
-      private
-
-      def find_or_create_route_metric(trip)
-        SpreeCmCommissioner::RouteMetric.find_or_create_by!(
-          origin_place_id: trip.origin_place_id,
-          destination_place_id: trip.destination_place_id,
-          route_type: trip.route_type
-        )
-      end
     end
   end
 end

data/app/services/spree_cm_commissioner/route_metrics/increase_trip_count.rb

@@ -3,29 +3,21 @@ module SpreeCmCommissioner
     class IncreaseTripCount
       prepend ::Spree::ServiceModule::Base
 
-      def call(trip:)
-        return failure(nil, 'Trip not found') unless trip
-
-        route_metric = find_or_create_route_metric(trip)
+      def call(origin_place_id:, destination_place_id:, route_type:)
+        route_metric = SpreeCmCommissioner::RouteMetric.find_or_create_by!(
+          origin_place_id: origin_place_id,
+          destination_place_id: destination_place_id,
+          route_type: route_type
+        )
 
         route_metric.with_lock do
           route_metric.update!(trip_count: route_metric.trip_count + 1)
         end
 
-        success(trip: trip)
+        success(route_metric: route_metric)
       rescue StandardError => e
         failure(nil, e.message)
       end
-
-      private
-
-      def find_or_create_route_metric(trip)
-        SpreeCmCommissioner::RouteMetric.find_or_create_by!(
-          origin_place_id: trip.origin_place_id,
-          destination_place_id: trip.destination_place_id,
-          route_type: trip.route_type
-        )
-      end
     end
   end
 end

data/app/services/spree_cm_commissioner/transit_order/create.rb

@@ -49,9 +49,15 @@ module SpreeCmCommissioner
         order.preload_main_trip_ids = (outbound_legs.map(&:main_trip_id) + inbound_legs.map(&:main_trip_id)).flatten.compact.uniq
         order.order_options = order_options if order_options.present?
 
-        raise StandardError, order.errors.full_messages.to_sentence unless order.save
+        ActiveRecord::Base.transaction do
+          raise StandardError, order.errors.full_messages.to_sentence unless order.save
+
+          order.update_with_updater!
+
+          # Move the order from 'cart' to 'address' & hold the selected seats.
+          order.next!
+        end
 
-        order.update_with_updater!
         order
       end
 

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

@@ -12,7 +12,7 @@
       <div data-hook="admin_line_item_form_date">
         <%= f.field_container :from_date do %>
           <%= f.label :from_date, raw(Spree.t(:from_date) + required_span_tag) %>
-          <%= f.text_field :from_date, class: 'form-control datePickerFrom mb-2', 'data-alt-input': true, 'data-enable-time': true, value: (@line_item.from_date ? @line_item.from_date.to_date : nil) %>
+          <%= f.text_field :from_date, class: 'form-control datePickerFrom mb-2', 'data-alt-input': true, 'data-enable-time': true, value: @line_item.from_date&.in_time_zone&.strftime('%Y-%m-%d %H:%M') %>
           <%= f.error_message_on :from_date %>
         <% end %>
       </div>
@@ -20,11 +20,10 @@
       <div data-hook="admin_line_item_to_date">
         <%= f.field_container :to_date do %>
           <%= f.label :to_date, raw(Spree.t(:to_date) + required_span_tag) %>
-          <%= f.text_field :to_date, class: 'form-control datePickerTo', 'data-alt-input': true, 'data-enable-time': true, value: @line_item.to_date, 'data-min-date': @line_item.from_date %>
+          <%= f.text_field :to_date, class: 'form-control datePickerTo', 'data-alt-input': true, 'data-enable-time': true, value: @line_item.to_date&.in_time_zone&.strftime('%Y-%m-%d %H:%M'), 'data-min-date': @line_item.from_date&.in_time_zone&.strftime('%Y-%m-%d %H:%M') %>
           <%= f.error_message_on :to_date %>
         <% end %>
       </div>
     </div>
   </div>
 </div>
-

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -50,10 +50,34 @@ module SpreeCmCommissioner
       @trips.map(&:max_capacity).compact.min
     end
 
-    def total_price
+    def price
       @trips.map(&:price).compact.sum
     end
 
+    # alias total_price to price for backward compatibility.
+    alias total_price price
+
+    def compare_at_price
+      values = @trips.map(&:compare_at_price).compact
+      values.empty? ? nil : values.sum
+    end
+
+    def currency
+      @trips.first&.currency
+    end
+
+    def display_price
+      return nil if price.nil? || currency.nil?
+
+      Spree::Money.new(price, currency: currency).to_s
+    end
+
+    def display_compare_at_price
+      return nil if compare_at_price.nil? || currency.nil?
+
+      Spree::Money.new(compare_at_price, currency: currency).to_s
+    end
+
     def total_open_return_price
       return total_price unless direct?
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.2'.freeze
+  VERSION = '2.8.3-pre1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -3370,9 +3370,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1