spree_cm_commissioner 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba98474e53d7bb369512ec096ad8459a8baae5d2d77985462e99d48cd4d68820
-  data.tar.gz: 9588226b0da09b905292b7518b656ee4261d03ca1e6e55beb526a96ee3365e87
+  metadata.gz: 2d7734080da716bf13a816acbd174d75272acdbbf4fd5a257d5e6c535eb7cece
+  data.tar.gz: 310a647df40f1c0d6f0cab1a3f676d7f558e07d0a45108addd7a1d552ebd4083
 SHA512:
-  metadata.gz: f09ce118715100ba4d56d0b3c828c946277d632329c1b84e0517f1b513ec4cf64d055bceb6696983324b46f4df428ad0626f959dc961f1e73bdf22c4fac79b51
-  data.tar.gz: 72ca04d1fe1ab0f6741269127a90b9f005c7569b55b7e41e619fa3bce15564131414dacf36d619a4d44020a57e8e298581d42f0a06b7933a682343058a266e39
+  metadata.gz: efb1b8f98edd7bb4a815086717aad5722a2e22ca6dd7c9472df0aa18ce1259cbd26674c45a3b0e8a064ff69e194f6b650bfded02528d7ef6078c74e62aad0fee
+  data.tar.gz: e578ec7e879cfade2a629c9a452283689942890aae8ad5b82b81bb67dba4f3155aaba401f76d77ae603435614e90a610293f2e1c9fde942627dab76bec5f6241

data/.github/workflows/test_and_build_gem.yml

@@ -117,7 +117,9 @@ jobs:
 
   setup:
     needs: [validate-commits]
-    runs-on: ubuntu-latest
+    # Pinned (also test/build_and_publish): newer images only ship the latest 3.2.x patch, and
+    # production runs exactly ruby:3.2.0 (cm-market-server Dockerfile-app).
+    runs-on: ubuntu-24.04
 
     services:
       db:
@@ -170,7 +172,7 @@ jobs:
 
   test:
     needs: [setup]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.event_name == 'pull_request'
 
     strategy:
@@ -279,7 +281,7 @@ jobs:
 
   build_and_publish:
     needs: [setup]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:

data/Gemfile.lock

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

data/app/assets/javascripts/spree_cm_commissioner/backend.js

@@ -4,3 +4,4 @@
 //= require spree_cm_commissioner/annual_calendar_form
 //= require spree_cm_commissioner/tenant_payment_icon_fields
 //= require spree_cm_commissioner/copy_to_clipboard
+//= require spree_cm_commissioner/promotion_rule_pickers

data/app/assets/javascripts/spree_cm_commissioner/promotion_rule_pickers.js

@@ -0,0 +1,12 @@
+// Our product/user/vendors promotion rule partials use select2autocomplete, which spree_backend only
+// initializes on spree:load. "Add rule" is a remote form whose create.js.erb appends the new rule and
+// re-inits only the core product_picker/user_picker, so without this the new rule's picker stays a
+// plain, empty select until the page is reloaded.
+//
+// jquery_ujs fires ajax:complete as a jQuery event (not a DOM one), after the JS response has run.
+// Delegated from document so Turbo page loads don't stack duplicate listeners.
+$(document).on("ajax:complete", "#new_product_rule_form", function () {
+  $("#rules select[data-autocomplete-url-value]:not(.select2-hidden-accessible)").each(function () {
+    buildParamsFromDataAttrs(this);
+  });
+});

data/app/controllers/spree/api/v2/platform/homepage_section_relatable_options_controller.rb

@@ -7,6 +7,7 @@ module Spree
             return Spree::Vendor if params['model_class'] == 'Spree::Vendor'
             return Spree::Product if params['model_class'] == 'Spree::Product'
             return Spree::Taxon if params['model_class'] == 'Spree::Taxon'
+            return Spree.user_class if params['model_class'] == 'Spree::User'
 
             nil
           end

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

@@ -42,13 +42,8 @@ module SpreeCmCommissioner
       }
     end
 
-    # "Name (slug)" for a product/event/vendor, so same-named records can be told apart in the
-    # admin scope-target picker. Events (taxons) show their permalink first: that's what the
-    # picker searches them by, and it reads clearer than the taxon's generated slug.
     def self.ruleable_label(record)
-      name = record.respond_to?(:pretty_name) ? record.pretty_name : record.try(:name)
-      slug = record.try(:permalink).presence || record.try(:slug).presence
-      slug ? "#{name} (#{slug})" : name.to_s
+      SpreeCmCommissioner::RelatableOptionLabel.call(record)
     end
 
     class_methods do

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -187,16 +187,21 @@ module SpreeCmCommissioner
       "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
     end
 
-    # Same default stay as Vendor#hotel_url so the dashboard's room preview opens on bookable dates.
+    # Same default stay as Vendor#hotel_url. `hotel` is the vendor slug, matching the `vendorSlug`
+    # param the app's RoomDetailsRoute expects when a guest taps through from the room list.
     def room_url
       checkin_date = Date.tomorrow
+      # Rooms only support a single variant for now, so `first` is safe here. Once multivariant
+      # rooms ship, this needs to pick the specific variant being previewed instead.
+      room_variant = variants.first
       query = {
+        hotel: vendor&.slug,
         roomQty: 1,
-        numberOfAdults: 2,
-        numberOfChildren: 0,
+        numberOfAdults: room_variant&.number_of_adults || SpreeCmCommissioner::VariantOptions::DEFAULT_NUMBER_OF_ADULTS,
+        numberOfChildren: room_variant&.number_of_kids || 0,
         checkinDate: checkin_date.iso8601,
         checkoutDate: (checkin_date + 2.days).iso8601
-      }.to_query
+      }.compact.to_query
 
       "#{Spree::Store.default.formatted_url}/rooms/#{slug}?#{query}"
     end

