spree_cm_commissioner 2.13.3.pre.pre2 → 2.13.3

data/app/services/spree_cm_commissioner/integrations/base/sync_manager.rb

@@ -1,7 +1,8 @@
 module SpreeCmCommissioner::Integrations::Base
   class SyncManager
-    def initialize(integration:)
+    def initialize(integration:, client:)
       @integration = integration
+      @client = client
       @sync_session = nil
     end
 

data/app/services/spree_cm_commissioner/integrations/base/sync_result.rb

@@ -174,17 +174,6 @@ module SpreeCmCommissioner::Integrations::Base
       @error.nil?
     end
 
-    # Access metrics
-    # @return [Hash] The metrics hash
-    attr_reader :metrics
-
-    # Access API calls
-    # @return [Hash] The API calls hash
-    attr_reader :api_calls
-
-    # Timestamp of the last synced item (set by SyncItemAvailability)
-    attr_accessor :last_synced_at
-
     # Serialize to hash for JSONB persistence
     # @return [Hash] Serialized representation
     def to_h

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/external_client/client.rb

@@ -4,10 +4,11 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       BASE_PATH = '/api/v1'.freeze
       RATE_LIMIT = 100
 
-      attr_reader :integration
-
-      def initialize(integration:)
-        @integration = integration
+      def initialize(public_key:, private_key:, base_url:)
+        @public_key = public_key
+        @private_key = private_key
+        @base_url = base_url
+        @connection = build_connection
       end
 
       # Ticket Operations
@@ -16,7 +17,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # @param id [String] The ticket ID
       # @return [Resources::Ticket] The ticket object
       def get_ticket!(id:)
-        response = connection.get("#{BASE_PATH}/tickets/#{id}") do |req|
+        response = @connection.get("#{BASE_PATH}/tickets/#{id}") do |req|
           req.body = auth_params.to_json
         end
 
@@ -27,7 +28,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # @param user_id [String] The user ID
       # @return [Array<Resources::Ticket>] Array of ticket objects
       def get_tickets_by_user!(user_id:)
-        response = connection.get("#{BASE_PATH}/tickets/user/#{user_id}") do |req|
+        response = @connection.get("#{BASE_PATH}/tickets/user/#{user_id}") do |req|
           req.body = auth_params.merge(user_id: user_id).to_json
         end
 
@@ -50,7 +51,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
           quantity: quantity
         }
 
-        response = connection.post("#{BASE_PATH}/tickets") do |req|
+        response = @connection.post("#{BASE_PATH}/tickets") do |req|
           req.body = auth_params.merge(params).to_json
           req.headers['Content-Type'] = 'application/json'
         end
@@ -63,7 +64,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # Get all available matches
       # @return [Array<Resources::Match>] Array of match objects
       def get_matches! # rubocop:disable Naming/AccessorMethodName
-        response = connection.get("#{BASE_PATH}/matches") do |req|
+        response = @connection.get("#{BASE_PATH}/matches") do |req|
           req.params = auth_params
         end
 
@@ -74,7 +75,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # @param id [String] The match ID
       # @return [Resources::Match] The match object
       def get_match!(id:)
-        response = connection.get("#{BASE_PATH}/matches/#{id}") do |req|
+        response = @connection.get("#{BASE_PATH}/matches/#{id}") do |req|
           req.params = auth_params
         end
 
@@ -88,7 +89,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # @param match_id [String] The match ID
       # @return [Array<Resources::Zone>] Array of zone objects
       def get_zones!(club_id:, match_id:)