data/app/models/spree_cm_commissioner/relatable_option_label.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  # "Name (slug)" label for records picked via the homepage_section_relatable_options endpoint
+  # (fee rule targets, promotion rules), so same-named records can be told apart. Events (taxons)
+  # show their permalink: that's what pickers search them by, and it reads clearer than the
+  # taxon's generated slug. Users have no name/slug, so they show "Full name - email (login)".
+  module RelatableOptionLabel
+    def self.call(record)
+      return user_label(record) if record.is_a?(Spree.user_class)
+
+      name = record.respond_to?(:pretty_name) ? record.pretty_name : record.try(:name)
+      slug = record.try(:permalink).presence || record.try(:slug).presence
+      slug ? "#{name} (#{slug})" : name.to_s
+    end
+
+    def self.user_label(user)
+      name = [user.full_name, user.email.presence || user.phone_number].compact_blank.join(' - ')
+      user.login.present? ? "#{name} (#{user.login})" : name
+    end
+  end
+end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -14,11 +14,16 @@ module SpreeCmCommissioner
 
       base.attr_accessor :service_availabilities
 
+      # slug lets admin pickers (e.g. the promotion vendors rule) tell same-named vendors apart.
+      base.whitelisted_ransackable_attributes = %w[name state slug]
+
       base.store :preferences, accessors: %i[account_name account_number penalty_rate penalty_label six_months_discount twelve_months_discount]
 
       base.store_public_metadata :sellable_product_types, :array, default: []
       base.validate :validate_sellable_product_types
 
+      base.before_validation :strip_about_us_html, if: :accommodation?
+
       base.before_save :generate_code, if: :code.nil?
 
       base.before_save :set_default_service_origin, if: :new_record?
@@ -234,6 +239,16 @@ module SpreeCmCommissioner
       self.code = (code.presence || name[0, 3].upcase)
     end
 
+    # Accommodation vendors only expose a plain textarea for `about_us` (the app renders it as
+    # plain `Text`, unlike the TinyMCE-backed `about_us` on other vendor kinds, which the app
+    # renders as HTML) — so pasted markup (e.g. from an Elementor/WordPress export) must be
+    # stripped here rather than rendered literally in the app.
+    def strip_about_us_html
+      return if about_us.blank?
+
+      self.about_us = CGI.unescapeHTML(::ActionController::Base.helpers.strip_tags(about_us)).strip
+    end
+
     def organizer_url
       "#{Spree::Store.default.formatted_url}/organizers/#{slug}"
     end

data/app/serializers/spree_cm_commissioner/api/v2/platform/homepage_section_relatable_options_serializer.rb

@@ -3,9 +3,9 @@ module SpreeCmCommissioner
     module V2
       module Platform
         class HomepageSectionRelatableOptionsSerializer < ::Spree::Api::V2::Platform::BaseSerializer
-          # Used by the fee rule forms' scope-target picker; other callers keep using `name`.
+          # Used by the fee rule and promotion rule pickers; other callers keep using `name`.
           attribute :name_with_slug do |object|
-            SpreeCmCommissioner::ScopedFeeRule.ruleable_label(object)
+            SpreeCmCommissioner::RelatableOptionLabel.call(object)
           end
 
           attribute :name do |object|

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

@@ -23,6 +23,17 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::ExternalClient
       handle_response(response, SpreeCmCommissioner::Integrations::BookMeBusV1::Resources::Location, collection: true)
     end
 
+    # Get the operator's published trips with their cities in travel order. BookMeBus caches this list for
+    # 7 days, so a brand-new trip can take that long to show up.
+    # @return [Array<SpreeCmCommissioner::Integrations::BookMeBusV1::Resources::TripLocation>]
+    def get_trip_locations! # rubocop:disable Naming/AccessorMethodName
+      endpoint = "#{BASE_PATH}/trip_locations"
+      params = { operator_id: integration.operator_id }.compact
+
+      response = get(endpoint, params)
+      handle_response(response, SpreeCmCommissioner::Integrations::BookMeBusV1::Resources::TripLocation, collection: true) || []
+    end
+
     # Trip Operations
 
     # Search available trips for a given route and date

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/inventory/external_inventory_items.rb

@@ -48,7 +48,7 @@ module SpreeCmCommissioner
 
           def fetch_seat_layout(line_item, trip_mapping)
             integration.client.get_seat_layout!(
-              trip_id: trip_mapping.external_id.to_i,
+              trip_id: external_trip_id(trip_mapping),
               from_stop_id: fetch_stop_id(trip_mapping, line_item.boarding_trip_stop_id, 'from_stop_id'),
               to_stop_id: fetch_stop_id(trip_mapping, line_item.drop_off_trip_stop_id, 'to_stop_id'),
               on_date: line_item.from_date.to_date.strftime('%Y-%m-%d')
@@ -70,7 +70,7 @@ module SpreeCmCommissioner
             items = []
             items += seat_layout.seats.map do |seat|
               {
-                id: "#{trip_mapping.external_id}-#{seat.label}",
+                id: "#{item_key(trip_mapping)}-#{seat.label}",
                 seat_label: seat.label,
                 seat_type: seat.seat_type_name,
                 layer: seat.layer,
@@ -79,11 +79,24 @@ module SpreeCmCommissioner
                 position: seat.position,
                 from_stop_id: seat_layout.from_stop_id,
                 departure_date: line_item.from_date.to_date.strftime('%Y-%m-%d'),
-                trip_id: trip_mapping.external_id.to_i
+                trip_id: external_trip_id(trip_mapping)
               }
             end
             items
           end
+
+          # The dashboard builds turbo-frame/drawer DOM ids from the item id, and a colon makes those ids unusable in
+          # CSS selectors - Turbo then cannot match the frame and shows "Content missing". The segment key
+          # ("1669:1:2") therefore has its colons swapped for dashes.
+          def item_key(trip_mapping)
+            trip_mapping.external_id.to_s.tr(':', '-')
+          end
+
+          # The mapping's external_id is a per-segment key (see Resources::Trip#sync_identifier); the raw
+          # BookMeBus trip id lives in the payload.
+          def external_trip_id(trip_mapping)
+            (trip_mapping.external_payload&.dig('trip_id') || trip_mapping.external_id).to_i
+          end
         end
       end
     end

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/inventory/unstock_inventory.rb

@@ -48,7 +48,9 @@ class SpreeCmCommissioner::Integrations::BookMeBusV1::Inventory::UnstockInventor
     )
     raise SpreeCmCommissioner::Integrations::SyncError, "Integration mapping not found for trip ##{internal_trip_id}" if trip_mapping.nil?
 
-    external_trip_id = trip_mapping.external_id
+    # The mapping's external_id is a per-segment key (see Resources::Trip#sync_identifier); the raw
+    # BookMeBus trip id lives in the payload.
+    external_trip_id = trip_mapping.external_payload&.dig('trip_id') || trip_mapping.external_id
     raise SpreeCmCommissioner::Integrations::SyncError, 'External trip_id missing from mapping' if external_trip_id.blank?
 
     boarding_mapping = find_trip_stop_mapping(integration, line_item.boarding_trip_stop_id)
@@ -71,10 +73,10 @@ class SpreeCmCommissioner::Integrations::BookMeBusV1::Inventory::UnstockInventor
         from_stop_time_id: from_stop_time_id,
         to_stop_time_id: to_stop_time_id,
         departure_date: line_item.from_date.to_date.strftime('%Y-%m-%d'),
-        reserved_seats: build_reserved_seats(line_item, from_stop_id, integration),
+        reserved_seats: build_reserved_seats(line_item, from_stop_id, integration, single_layer_name(trip_mapping.internal, integration)),
         contact_name: address&.full_name.presence || order.email,
         contact_email: order.email,
-        contact_phone: address&.phone.presence || order.user&.phone,
+        contact_phone: contact_phone_for(order, address),
         internal_order: order
       }
     )
@@ -145,7 +147,7 @@ class SpreeCmCommissioner::Integrations::BookMeBusV1::Inventory::UnstockInventor
   # expects a full passenger list with label/layer nil in that case, not an empty payload, so it
   # can assign real seats server-side - dropping those guests entirely would undercount
   # number_of_seats and reserve fewer seats than the order was actually paid for.
-  def build_reserved_seats(line_item, from_stop_id, integration) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+  def build_reserved_seats(line_item, from_stop_id, integration, default_layer = nil) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     seats = line_item.guests.map do |guest|
       seat_label = guest.block&.label
 
@@ -162,7 +164,7 @@ class SpreeCmCommissioner::Integrations::BookMeBusV1::Inventory::UnstockInventor
         name: name,
         label: seat_label,
         seat_type: block_type == 'seat' || block_type.blank? ? 'normal' : block_type,
-        layer: seat_label.present? ? (guest.block&.seat_section&.name || 'BUS') : nil,
+        layer: seat_label.present? ? (guest.block&.seat_section&.name || default_layer || 'BUS') : nil,
         nationality: guest_nationality_code(guest, integration)
       }
     end
@@ -170,6 +172,34 @@ class SpreeCmCommissioner::Integrations::BookMeBusV1::Inventory::UnstockInventor
     seats.empty? ? {} : { from_stop_id.to_s => seats }
   end
 
+  # A single-layer layout keeps its blocks top-level (no SeatSection, see SyncSeatLayout#build_seat_sections_by_layer),
+  # so the block carries no layer name. BookMeBus only marks a seat taken when label *and* layer match its own
+  # layout, and a single layer is not always called "BUS" ("VIP VAN", "2", ...) - sending the 'BUS' fallback left
+  # the seat reserved but still showing free in BookMeBus's seat map. The real name is recorded in the payload of
+  # the vehicle type's seat-layout mapping.
+  def single_layer_name(trip, integration)
+    seat_layout = trip&.vehicle_type&.seat_layout
+    return if seat_layout.blank?
+
+    layers = SpreeCmCommissioner::IntegrationMapping.find_by(
+      integration_id: integration.id,
+      internal_type: 'SpreeCmCommissioner::SeatLayout',
+      internal_id: seat_layout.id,
+      status: :active
+    )&.external_payload&.dig('layers')
+
+    layers.first if layers.is_a?(Array) && layers.size == 1
+  end
+
+  # The billing address first. A booking made in the app often has no phone on it, so fall back to the contact
+  # number the order itself carries, then the account's, preferring the international format. Spree::User has
+  # `phone_number` / `intel_phone_number` - there is no `phone`, which raised NoMethodError on those bookings.
+  def contact_phone_for(order, address)
+    address&.phone.presence ||
+      order.intel_phone_number.presence || order.phone_number.presence ||
+      order.user&.intel_phone_number.presence || order.user&.phone_number.presence
+  end
+
   # Mirrors PricingModels::GuestContext's own fallback order (nationality_id, then
   # guest.nationality_group, then guest.saved_guest.nationality_group) so the reservation actually
   # sent to BookMeBus agrees with whatever nationality pricing already used to price the guest.

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_locations.rb