-        response = connection.get("#{BASE_PATH}/zones/club") do |req|
+        response = @connection.get("#{BASE_PATH}/zones/club") do |req|
           req.params = auth_params.merge(
             club_id: club_id,
             match_id: match_id
@@ -100,8 +101,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
 
       private
 
-      def connection
-        @connection ||= Faraday.new(url: @integration.base_url) do |faraday|
+      def build_connection
+        Faraday.new(url: @base_url) do |faraday|
           faraday.request :json
           faraday.response :json, content_type: /\bjson$/
           faraday.adapter Faraday.default_adapter
@@ -110,8 +111,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
 
       def auth_params
         {
-          public_key: @integration.public_key,
-          private_key: @integration.private_key
+          public_key: @public_key,
+          private_key: @private_key
         }
       end
 

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/polling/sync_matches.rb

@@ -1,7 +1,8 @@
 class SpreeCmCommissioner::Integrations::StadiumXV1
   module Polling
     class SyncMatches
-      def initialize(integration:, sync_result: nil)
+      def initialize(client:, integration:, sync_result: nil)
+        @client = client
         @integration = integration
         @sync_result = sync_result || SpreeCmCommissioner::Integrations::Base::SyncResult.new
       end
@@ -11,14 +12,10 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
         cleanup_stale_mappings!(synced_match_mappings)
       end
 
-      def client
-        @client ||= @integration.client
-      end
-
       # Sync all available matches from the API and create them as events
       def sync_matches!
         external_matches = begin
-          @sync_result.track_api_call('get_matches') { client.get_matches! }
+          @sync_result.track_api_call('get_matches') { @client.get_matches! }
         rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
           raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync matches: #{e.message}"
         end
@@ -32,7 +29,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       # Match data might be incomplete in the matches list, so we fetch full details
       def sync_match!(external_match)
         external_match = begin
-          @sync_result.track_api_call('get_match_details') { client.get_match!(id: external_match._id) }
+          @sync_result.track_api_call('get_match_details') { @client.get_match!(id: external_match._id) }
         rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
           raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync matches: #{e.message}"
         end

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/polling/sync_zones.rb

@@ -1,7 +1,8 @@
 class SpreeCmCommissioner::Integrations::StadiumXV1
   module Polling
     class SyncZones
-      def initialize(integration:, sync_result:)
+      def initialize(client:, integration:, sync_result:)
+        @client = client
         @integration = integration
         @sync_result = sync_result
       end
@@ -18,17 +19,13 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
         cleanup_stale_mappings!(match_mapping, synced_zone_mappings, match_section)
       end
 
-      def client
-        @client ||= @integration.client
-      end
-
       # Sync zones for a specific club and match
       def sync_zones!(match_mapping, match_section)
         external_club_id = match_mapping.external_payload&.dig('club_id')
         raise SpreeCmCommissioner::Integrations::SyncError, 'club_id is required' if external_club_id.blank?
 
         external_zones = begin
-          @sync_result.track_api_call('get_zones') { client.get_zones!(club_id: external_club_id, match_id: match_mapping.external_id) }
+          @sync_result.track_api_call('get_zones') { @client.get_zones!(club_id: external_club_id, match_id: match_mapping.external_id) }
         rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
           raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync zones match #{match_mapping.external_id}: #{e.message}"
         end

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_manager.rb

@@ -4,6 +4,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
     def sync_full!
       run_execution(:full) do
         SyncStrategies::FullSyncStrategy.new(
+          client: @client,
           integration: @integration
         ).call
       end
@@ -13,6 +14,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
     def sync_incremental!
       run_execution(:incremental) do
         SyncStrategies::IncrementalSyncStrategy.new(
+          client: @client,
           integration: @integration
         ).call
       end
@@ -22,6 +24,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
     def sync_webhook!(event_type:, event_data:)
       run_execution(:webhook) do
         SyncStrategies::WebhookSyncStrategy.new(
+          client: @client,
           integration: @integration,
           event_type: event_type,
           event_data: event_data

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/full_sync_strategy.rb

@@ -14,7 +14,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
     #      - Syncs zone data for one match per interval
     #      - Keeps data fresh without overwhelming the system
     class FullSyncStrategy
-      def initialize(integration:)
+      def initialize(client:, integration:)
+        @client = client
         @integration = integration
         @sync_result = ::SpreeCmCommissioner::Integrations::Base::SyncResult.new
       end
@@ -22,6 +23,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
       def call
         begin
           Polling::SyncMatches.new(
+            client: @client,
             integration: @integration,
             sync_result: @sync_result
           ).call

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/incremental_sync_strategy.rb

@@ -13,7 +13,8 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
     #
     # This ensures all matches get synced regularly without overwhelming the system.
     class IncrementalSyncStrategy
-      def initialize(integration:)
+      def initialize(client:, integration:)
+        @client = client
         @integration = integration
         @sync_result = ::SpreeCmCommissioner::Integrations::Base::SyncResult.new
       end
@@ -27,6 +28,7 @@ class SpreeCmCommissioner::Integrations::StadiumXV1
 
           Polling::SyncZones.new(
             integration: @integration,
+            client: @integration.client,
             sync_result: @sync_result
           ).call(external_match_id: oldest_sync_mapping.external_id)
 

data/app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/webhook_sync_strategy.rb

@@ -1,7 +1,8 @@
 class SpreeCmCommissioner::Integrations::StadiumXV1
   module SyncStrategies
     class WebhookSyncStrategy
-      def initialize(integration:, event_type:, event_data:)
+      def initialize(client:, integration:, event_type:, event_data:)
+        @client = client
         @integration = integration
         @event_type = event_type
         @event_data = event_data

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

@@ -5,10 +5,6 @@ module SpreeCmCommissioner
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
       def call(variant:, quantity:)
-        # The physical count still changes (it caps a channel manager's "unlimited"), but each night's
-        # sellable count is the partner's, and its next update would overwrite a shift.
-        return success(nil) if variant.inventory_external_wins?
-
         variant.inventory_items.active.find_each do |inventory_item|
           inventory_item.adjust_quantity!(quantity)
         end

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

@@ -32,10 +32,6 @@ module SpreeCmCommissioner
       end
 
       def variant_total_inventory(inventory_item)
-        # The partner sets the night's capacity (a channel manager's ApplyAri keeps max_capacity at
-        # pushed + sold), so recomputing it from the physical count would undo its last update.
-        return inventory_item.max_capacity if inventory_item.variant.inventory_external_wins?
-
         # for shipment, total_on_hand is not orignal stock. shipment does subtract the stock.
         # to get desire result, we need to add to total_purchase.
         if inventory_item.variant.delivery_required?

data/app/services/spree_cm_commissioner/order_holds/hold.rb

@@ -8,14 +8,12 @@ module SpreeCmCommissioner
 
       UnableToHoldSeatsError = Class.new(StandardError)
       UnableToHoldInventoryError = Class.new(StandardError)
-      UnableToHoldExternalInventoryError = Class.new(StandardError)
 
       HOLD_DURATION = ENV.fetch('HOLD_DURATION_IN_MINUTES', '8').to_i.minutes
 
       def call(order:, expires_at: HOLD_DURATION.from_now)
         held_blocks = hold_seat_blocks!(order, expires_at)
         inventory_hold = acquire_inventory_hold!(order, expires_at)
-        hold_external_inventory!(order)
 
         sync_hold_expires_at!(order, held_blocks, inventory_hold)
 
@@ -68,21 +66,6 @@ module SpreeCmCommissioner
 
         order.update!(hold_expires_at: earliest)
       end
-
-      def hold_external_inventory!(order)
-        integration_line_items = order.line_items.select(&:integration?)
-        return if integration_line_items.empty?
-
-        integration_line_items.group_by(&:vendor_id).each do |_, line_items|
-          integration = line_items.first&.vendor&.integration
-          next if integration.nil?
-          next unless integration.supports_external_inventory_holding?
-
-          integration.hold_inventory!(order, line_items)
-        end
-      rescue SpreeCmCommissioner::Integrations::SyncError => e
-        raise UnableToHoldExternalInventoryError, e.message
-      end
     end
   end
 end

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

@@ -8,12 +8,10 @@ module SpreeCmCommissioner
 
       UnableToCancelSeatsError = Class.new(StandardError)
       UnableToReleaseInventoryError = Class.new(StandardError)
-      UnableToReleaseExternalInventoryError = Class.new(StandardError)
 
       def call(order:, reason: :user_canceled)
         cancel_seat_blocks!(order)
         release_inventory_hold!(order, reason)
-        release_external_inventory!(order)
 
         order.update!(hold_expires_at: nil)
 
@@ -53,21 +51,6 @@ module SpreeCmCommissioner
 
         result.value
       end
-
-      def release_external_inventory!(order)
-        integration_line_items = order.line_items.select(&:integration?)
-        return if integration_line_items.empty?
-
-        integration_line_items.group_by(&:vendor_id).each_value do |line_items|
-          integration = line_items.first&.vendor&.integration
-          next if integration.nil?
-          next unless integration.supports_auto_release_inventory?
-
-          result = integration.release_inventory!(order, line_items)
-
-          raise UnableToReleaseExternalInventoryError, result.error.to_s unless result.success?
-        end
-      end
     end
   end
 end

data/app/services/spree_cm_commissioner/seat_layouts/update.rb

@@ -9,6 +9,10 @@ module SpreeCmCommissioner
 
       def call(seat_layout:, attributes:)
         attributes = attributes.deep_dup
+        # `background_svg_url` is derived (SeatLayout#background_svg_url), not a writable column —
+        # the event-scoped caller strips/handles it separately (background removal); other callers'
+        # editor payload includes it unconditionally, so drop it here rather than crashing on assign.
+        attributes.delete(:background_svg_url)
 
         ActiveRecord::Base.transaction do
           create_sections_for_existing_blocks!(seat_layout, attributes)

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

@@ -51,7 +51,7 @@ module SpreeCmCommissioner
           raise StandardError, "Outbound & inbound passenger counts do not match (#{outbound_qty_per_leg} vs #{inbound_qty_per_leg})"
         end
 
-        add_return_line_item!(order, outbound_legs, outbound_qty_per_leg, outbound_date) if include_return
+        add_return_line_item!(order, outbound_legs, outbound_line_items, outbound_qty_per_leg, outbound_date) if include_return
 
         order.preload_trip_ids = (outbound_legs.map(&:trip_id) + inbound_legs.map(&:trip_id)).flatten.uniq
         order.preload_main_trip_ids = (outbound_legs.map(&:main_trip_id) + inbound_legs.map(&:main_trip_id)).flatten.compact.uniq
@@ -182,7 +182,11 @@ module SpreeCmCommissioner
       # Setup is single-leg today, so the endpoints come straight off the outbound trip; when
       # multi-leg outbound is supported, the return origin is the last leg's drop-off place and the
       # return destination is the first leg's boarding place.
-      def add_return_line_item!(order, outbound_legs, quantity, outbound_date)
+      #
+      # The add-on is nested under the outbound line item (parent_id + relation_type) so clients can
+      # show it as part of the outbound ticket. A leg split across variants yields several outbound
+      # line items; the add-on then hangs off the first one, covering all passengers.
+      def add_return_line_item!(order, outbound_legs, outbound_line_items, quantity, outbound_date)
         return if quantity <= 0
         return unless outbound_legs.size == 1
 
@@ -196,6 +200,8 @@ module SpreeCmCommissioner
           product_type: :ecommerce,
           variant_id: addon.master.id,
           quantity: quantity,
+          parent: outbound_line_items.first,
+          relation_type: :open_dated_pair,
           from_date: from_date,
           to_date: to_date,
           open_dated_product_id: addon.id,

data/app/services/spree_cm_commissioner/users/backfill_device_tokens_count.rb

@@ -0,0 +1,48 @@
+# Some users have device tokens but a stale device_tokens_count of 0, so customer
+# notifications (which check device_tokens_count before sending push) skip them.
+# This service recounts device tokens and updates those users in batches.
+module SpreeCmCommissioner
+  module Users
+    class BackfillDeviceTokensCount
+      prepend Spree::ServiceModule::Base
+
+      BATCH_SIZE = 1000
+
+      def call(batch_size: BATCH_SIZE)
+        counts = device_tokens_count_by_user
+        ids = stale_user_ids(counts)
+
+        update_counts(ids, counts, batch_size)
+
+        success(updated_count: ids.size)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      # e.g: { 665 => 1, 448 => 1, 593 => 4 }
+      def device_tokens_count_by_user
+        SpreeCmCommissioner::DeviceToken.group(:user_id).count
+      end
+
+      # e.g: [665, 448, 593]
+      def stale_user_ids(counts)
+        Spree::User.where(id: counts.keys, device_tokens_count: 0).pluck(:id)
+      end
+
+      # Updates each batch in one query, giving every user its own count.
+      # e.g: ids [665, 448, 593], counts { 665 => 1, 448 => 1, 593 => 4 }
+      #   case_sql → "WHEN 665 THEN 1 WHEN 448 THEN 1 WHEN 593 THEN 4"
+      #   UPDATE spree_users
+      #   SET device_tokens_count = CASE id WHEN 665 THEN 1 WHEN 448 THEN 1 WHEN 593 THEN 4 END
+      #   WHERE id IN (665, 448, 593)
+      def update_counts(ids, counts, batch_size)
+        ids.each_slice(batch_size) do |batch_ids|
+          case_sql = batch_ids.map { |id| "WHEN #{id.to_i} THEN #{counts[id].to_i}" }.join(' ')
+          Spree::User.where(id: batch_ids).update_all("device_tokens_count = CASE id #{case_sql} END") # rubocop:disable Rails/SkipsModelValidations
+        end
+      end
+    end
+  end
+end

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

@@ -101,20 +101,4 @@
   <% if f.object.type == 'SpreeCmCommissioner::Integrations::StadiumXV1' || (f.object.new_record? && params[:type] == 'SpreeCmCommissioner::Integrations::StadiumXV1') %>
     <%= render partial: 'stadium_x_v1_fields', locals: { f: f } %>
   <% end %>
-
-  <% if f.object.type == 'SpreeCmCommissioner::Integrations::BookMeBusV1' || (f.object.new_record? && params[:type] == 'SpreeCmCommissioner::Integrations::BookMeBusV1') %>
-    <%= render partial: 'book_me_bus_v1_fields', locals: { f: f } %>
-  <% end %>
-
-  <% if f.object.type == 'SpreeCmCommissioner::Integrations::Larryta' || (f.object.new_record? && params[:type] == 'SpreeCmCommissioner::Integrations::Larryta') %>
-    <%= render partial: 'larryta_fields', locals: { f: f } %>
-  <% end %>
-
-  <% if f.object.type == 'SpreeCmCommissioner::Integrations::VireakBuntham' || (f.object.new_record? && params[:type] == 'SpreeCmCommissioner::Integrations::VireakBuntham') %>
-    <%= render partial: 'vireak_buntham_fields', locals: { f: f } %>
-  <% end %>
-
-  <% if f.object.type == 'SpreeCmCommissioner::Integrations::SwitchCm' || (f.object.new_record? && params[:type] == 'SpreeCmCommissioner::Integrations::SwitchCm') %>
-    <%= render partial: 'switch_cm_fields', locals: { f: f } %>
-  <% end %>
 </div>

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

@@ -31,7 +31,7 @@
             <td><%= integration.name %></td>
 
             <td>
-              <%= integration_base_url_link(integration.try(:base_url)) %>
+              <%= integration_base_url_link(integration.base_url) %>
             </td>
 
             <td>

data/config/locales/en.yml

@@ -161,7 +161,6 @@ en:
     air_bus: "Air Bus"
     bus: "Bus"
     ferry: "Ferry"
-    boat: "Boat"
     train: "Train"
 
   line_item:
@@ -672,7 +671,6 @@ en:
       import_already_exists: "Import Already Exists"
       integration_sync_enqueued: "Integration sync has been enqueued"
       integration_inactive: "Integration is inactive"
-      inventory_external_wins: "Managed by %{name}: its stock and prices are set by the channel manager"
       external_integrations:
         view_result: "View Result"
         sync_result: "Sync Result"

data/config/locales/km.yml

@@ -130,7 +130,6 @@ km:
     air_bus: "Air Bus"
     bus: "Bus"
     ferry: "Ferry"
-    boat: "Boat"
     train: "រថភ្លើង"
 
   line_item:
@@ -445,7 +444,6 @@ km:
       import_already_exists: "ឯកសារយោងមានរួចហើយ"
       integration_sync_enqueued: "ការធ្វើសមកាលកម្មបានដាក់ក្នុងជួរ"
       integration_inactive: "ការភ្ជាប់មិនដំណើរការ"
-      inventory_external_wins: "គ្រប់គ្រងដោយ %{name}៖ ស្តុក និងតម្លៃ ត្រូវបានកំណត់ដោយ channel manager"
       external_integrations:
         view_result: "មើលលទ្ធផល"
         sync_result: "លទ្ធផលធ្វើសមកាលកម្ម"

data/config/routes.rb

@@ -1,30 +1,6 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
 
-  # switch.cm's channel-manager API. Its base URL is <host>/api/switch_cm, and everything after it is
-  # Booking.com's paths, so a connector built for Booking.com only swaps the base URL.
-  scope 'api/switch_cm', module: 'api/switch_cm', as: :switch_cm do
-    post 'token-based-authentication/exchange', to: 'tokens#create', as: :token_exchange
-
-    scope 'hotels/ota', module: :ota, as: :ota do
-      get 'OTA_HotelProductNotif', to: 'product_notifs#show', as: :product_notif
-      post 'OTA_HotelAvailNotif', to: 'avail_notifs#create', as: :avail_notifs
-      post 'OTA_HotelRateAmountNotif', to: 'rate_amount_notifs#create', as: :rate_amount_notifs
-      get 'OTA_HotelResNotif', to: 'res_notifs#index', as: :res_notifs
-      post 'OTA_HotelResNotif', to: 'res_notifs#acknowledge'
-      get 'OTA_HotelResModifyNotif', to: 'res_modify_notifs#index', as: :res_modify_notifs
-      post 'OTA_HotelResModifyNotif', to: 'res_modify_notifs#acknowledge'
-    end
-
-    scope 'hotels/xml', module: :xml, as: :xml do
-      post 'roomrates', to: 'room_rates#create', as: :room_rates
-      post 'availability', to: 'availabilities#create', as: :availabilities
-      post 'roomrateavailability', to: 'room_rate_availabilities#create', as: :room_rate_availabilities
-      post 'reservations', to: 'reservations#create', as: :reservations
-      post 'reservationssummary', to: 'reservation_summaries#create', as: :reservation_summaries
-    end
-  end
-
   authenticate :spree_user, -> (user) { user.admin? || user.organizer? || user.vendors.exists? } do
     mount Blazer::Engine, at: 'admin/bi_reports'
   end
@@ -873,7 +849,6 @@ Spree::Core::Engine.add_routes do
         end
         namespace :transit do
           resources :draft_orders, only: %i[create]
-          resources :item_availabilities, only: %i[create]
         end
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]

data/db/migrate/20260925000000_change_commission_rate_default_on_spree_vendors.rb

@@ -0,0 +1,5 @@
+class ChangeCommissionRateDefaultOnSpreeVendors < ActiveRecord::Migration[7.0]
+  def change
+    change_column_default :spree_vendors, :commission_rate, from: 5.0, to: 0.0
+  end
+end

data/db/migrate/20260925090000_add_parent_id_and_relation_type_to_spree_line_items.rb

@@ -0,0 +1,6 @@
+class AddParentIdAndRelationTypeToSpreeLineItems < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :spree_line_items, :parent, foreign_key: { to_table: :spree_line_items }, index: true, null: true
+    add_column :spree_line_items, :relation_type, :integer, null: true
+  end
+end

data/lib/spree_cm_commissioner/cached_inventory_item.rb

@@ -14,8 +14,7 @@ module SpreeCmCommissioner
                 :quantity_locked_on_hold,
                 :max_capacity,
                 :inventory_item_id,
-                :variant_id,
-                :closed
+                :variant_id
 
     def initialize(options = {})
       @inventory_key = options[:inventory_key]
@@ -28,17 +27,12 @@ module SpreeCmCommissioner
       @max_capacity = options[:max_capacity]
       @inventory_item_id = options[:inventory_item_id]
       @variant_id = options[:variant_id]
-      @closed = options[:closed]
     end
 
     def active?
       active
     end
 
-    def sellable?
-      active? && !closed
-    end
-
     def to_h
       instance_variables.each_with_object({}) do |var, hash|
         hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)