@@ -12,6 +12,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       raise SpreeCmCommissioner::Integrations::SyncError, 'Integration must have a vendor to sync locations' if @integration.vendor.blank?
 
       synced_location_mappings = sync_items!
+      return if synced_location_mappings.nil?
 
       cleanup_stale_mappings!(synced_location_mappings)
     end
@@ -26,19 +27,38 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       @geocoder ||= SpreeCmCommissioner::GoogleMapsGeocoder.new
     end
 
-    # Sync all available locations from the API and create them as places
+    # Sync the cities on the operator's published trips as places. `/locations` lists every city on BookMeBus
+    # (240+, mixed provinces, piers, villages), almost none of which this operator serves; each extra place costs
+    # a geocoding call and clutters the search pickers. The trip legs carry the same city records.
     def sync_items!
-      external_locations = begin
-        @sync_result.track_api_call('get_locations') { client.get_locations! }
-      rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
-        raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync locations: #{e.message}"
+      external_locations = fetch_external_locations
+
+      # Nothing usable: keep the current places rather than archive them all on what may be a bad response.
+      if external_locations.empty?
+        Rails.logger.warn "BookMeBusV1 SyncLocations: no locations returned for integration ##{@integration.id}, keeping existing locations"
+        return nil
       end
 
-      external_locations.map do |external_location|
+      external_locations.filter_map do |external_location|
         sync_item!(external_location)
+      rescue SpreeCmCommissioner::GoogleMapsGeocoder::GeocodingError => e
+        # One city Google can't find (e.g. a village) must not abort the rest; without a place it can't be routed anyway.
+        Rails.logger.warn "BookMeBusV1 SyncLocations: skipped location #{external_location.id} (#{external_location.name}): #{e.message}"
+        @sync_result.increment_metric(:location, :skipped)
+        nil
       end
     end
 