data/lib/spree_cm_commissioner/test_helper/factories/integration_factory.rb

@@ -22,21 +22,4 @@ FactoryBot.define do
     private_key { FFaker::Lorem.characters(40) }
     base_url { 'https://api.stadiumx.com' }
   end
-
-  factory :cm_switch_cm_integration, parent: :cm_integration, class: SpreeCmCommissioner::Integrations::SwitchCm do
-    type { 'SpreeCmCommissioner::Integrations::SwitchCm' }
-    association :oauth_application, factory: :oauth_application
-    conflict_strategy { :external_wins }
-  end
-
-  factory :cm_larryta_integration, parent: :cm_integration, class: SpreeCmCommissioner::Integrations::Larryta do
-    private_metadata do
-      {
-        'base_url' => 'https://api.larryta.com',
-        'username' => FFaker::Internet.user_name,
-        'api_token' => FFaker::Lorem.characters(40),
-        'api_uid' => FFaker::Lorem.characters(20)
-      }
-    end
-  end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.13.3-pre2'.freeze
+  VERSION = '2.13.3'.freeze
 
   module_function
 

data/lib/tasks/backfill_device_tokens_count.rake

@@ -0,0 +1,8 @@
+namespace :spree_cm_commissioner do
+  namespace :users do
+    desc 'Backfill stale device_tokens_count for spree_users that have device_tokens but count is 0'
+    task backfill_device_tokens_count: :environment do
+      SpreeCmCommissioner::Users::BackfillDeviceTokensCount.call
+    end
+  end
+end