+    def fetch_external_locations
+      trip_locations = begin
+        @sync_result.track_api_call('get_trip_locations') { client.get_trip_locations! }
+      rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
+        raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync locations: #{e.message}"
+      end
+
+      trip_locations.flat_map(&:locations).uniq(&:id)
+    end
+
     # Sync a single location and create it as a place with vendor place mapping
     def sync_item!(external_location)
       mapping = SpreeCmCommissioner::VendorPlace.find_or_initialize_integration_mapping(
@@ -49,7 +69,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       vendor_place = mapping.internal
 
       place = vendor_place.place ||
-        SpreeCmCommissioner::Place.find_by(name: external_location.name) ||
+        find_city_place(external_location.name) ||
         SpreeCmCommissioner::Place.new
 
       @sync_result.track(:location, place) do |tracker|
@@ -83,6 +103,18 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       mapping
     end
 
+    # A city only ever matches a top-level place. Stop places (children of a city, named after their stop) can share
+    # the city's name, and an unscoped `find_by(name:)` could pick one, which pointed a vendor's trips at a stop place the
+    # app never searches. Whitespace/case are ignored (BookMeBus names carry stray spaces), and the oldest place wins so
+    # the choice is stable when duplicates already exist.
+    def find_city_place(name)
+      SpreeCmCommissioner::Place
+        .where(parent_id: nil)
+        .where('LOWER(TRIM(name)) = ?', name.to_s.strip.downcase)
+        .order(:id)
+        .first
+    end
+
     # Archive stale location mappings that are no longer in the external API
     def cleanup_stale_mappings!(synced_location_mappings)
       synced_ids = synced_location_mappings.to_set(&:external_id)

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_product.rb

@@ -18,7 +18,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     end
 
     def call(external_trip:, price:)
-      external_id = "product-#{external_trip.trip_id}"
+      external_id = "product-#{external_trip.sync_identifier}"
 
       mapping = Spree::Product.find_or_initialize_integration_mapping(
         integration_id: @integration.id,

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_routes.rb

@@ -11,18 +11,28 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     def call
       raise SpreeCmCommissioner::Integrations::SyncError, 'Integration must have a vendor to sync routes' if @integration.vendor.blank?
 
-      synced_route_mappings = sync_items!
+      location_pairs = build_location_pairs
+
+      # Nothing usable (operator has no published trips, or BookMeBus returned nothing we can map): leave the
+      # current routes alone rather than archive them all on what may be a bad response.
+      if location_pairs.empty?
+        Rails.logger.warn "BookMeBusV1 SyncRoutes: no routes returned for integration ##{@integration.id}, keeping existing routes"
+        return
+      end
+
+      synced_route_mappings = sync_items!(location_pairs)
 
       cleanup_stale_mappings!(synced_route_mappings)
     end
 
     private
 
-    # Generate routes from location pairs and sync them
-    def sync_items!
-      location_pairs = build_location_pairs
-      return [] if location_pairs.empty?
+    def client
+      @client ||= @integration.client
+    end
 
+    # Sync a route for each location pair
+    def sync_items!(location_pairs)
       location_pairs.map do |origin_mapping, destination_mapping|
         sync_item!(origin_mapping, destination_mapping)
       end.compact
@@ -77,7 +87,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       "route-#{origin_mapping.external_id}-#{destination_mapping.external_id}"
     end
 
-    # Build all location pairs (A->B and B->A)
+    # Only the pairs BookMeBus has published trips for, not every combination of locations: an operator with
+    # 240 locations runs ~20 routes, and every extra route costs a search per day in SyncTrips.
     def build_location_pairs
       location_mappings = SpreeCmCommissioner::IntegrationMapping
                           .includes(internal: :place)
@@ -86,17 +97,24 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
                             internal_type: 'SpreeCmCommissioner::VendorPlace',
                             status: :active
                           )
-                          .to_a
-      pairs = []
-      location_mappings.combination(2).each do |origin, destination|
-        pairs << [origin, destination]
-        pairs << [destination, origin]
+                          .index_by(&:external_id)
+
+      external_trip_locations.flat_map(&:location_pairs).uniq.filter_map do |origin_id, destination_id|
+        origin_mapping = location_mappings[origin_id]
+        destination_mapping = location_mappings[destination_id]
+
+        [origin_mapping, destination_mapping] if origin_mapping && destination_mapping
       end
+    end
 
-      pairs
+    # Raised before any route is written, so a failed call never reaches cleanup_stale_mappings!.
+    def external_trip_locations
+      @sync_result.track_api_call('get_trip_locations') { client.get_trip_locations! }
+    rescue SpreeCmCommissioner::Integrations::ExternalClientError => e
+      raise SpreeCmCommissioner::Integrations::SyncError, "Failed to sync routes: #{e.message}"
     end
 
-    # Archive stale route mappings that are no longer in the generated pairs
+    # Archive stale route mappings that BookMeBus no longer lists
     def cleanup_stale_mappings!(synced_route_mappings)
       synced_ids = synced_route_mappings.to_set(&:external_id)
       active_mappings = SpreeCmCommissioner::IntegrationMapping.where(

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_seat_layout.rb

@@ -121,7 +121,10 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       # template every other trip of that vehicle_type duplicates from on creation. Only seed it
       # once; each trip's own duplicated SeatLayout is what stays continuously in sync afterward
       # (see duplicate_to_trip_if_needed!/sync_trip_seat_layout!).
-      return seat_layout if seat_layout.persisted?
+      if seat_layout.persisted?
+        backfill_vehicle_type_seats!(vehicle_type, seat_layout)
+        return seat_layout
+      end
 
       # Calculate dimensions based on layout
       dimensions = calculate_layout_dimensions(external_seat_layout)
@@ -142,6 +145,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       # Sync blocks (seats) for this layout - no variant for templates
       sync_blocks!(seat_layout: seat_layout, external_seat_layout: external_seat_layout, variant: nil)
 
+      backfill_vehicle_type_seats!(vehicle_type, seat_layout)
+
       # Mark mapping as active
       mapping.mark_as_active!(
         external_payload: {
@@ -156,6 +161,18 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       seat_layout
     end
 
+    # VehicleType#number_of_seats is what the apps print beside the vehicle ("VIP Van · 15 Seat"). SyncVehicleTypes
+    # cannot set it per trip (the record is shared by many trips), so it stayed 0 and every synced trip read
+    # "0 Seat" while a manually created vehicle type shows its count. The template layout is seeded once per
+    # vehicle type, so its seat total is the one stable value to copy. Only when unset: a count an operator
+    # entered is never overwritten.
+    def backfill_vehicle_type_seats!(vehicle_type, seat_layout)
+      return if vehicle_type.number_of_seats.to_i.positive?
+
+      total = seat_layout.total_seats.to_i
+      vehicle_type.update!(number_of_seats: total) if total.positive?
+    end
+
     # Duplicate vehicle_type seat layout to trip if trip doesn't have one
     # This ensures trips always get seat layouts even when the vehicle_type template
     # is created in the same sync operation
@@ -306,7 +323,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     # top-level (no seat_section), matching prior behavior exactly. Only a genuinely
     # multi-layer layout (double-decker: "BUS" + "UPPER_DECK") gets one SeatSection per
     # layer, so `block.seat_section&.name` reports the real deck instead of always
-    # falling back to the 'BUS' default UnstockInventory uses when it's nil.
+    # falling back to the 'BUS' default UnstockInventory uses when it's nil. A single layer's real name is
+    # kept in the template mapping's `layers` payload instead - UnstockInventory#single_layer_name reads it.
     #
     # @return [Hash{String => SpreeCmCommissioner::SeatSection}] section per layer name
     def build_seat_sections_by_layer(seat_layout, blocks_attrs)

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_service_calendars.rb

@@ -44,16 +44,24 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     def build_exception_rules(external_rules)
       return [] unless external_rules.is_a?(Array)
 
-      external_rules.filter_map do |rule|
-        next unless rule.is_a?(Hash)
-
-        {
-          'from' => rule['from'] || rule['start_date'],
-          'to' => rule['to'] || rule['end_date'],
-          'type' => rule['type'] || 'exclusion',
-          'reason' => rule['reason'] || rule['not_available_reason']
-        }.compact
-      end
+      external_rules.filter_map { |rule| build_exception_rule(rule) }
+    end
+
+    def build_exception_rule(rule)
+      return unless rule.is_a?(Hash)
+
+      # BookMeBus sends exception dates as "13/10/2023", but ServiceCalendar's JSON schema only accepts
+      # ISO dates - an unnormalised rule made the whole calendar invalid, which dropped the trip.
+      from = parse_date(rule['from'] || rule['start_date'])&.iso8601
+      to = parse_date(rule['to'] || rule['end_date'])&.iso8601
+      return unless from && to
+
+      {
+        'from' => from,
+        'to' => to,
+        'type' => rule['type'] || 'exclusion',
+        'reason' => rule['reason'] || rule['not_available_reason']
+      }.compact
     end
   end
 end

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_trip_stop.rb

@@ -112,8 +112,13 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
           stop_place: stop_place,
           location_place: location_place,
           sequence: sequence,
-          allow_boarding: sequence != total_stops,
-          allow_drop_off: sequence != 1,
+          # Each route pair owns its own trip (see Resources::Trip#sync_identifier), so a trip is only
+          # boardable at its first stop and only droppable at its last. Letting intermediate stops board or
+          # drop off made the same bus match every neighbouring search through its stops (a Sihanoukville
+          # → Siem Reap trip also listed under Phnom Penh → Siem Reap, with its own seat count), where
+          # BookMeBus returns one entry per search.
+          allow_boarding: sequence == 1,
+          allow_drop_off: sequence == total_stops,
           departure_time: parse_time(stop_time_data['departure_time']),
           arrival_time: parse_time(incoming_arrival_time)
         )

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_variant.rb

@@ -23,7 +23,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       # Product/Trip/VehicleType instead of being the one exception to the pattern.
       mapping = Spree::Variant.find_or_initialize_integration_mapping(
         integration_id: @integration.id,
-        external_id: build_variant_sku(external_trip)
+        external_id: build_variant_external_id(external_trip)
       )
 
       variant = mapping.internal
@@ -47,8 +47,15 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
 
     private
 
+    # Mapping key; already scoped by integration_id, so it needs no vendor part.
+    def build_variant_external_id(external_trip)
+      "variant-#{external_trip.sync_identifier}"
+    end
+
+    # Spree requires a SKU to be unique across all vendors, so it carries the vendor id: two vendors syncing the
+    # same BookMeBus operator (same trip ids) would otherwise collide on "SKU has already been taken".
     def build_variant_sku(external_trip)
-      "variant-#{external_trip.trip_id}"
+      "variant-#{@vendor.id}-#{external_trip.sync_identifier}"
     end
 
     def standard_seat_option_value

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/polling/sync_vehicle_types.rb

@@ -53,7 +53,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
         # per-trip seat count already lives on the trip's own SeatLayout (total_seats).
         vehicle_type.assign_attributes(
           vendor: @integration.vendor,
-          name: external_trip.vehicle_type_name,
+          name: unique_name_for(vehicle_type, external_trip),
           kind: map_vehicle_type_to_kind(external_trip.vehicle_type_type_name)
         )
         tracker.save_if_changed!(vehicle_type)
@@ -65,6 +65,17 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
 
     private
 
+    # VehicleType#name is unique per vendor, but BookMeBus can hold several vehicle types with the same
+    # name under different ids (e.g. two "Night Bus", ids 123 and 159). Saving the second one failed, which
+    # silently dropped every trip using it. The id is appended only on a real clash, so the first keeps its
+    # plain name and the result stays stable across re-syncs.
+    def unique_name_for(vehicle_type, external_trip)
+      name = external_trip.vehicle_type_name
+      taken = SpreeCmCommissioner::VehicleType.where(vendor_id: @integration.vendor.id, name: name)
+                                              .where.not(id: vehicle_type.id).exists?
+      taken ? "#{name} (#{external_trip.vehicle_type_id})" : name
+    end
+
     def map_vehicle_type_to_kind(type_name)
       mapping = {
         'bus' => :bus,

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/trip.rb

@@ -93,8 +93,15 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Resources
       non_local_price || local_price
     end
 
+    # BookMeBus returns one physical trip under every route pair it serves (e.g. SHV→PP→SR comes back
+    # for SHV→SR, PP→SR and SHV→PP), each time with `stop_times` sliced to that segment. Keying on the
+    # trip id alone made every pair overwrite one local Trip, so the segment ends are part of the key.
+    # The raw BookMeBus trip id stays in `trip_id` / the mapping payload, which is what API calls need.
     def sync_identifier
-      trip_id || id
+      raw_id = trip_id || id
+      return raw_id unless origin_location_id && destination_location_id
+
+      "#{raw_id}:#{origin_location_id}:#{destination_location_id}"
     end
 
     # BookMeBus's own search_trips! results can include trips that are not currently bookable -

data/app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/trip_location.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner::Integrations::BookMeBusV1::Resources
+  # One published BookMeBus trip as listed by `/trip_locations`: the cities it passes through, in travel order.
+  # `location_legs` holds the same city objects as `/locations`, so ids match the synced location mappings.
+  class TripLocation < Base
+    attr_accessor :id,
+                  :type,
+                  :head_sign,
+                  :short_name,
+                  :route_type,
+                  :operator_id,
+                  :location_legs,
+                  :stop_legs
+
+    def location_ids
+      Array(location_legs).filter_map { |leg| leg['id']&.to_s if leg.is_a?(Hash) }
+    end
+
+    # The cities as `Resources::Location`s (the legs carry the same fields as `/locations`), so places can be
+    # synced from the operator's trips alone. Ids are strings, as `/locations` returns them.
+    def locations
+      Array(location_legs).filter_map do |leg|
+        Location.new(leg.merge('id' => leg['id'].to_s)) if leg.is_a?(Hash) && leg['id']
+      end
+    end
+
+    # Every earlier -> later city of the trip is searchable (e.g. SHV>PP>SR also serves SHV>SR, PP>SR and SHV>PP).
+    # A round trip lists a city twice, so same-city pairs are dropped.
+    def location_pairs
+      location_ids.combination(2).reject { |origin_id, destination_id| origin_id == destination_id }
+    end
+  end
+end

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

@@ -13,7 +13,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::SyncStrategies
   #       - Archives stale location mappings
   #
   #    b. Sync Routes:
-  #       - Generates route pairs from synced locations
+  #       - Asks BookMeBus for the operator's published trips (trip_locations) and builds a route for each
+  #         earlier -> later city pair on them, instead of pairing every location with every other
   #       - Creates Route (origin_place → destination_place) records
   #       - Creates IntegrationMapping for each route (for incremental sync scheduling)
   #

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

@@ -2,8 +2,8 @@ module SpreeCmCommissioner
   module RoomTypes
     # Creates an accommodation room type (a Spree::Product under a hotel vendor) from the dashboard's
     # one-request Add Room Type wizard: product, category, facilities, properties and photos in one
-    # transaction. No sellable variant, stock or inventory is built here, so the room starts as Draft —
-    # it isn't bookable until rates and occupancy are set up for it.
+    # transaction. The room starts as Draft; its sellable variant only exists once occupancy is set
+    # (here, if the wizard sent it, or later via `UpdateRoomVariant`) -- without it, it isn't bookable.
     class Create
       prepend ::Spree::ServiceModule::Base
 
@@ -15,6 +15,7 @@ module SpreeCmCommissioner
           product = create_product!(vendor, name, options)
           assign_taxon!(product, options[:taxon_id])
           assign_facilities!(product, options[:facility_option_type_ids], options[:facility_option_value_ids])
+          assign_room_variant!(product, options[:occupancy_option_value_ids])
           assign_properties!(product, options[:properties])
         end
 
@@ -38,7 +39,7 @@ module SpreeCmCommissioner
       private
 
       # Spree requires a master price (`require_master_price`), but a room's nightly price lives on its
-      # occupancy variants — the master is never sold, so 0 is only a placeholder.
+      # room variant — the master is never sold, so 0 is only a placeholder.
       def create_product!(vendor, name, options)
         Spree::Product.create!(
           name: name,
@@ -71,6 +72,12 @@ module SpreeCmCommissioner
         product.master.save!
       end
 
+      def assign_room_variant!(product, option_value_ids)
+        return if option_value_ids.blank?
+
+        SpreeCmCommissioner::RoomTypes::UpdateRoomVariant.call(product: product, option_value_ids: option_value_ids)
+      end
+
       def assign_properties!(product, properties)
         return if properties.blank?
 

data/app/services/spree_cm_commissioner/room_types/update_room_variant.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  module RoomTypes
+    class UpdateRoomVariant
+      prepend ::Spree::ServiceModule::Base
+
+      def call(product:, option_value_ids:)
+        option_types = SpreeCmCommissioner::RoomTypes.room_variant_option_types
+        values = Spree::OptionValue.where(option_type: option_types, id: Array(option_value_ids).compact_blank).to_a
+        return success(product: product) if values.empty?
+
+        ApplicationRecord.transaction do
+          product.option_types = (product.option_types.to_a + option_types).uniq
+          room_variant = product.variants.first_or_initialize
+          room_variant.option_values = values
+          room_variant.save!
+        end
+
+        success(product: product)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/room_types.rb

@@ -9,6 +9,7 @@ module SpreeCmCommissioner
     }.freeze
 
     CATEGORY_ROOT_PERMALINK = 'categories/accommodations'.freeze
+    ROOM_VARIANT_OPTION_TYPE_NAMES = %w[number-of-adults number-of-kids kids-age-max].freeze
 
     def self.normalize_property_name(name)
       name.to_s.squish.downcase.tr(' ', '-')
@@ -25,6 +26,14 @@ module SpreeCmCommissioner
       root ? root.descendants.order(:lft) : Spree::Taxon.none
     end
 
+    # In ROOM_VARIANT_OPTION_TYPE_NAMES order (not DB position), and missing ones silently dropped --
+    # some vendors' environments are missing one or more of these three OptionType records (seeded or
+    # created inconsistently), so callers must tolerate a shorter list rather than assuming all three.
+    def self.room_variant_option_types
+      by_name = Spree::OptionType.where(name: ROOM_VARIANT_OPTION_TYPE_NAMES).includes(:option_values).index_by(&:name)
+      ROOM_VARIANT_OPTION_TYPE_NAMES.filter_map { |name| by_name[name] }
+    end
+
     def self.kyc_value(kyc_fields)
       Array(kyc_fields).compact_blank.sum { |field| SpreeCmCommissioner::KycBitwise::BIT_FIELDS.fetch(field.to_sym, 0) }
     end

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -0,0 +1,25 @@
+<%# Overrides spree_backend's product rule: searches by name or slug and labels options "Name (slug)",
+    since many products share a name (e.g. "General Access"). %>
+<div class="card-body">
+  <div class="form-group products_rule_products">
+    <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
+    <%= select "#{param_prefix}", 'product_ids_string',
+               options_for_select(promotion_rule.products.map { |product| [SpreeCmCommissioner::RelatableOptionLabel.call(product), product.id] }, promotion_rule.product_ids),
+               { include_hidden: true },
+               multiple: true,
+               class: 'select2autocomplete d-block w-100',
+               data: {
+                 autocomplete_url_value: 'homepage_section_relatables_api_v2',
+                 autocomplete_return_attr_value: :name_with_slug,
+                 autocomplete_search_query_value: 'name_or_slug_i_cont',
+                 autocomplete_min_input_value: 2,
+                 autocomplete_multiple_value: true,
+                 autocomplete_additional_url_params_value: 'model_class=Spree::Product'
+               } %>
+    <small class="form-text text-muted"><%= Spree.t('product_rule.search_hint') %></small>
+  </div>
+  <div class="form-group mb-0">
+    <%= label_tag Spree.t('product_rule.label') %>
+    <%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product form-control custom-select'}) %>
+  </div>
+</div>

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -0,0 +1,21 @@
+<%# Overrides spree_backend's user rule: searches by email, login, phone or name and labels options
+    "Full name - email (login)", since core only shows (and searches) email. %>
+<div class="card-body">
+  <div class="form-group mb-0">
+    <%= label_tag Spree.t('user_rule.choose_users') %>
+    <%= select "#{param_prefix}", 'user_ids_string',
+               options_for_select(promotion_rule.users.map { |user| [SpreeCmCommissioner::RelatableOptionLabel.call(user), user.id] }, promotion_rule.user_ids),
+               { include_hidden: true },
+               multiple: true,
+               class: 'select2autocomplete d-block w-100',
+               data: {
+                 autocomplete_url_value: 'homepage_section_relatables_api_v2',
+                 autocomplete_return_attr_value: :name_with_slug,
+                 autocomplete_search_query_value: 'email_or_normalized_login_or_phone_number_or_first_name_or_last_name_i_cont',
+                 autocomplete_min_input_value: 3,
+                 autocomplete_multiple_value: true,
+                 autocomplete_additional_url_params_value: 'model_class=Spree::User'
+               } %>
+    <small class="form-text text-muted"><%= Spree.t('user_rule.search_hint') %></small>
+  </div>
+</div>

data/app/views/spree/admin/promotions/rules/_vendors.html.erb

@@ -1,7 +1,20 @@
 <div class="card-body">
   <div class="form-group">
     <%= label_tag "#{param_prefix}_vendor_ids_string", Spree.t('vendors_rule.choose_vendors') %>
-    <%= select "#{param_prefix}", 'vendor_ids_string', options_from_collection_for_select(Spree::Vendor.active, :id, :name, promotion_rule.vendors.pluck(:id)), { }, multiple: true, class: 'select2 form-control' %>
+    <%= select "#{param_prefix}", 'vendor_ids_string',
+               options_for_select(promotion_rule.vendors.map { |vendor| [SpreeCmCommissioner::RelatableOptionLabel.call(vendor), vendor.id] }, promotion_rule.vendor_ids),
+               { include_hidden: true },
+               multiple: true,
+               class: 'select2autocomplete form-control',
+               data: {
+                 autocomplete_url_value: 'homepage_section_relatables_api_v2',
+                 autocomplete_return_attr_value: :name_with_slug,
+                 autocomplete_search_query_value: 'name_or_slug_i_cont',
+                 autocomplete_min_input_value: 1,
+                 autocomplete_multiple_value: true,
+                 autocomplete_additional_url_params_value: 'model_class=Spree::Vendor&filter[state_eq]=active'
+               } %>
+    <small class="form-text text-muted"><%= Spree.t('vendors_rule.search_hint') %></small>
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('vendors_rule.label') %>

data/config/locales/en.yml

@@ -420,6 +420,11 @@ en:
       choose_vendors: "Choose vendors"
       match_any: "Some line items must from selected vendor"
       match_all: "All line items must from selected vendor"
+      search_hint: "Search by name or slug"
+    product_rule:
+      search_hint: "Search by name or slug"
+    user_rule:
+      search_hint: "Search by email, login, phone number or name"
     customer_rule:
       label: "Customer"
       choose_customers: "Choose customers"

data/config/locales/km.yml

@@ -362,6 +362,11 @@ km:
       choose_vendors: "Choose vendors"
       match_any: "Some line items must from selected vendor"
       match_all: "All line items must from selected vendor"
+      search_hint: "Search by name or slug"
+    product_rule:
+      search_hint: "Search by name or slug"
+    user_rule:
+      search_hint: "Search by email, login, phone number or name"
     guest_occupation_rule:
       label: "Guest Occupation"
       choose_guest_occupation: "Choose Guest occupations"

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.14.1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-21 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -791,6 +791,7 @@ files:
 - app/assets/javascripts/spree_cm_commissioner/annual_calendar_form.js
 - app/assets/javascripts/spree_cm_commissioner/backend.js
 - app/assets/javascripts/spree_cm_commissioner/copy_to_clipboard.js
+- app/assets/javascripts/spree_cm_commissioner/promotion_rule_pickers.js
 - app/assets/javascripts/spree_cm_commissioner/routes.js
 - app/assets/javascripts/spree_cm_commissioner/telegram.js
 - app/assets/javascripts/spree_cm_commissioner/telegram/order_confirmation.js
@@ -1732,6 +1733,7 @@ files:
 - app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb
 - app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb
 - app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/relatable_option_label.rb
 - app/models/spree_cm_commissioner/request_guard.rb
 - app/models/spree_cm_commissioner/reschedule_policy.rb
 - app/models/spree_cm_commissioner/reschedule_policy_assignment.rb
@@ -2402,6 +2404,7 @@ files:
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/seat_layout.rb
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/stop.rb
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/trip.rb
+- app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/trip_location.rb
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/resources/wallet_payment.rb
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/sync_manager.rb
 - app/services/spree_cm_commissioner/integrations/book_me_bus_v1/sync_strategies/full_sync_strategy.rb
@@ -2625,6 +2628,7 @@ files:
 - app/services/spree_cm_commissioner/room_types.rb
 - app/services/spree_cm_commissioner/room_types/create.rb
 - app/services/spree_cm_commissioner/room_types/update_properties.rb
+- app/services/spree_cm_commissioner/room_types/update_room_variant.rb
 - app/services/spree_cm_commissioner/route_metrics/decrease_trip_count.rb
 - app/services/spree_cm_commissioner/route_metrics/increase_fulfilled_order_count.rb
 - app/services/spree_cm_commissioner/route_metrics/increase_order_count.rb
@@ -2933,6 +2937,8 @@ files:
 - app/views/spree/admin/promotions/rules/_fixed_date.html.erb
 - app/views/spree/admin/promotions/rules/_guest_age_group.html.erb
 - app/views/spree/admin/promotions/rules/_guest_occupations.html.erb
+- app/views/spree/admin/promotions/rules/_product.html.erb
+- app/views/spree/admin/promotions/rules/_user.html.erb
 - app/views/spree/admin/promotions/rules/_vendors.html.erb
 - app/views/spree/admin/promotions/rules/_weekend.html.erb
 - app/views/spree/admin/rate_plans/_form.html.erb