spree_cm_commissioner 2.14.3 → 2.14.5

data/app/models/active_storage/variation_decorator.rb

@@ -0,0 +1,18 @@
+module ActiveStorage
+  module VariationDecorator
+    # ActiveStorage reuses a JPEG upload's own extension as the variant format, but libvips
+    # picks its encoder from the output extension and rejects aliases like `.jfif`
+    # ("is not a known file format"). Mapping here rather than renaming blobs also fixes
+    # variant URLs already handed out, since their signed key embeds `format: "jfif"`.
+    JPEG_FORMAT_ALIASES = %w[jfif jpe].freeze
+
+    def format
+      format = super
+      JPEG_FORMAT_ALIASES.include?(format.to_s.downcase) ? 'jpg' : format
+    end
+  end
+end
+
+unless ActiveStorage::Variation.ancestors.include?(ActiveStorage::VariationDecorator)
+  ActiveStorage::Variation.prepend(ActiveStorage::VariationDecorator)
+end

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

@@ -18,6 +18,10 @@ module SpreeCmCommissioner
       # For certain large events, admin can disable this manually.
       store_public_metadata :allow_manual_search_for_operator, :boolean, default: true
 
+      # Requires an active waiting-room session to create a draft order for this event's products
+      # (Product#enforce_waiting_room_session?). Server-only switch, so private.
+      store_private_metadata :enforce_waiting_room_session, :boolean, default: false
+
       # ⚠️  CRITICAL: Cached seat layout IDs kept in sync by SeatLayout callback.
       # If callback is removed/modified without updating this, availability checks will fail.
       #

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

@@ -4,8 +4,9 @@ module SpreeCmCommissioner
 
     included do
       # Store the earliest expiration time across all holds (seats + inventory)
-      # in `public_metadata[:hold_expires_at]`. This is used only for UI display
-      # (e.g., a countdown timer) and does not control the release logic.
+      # in `public_metadata[:hold_expires_at]`. This is used for UI display
+      # (e.g., a countdown timer) and by LineItems::ValidatePurchaseLimits to count an
+      # unpaid cart against the buyer's caps; it does not control the release logic.
       # Each hold is released independently when its own expiration time is reached.
       store_public_metadata :hold_expires_at, :datetime
 

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

@@ -7,6 +7,7 @@ module SpreeCmCommissioner
     included do # rubocop:disable Metrics/BlockLength
       after_commit :clear_has_incomplete_guest_info_cache, on: %i[create update]
 
+      state_machine.before_transition to: :address, do: :ensure_within_purchase_limits
       state_machine.before_transition to: :address, do: :hold_order_holds
 
       # Same transitions core calls create_tax_charge! from (gems/core/app/models/spree/order/checkout.rb,
@@ -107,6 +108,22 @@ module SpreeCmCommissioner
       end
     end
 
+    # Line items are only validated when they change, so a cart sent back to `cart` (hold
+    # released) and advanced again would skip the purchase-limit check and could be held next to
+    # another cart the buyer opened meanwhile. Runs before hold_order_holds so a rejection never
+    # leaves a hold behind.
+    def ensure_within_purchase_limits
+      line_items.each do |line_item|
+        result = SpreeCmCommissioner::LineItems::ValidatePurchaseLimits.call(line_item: line_item)
+        next if result.success?
+
+        errors.add(:base, result.error.to_s)
+        return false
+      end
+
+      true
+    end
+
     # Best-effort, like apply_prepaid_payment!'s other callers: a user with no (or no
     # currency-matching) store credit just doesn't get a payment here, and the app can still
     # remove/reapply it afterwards through the existing checkout store-credit endpoints.

data/app/models/spree_cm_commissioner/homepage_section.rb

@@ -10,10 +10,26 @@ module SpreeCmCommissioner
     attribute :segment, :integer, default: 0
     attribute :mini_app, :integer, default: 0
 
+    enum section_type: { default: 0, trending: 1, big_banner: 2 }
+
     self.whitelisted_ransackable_attributes = %w[title active]
 
     has_many :homepage_section_relatables, -> { active }, inverse_of: :homepage_section, dependent: :destroy
 
+    has_one :app_background, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::HomepageSectionAppBackground'
+    has_one :web_background, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::HomepageSectionWebBackground'
+
+    # `font`/backgrounds only apply to `trending` sections. The admin form only hides those
+    # fields via JS when another type is picked — it doesn't clear them — and a direct API call
+    # could set them on any type, so normalize here rather than relying on the form. A hard
+    # validation would instead reject the common "switch an existing trending section back to
+    # default" edit, since the hidden `font` field still submits its stale value.
+    #
+    # Guarded beyond `unless: :trending?` so a routine save of an already-default/big_banner
+    # section (the steady-state case) skips the `app_background`/`web_background` association
+    # loads entirely instead of querying them on every save forever.
+    before_save :clear_non_trending_fields, if: :clear_non_trending_fields?
+
     scope :active, lambda {
       where(active: true)
         .joins(:homepage_section_relatables)
@@ -47,5 +63,22 @@ module SpreeCmCommissioner
 
     # Create maintaining task to purge homepage section related caches
     after_save { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: self) }
+
+    private
+
+    # `.target` (not `.loaded?`) so this only fires for a background actually built/loaded in
+    # memory on *this* save. `.loaded?` stays true forever once an object has been saved once
+    # with the association touched, even after the target is nil'd out by a prior destroy —
+    # which made every later save of that same in-memory record re-run the clear unnecessarily.
+    def clear_non_trending_fields?
+      !trending? && (font.present? || section_type_changed? ||
+        association(:app_background).target.present? || association(:web_background).target.present?)
+    end
+
+    def clear_non_trending_fields
+      self.font = nil
+      app_background&.destroy
+      web_background&.destroy
+    end
   end
 end

data/app/models/spree_cm_commissioner/homepage_section_app_background.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  class HomepageSectionAppBackground < Asset
+    # 3:2 — taller than 16:9 so the image fills a `trending` card's full height instead of
+    # letterboxing. `medium` (960x640) is the upload target; `mini`/`small` are downscaled copies.
+    def asset_styles
+      {
+        mini: '160x107>',
+        small: '480x320>',
+        medium: '960x640>'
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/homepage_section_web_background.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  class HomepageSectionWebBackground < Asset
+    # 5:1 — wide and short so the image spans a `trending` banner's full width without pushing
+    # page content down. `medium` (1440x288) is the upload target; `mini`/`small` are downscaled copies.
+    def asset_styles
+      {
+        mini: '160x32>',
+        small: '720x144>',
+        medium: '1440x288>'
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -222,6 +222,13 @@ module SpreeCmCommissioner
       end
     end
 
+    # Configured once on the event rather than per ticket product. Other product types (trips,
+    # rooms, ...) that need it later resolve their own source here; the draft-order guard
+    # (WaitingRoomAuthorization#ensure_waiting_room_session!) only ever asks the product.
+    def enforce_waiting_room_session?
+      event&.enforce_waiting_room_session? || false
+    end
+
     # Not yet on sale. Kept separate from available? so a scheduled product's real stock still
     # shows via in_stock? — Stock::AvailabilityValidatorDecorator checks this to block add-to-cart.
     def scheduled?

data/app/overrides/spree/admin/menus/index/clear_cache_button.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
+
+<%# Menus are only served through homepage_data, whatever the menu, so one clear covers them all. %>
+<%= render 'spree/admin/shared/api_cache_button', model: Spree::Menu.name %>

data/app/overrides/spree/admin/payment_methods/index/clear_cache_button.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
+
+<%# A payment method's paths don't depend on the record (vendor_id is a query param), so one clear
+    on the list covers them all. This admin lists BookMe+'s storefront; a tenant clears its own
+    from the dashboard. %>
+<%= render 'spree/admin/shared/api_cache_button', model: Spree::PaymentMethod.name %>

data/app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
 
-<%= button_link_to Spree.t(:clear_cache), admin_invalidate_api_caches_path(model: Spree::Product.name, id: @product.id), method: :post, class: "btn btn-outline-primary" %>
+<%= render 'spree/admin/shared/api_cache_button', model: Spree::Product.name, id: @product.id %>

data/app/overrides/spree/admin/taxons/_form/enforce_waiting_room_session.html.erb.deface

@@ -0,0 +1,10 @@
+<!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
+
+<%= f.field_container :enforce_waiting_room_session, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :enforce_waiting_room_session, class: 'custom-control-input' %>
+  <%= f.label :enforce_waiting_room_session, Spree.t(:enforce_waiting_room_session), class: 'custom-control-label' %>
+  <%= f.error_message_on :enforce_waiting_room_session %>
+  <small class="form-text text-muted">
+    <%= Spree.t(:enforce_waiting_room_session_hint) %>
+  </small>
+<% end if @taxon.event? && @taxon.depth == 1 %> %>

data/app/overrides/spree/admin/taxons/edit/clear_cache_button.html.erb.deface

@@ -1,8 +1,5 @@
 <!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
 
 <% if @taxon.depth == 1 %>
-      <%= button_link_to Spree.t(:clear_cache),
-          admin_invalidate_api_caches_path(model: Spree::Taxon.name, id: @taxon.id),
-          method: :post, 
-          class: "btn btn-outline-primary" %>
+  <%= render 'spree/admin/shared/api_cache_button', model: Spree::Taxon.name, id: @taxon.id %>
 <% end %>

data/app/overrides/spree/admin/vendors/edit/clear_cache_button.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "erb[loud]:contains('form_for [:admin, @vendor]')" -->
+
+<% content_for :page_actions do %>
+  <%= render 'spree/admin/shared/api_cache_button', model: Spree::Vendor.name, id: @vendor.id %>
+<% end %>

data/app/serializers/spree/api/v2/base_serializer_decorator.rb

@@ -0,0 +1,24 @@
+module Spree
+  module Api
+    module V2
+      # Spree caches every serializer's records keyed by each record's updated_at, so anything
+      # computed from other tables stays stale, and behind CloudFront an invalidation can't purge
+      # it. CACHE_SERIALIZER_DISABLED=yes turns it off everywhere.
+      module BaseSerializerDecorator
+        def self.prepended(base)
+          base.singleton_class.prepend(ClassMethods)
+        end
+
+        module ClassMethods
+          # jsonapi-serializer copies Spree's store into each subclass as it is defined, so this
+          # reader, which every subclass resolves through, is the one place to turn it off.
+          def cache_store_instance
+            ENV['CACHE_SERIALIZER_DISABLED'] == 'yes' ? nil : super
+          end
+        end
+      end
+    end
+  end
+end
+
+Spree::Api::V2::BaseSerializer.prepend(Spree::Api::V2::BaseSerializerDecorator)

data/app/serializers/spree/v2/storefront/homepage_section_serializer.rb

@@ -2,8 +2,11 @@ module Spree
   module V2
     module Storefront
       class HomepageSectionSerializer < BaseSerializer
-        attributes :id, :title, :segments, :mini_apps, :description, :active, :position, :preview, :created_at, :updated_at
+        attributes :id, :title, :segments, :mini_apps, :description, :active, :position, :preview,
+                   :section_type, :font, :created_at, :updated_at
         has_many :homepage_section_relatables
+        has_one :app_background, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+        has_one :web_background, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
       end
     end
   end

data/app/serializers/spree/v2/tenant/homepage_section_serializer.rb

@@ -3,9 +3,11 @@ module Spree
     module Tenant
       class HomepageSectionSerializer < BaseSerializer
         attributes :id, :title, :segments, :description,
-                   :active, :position, :preview, :created_at, :updated_at
+                   :active, :position, :preview, :section_type, :font, :created_at, :updated_at
 
         has_many :homepage_section_relatables, serializer: ::Spree::V2::Tenant::HomepageSectionRelatableSerializer
+        has_one :app_background, serializer: ::Spree::V2::Tenant::AssetSerializer
+        has_one :web_background, serializer: ::Spree::V2::Tenant::AssetSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -1,5 +1,6 @@
 module SpreeCmCommissioner
   module ApiCaches
+    # Clears one record's cached API responses. Every record of a model goes through InvalidateAll.
     class Invalidate
       prepend ::Spree::ServiceModule::Base
 
@@ -16,17 +17,39 @@ module SpreeCmCommissioner
         'SpreeCmCommissioner::VotingSession' => SpreeCmCommissioner::VotingSession
       }.freeze
 
-      # eg. 'Spree::Product', 123 or 'Spree::Product', nil
-      def call(model:, id: nil)
+      # CloudFront bills per path and only allows `*` at the end, so one prefix per namespace covers
+      # every segment's homepage_sections and homepage_background, plus homepage_data, instead of a
+      # path per BIT_SEGMENT key.
+      HOMEPAGE_SECTION_PATTERNS = [
+        '/api/v2/storefront/homepage*',
+        '/api/v2/tenant/homepage*'
+      ].freeze
+
+      HOMEPAGE_BACKGROUND_PATTERNS = ['/api/v2/storefront/homepage*'].freeze
+
+      # Deliberately broad, and identical for single-record and all-record
+      # invalidation: a payment method is either vendor-owned or store-level, and a
+      # store-level one is served for every vendor through the fallback in
+      # SpreeCmCommissioner::PaymentMethods::Find. From the record alone we cannot
+      # tell which vendors are affected.
+      #
+      # vendor_id is a query param, so the trailing `*` is what clears every
+      # vendor's cached variant of this path in one go.
+      #
+      # Payment methods change a handful of times a year, so a broad invalidation
+      # is cheap.
+      PAYMENT_METHOD_PATTERNS = [
+        '/api/v2/tenant/payment_methods*',
+        '/api/v2/storefront/payment_methods*'
+      ].freeze
+
+      # eg. 'Spree::Product', 123
+      def call(model:, id:)
         model_class = SUPPORTED_MODELS[model]
 
         return failure(nil, 'Model is not supported') if model_class.nil?
 
-        if id.present?
-          invalidate_single_record(model_class: model_class, id: id)
-        else
-          invalidate_all_records(model_class: model_class)
-        end
+        invalidate_single_record(model_class: model_class, id: id)
       end
 
       # eg. 'Spree::Product', 123 => ['/api/v2/tenant/products/123', '/api/v2/tenant/products/slug-of-product', ...]
@@ -38,7 +61,10 @@ module SpreeCmCommissioner
 
         refresh_record_cache_key(record)
 
-        api_patterns = single_api_pattern[record.class.name].map do |pattern|
+        # The record's own class first (a Show found as a Spree::Taxon keeps its show paths), then the
+        # model asked for, since STI subclasses such as Spree::Gateway::Payway have no entry of their own.
+        patterns = single_api_pattern[record.class.name] || single_api_pattern[model_class.name]
+        api_patterns = patterns.map do |pattern|
           pattern.gsub(/:(\w+)/) do
             key = Regexp.last_match(1)
             record.public_send(key).to_s
@@ -50,26 +76,13 @@ module SpreeCmCommissioner
         success(record: record, api_patterns: api_patterns)
       end
 
-      # eg. 'Spree::Product' => ['/api/v2/tenant/products/*', '/api/v2/storefront/products/*']
-      def invalidate_all_records(model_class:)
-        model_class.find_each do |record|
-          refresh_record_cache_key(record)
-        end
-
-        enqueue_invalidate(invalidate_uris[model_class.name])
-
-        success(api_patterns: invalidate_uris[model_class.name])
-      end
-
       def single_api_pattern
         {
-          'SpreeCmCommissioner::HomepageSection' => homepage_section_patterns,
-          'SpreeCmCommissioner::HomepageBackground' => homepage_background_patterns,
+          'SpreeCmCommissioner::HomepageSection' => HOMEPAGE_SECTION_PATTERNS,
+          'SpreeCmCommissioner::HomepageBackground' => HOMEPAGE_BACKGROUND_PATTERNS,
           'SpreeCmCommissioner::SeatLayout' => ['/api/v2/storefront/seat_layouts/:id*'],
-          'Spree::Menu' => [
-            '/api/v2/storefront/menus/:id*',
-            '/api/v2/storefront/homepage_data*'
-          ],
+          # The app reads menus from homepage_data; nothing calls /menus any more.
+          'Spree::Menu' => ['/api/v2/storefront/homepage_data*'],
           'Spree::Taxon' => [
             '/api/v2/tenant/taxons/:id*',
             '/api/v2/tenant/taxons/:permalink*',
@@ -92,50 +105,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/accommodations/:id*',
             '/api/v2/storefront/accommodations/:slug*'
           ],
-          'Spree::PaymentMethod' => payment_method_patterns
-        }
-      end
-
-      def invalidate_uris
-        {
-          'SpreeCmCommissioner::HomepageSection' => homepage_section_patterns,
-          'SpreeCmCommissioner::HomepageBackground' => homepage_background_patterns,
-          'SpreeCmCommissioner::SeatLayout' => ['/api/v2/storefront/seat_layouts/*'],
-          'Spree::Menu' => ['/api/v2/storefront/menus/*'],
-          'Spree::Taxon' => ['/api/v2/storefront/taxons/*'],
-          'Spree::Product' => [
-            '/api/v2/tenant/products/*',
-            '/api/v2/storefront/products/*'
-          ],
-          'Spree::Vendor' => [
-            '/api/v2/tenant/vendors/*',
-            '/api/v2/storefront/vendors/*',
-            '/api/v2/storefront/accommodations/*'
-          ],
-          'Spree::PaymentMethod' => payment_method_patterns
+          'Spree::PaymentMethod' => PAYMENT_METHOD_PATTERNS
         }
       end
 
       private
 
-      # Deliberately broad, and identical for single-record and all-record
-      # invalidation: a payment method is either vendor-owned or store-level, and a
-      # store-level one is served for every vendor through the fallback in
-      # SpreeCmCommissioner::PaymentMethods::Find. From the record alone we cannot
-      # tell which vendors are affected.
-      #
-      # vendor_id is a query param, so the trailing `*` is what clears every
-      # vendor's cached variant of this path in one go.
-      #
-      # Payment methods change a handful of times a year, so a broad invalidation
-      # is cheap.
-      def payment_method_patterns
-        [
-          '/api/v2/tenant/payment_methods*',
-          '/api/v2/storefront/payment_methods*'
-        ]
-      end
-
       # eg. updated_at: Fri, 26 Dec 2025 10:40:56.505450000 +07 +07:00
       def refresh_record_cache_key(record)
         # rubocop:disable Rails/SkipsModelValidations
@@ -147,29 +122,6 @@ module SpreeCmCommissioner
       def enqueue_invalidate(patterns)
         SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(patterns: patterns)
       end
-
-      # Every key of BIT_SEGMENT (general, ticket, ..., ferry).
-      def homepage_segment
-        SpreeCmCommissioner::HomepageSectionBitwise::BIT_SEGMENT.keys
-      end
-
-      def homepage_section_patterns
-        homepage_segment.flat_map do |segment|
-          [
-            "/api/v2/storefront/homepage/#{segment}/homepage_sections*",
-            "/api/v2/tenant/homepage/#{segment}/homepage_sections*"
-          ]
-        end
-      end
-
-      def homepage_background_patterns
-        patterns = homepage_segment.map do |segment|
-          "/api/v2/storefront/homepage/#{segment}/homepage_background*"
-        end
-
-        patterns << '/api/v2/storefront/homepage_data*'
-        patterns
-      end
     end
   end
 end

data/app/services/spree_cm_commissioner/api_caches/invalidate_all.rb

@@ -0,0 +1,61 @@
+module SpreeCmCommissioner
+  module ApiCaches
+    # Clears every record of a model for one storefront. `tenant` is required so a clear-all never
+    # pays for both namespaces by accident: nil is the BookMe+ storefront (/api/v2/storefront/
+    # paths), a SpreeCmCommissioner::Tenant is that tenant's API (/api/v2/tenant/ paths).
+    #
+    # Tenant APIs take the tenant from the OAuth token, not the URL, so every tenant shares one path
+    # today; taking the record keeps callers the same if tenant paths ever carry it.
+    #
+    # eg. InvalidateAll.call(model: 'SpreeCmCommissioner::HomepageSection', tenant: nil)
+    class InvalidateAll
+      prepend ::Spree::ServiceModule::Base
+
+      TENANT_PREFIX = '/api/v2/tenant/'.freeze
+
+      API_PATTERNS = {
+        'SpreeCmCommissioner::HomepageSection' => Invalidate::HOMEPAGE_SECTION_PATTERNS,
+        'SpreeCmCommissioner::HomepageBackground' => Invalidate::HOMEPAGE_BACKGROUND_PATTERNS,
+        'SpreeCmCommissioner::SeatLayout' => ['/api/v2/storefront/seat_layouts/*'],
+        'Spree::Menu' => ['/api/v2/storefront/homepage_data*'],
+        'Spree::Taxon' => ['/api/v2/storefront/taxons/*'],
+        'Spree::Product' => [
+          '/api/v2/tenant/products/*',
+          '/api/v2/storefront/products/*'
+        ],
+        'Spree::Vendor' => [
+          '/api/v2/tenant/vendors/*',
+          '/api/v2/storefront/vendors/*',
+          '/api/v2/storefront/accommodations/*'
+        ],
+        'Spree::PaymentMethod' => Invalidate::PAYMENT_METHOD_PATTERNS
+      }.freeze
+
+      def call(model:, tenant:)
+        model_class = Invalidate::SUPPORTED_MODELS[model] if API_PATTERNS.key?(model)
+        return failure(nil, 'Model is not supported') if model_class.nil?
+        return failure(nil, 'tenant must be a SpreeCmCommissioner::Tenant or nil') unless tenant.nil? || tenant.is_a?(SpreeCmCommissioner::Tenant)
+
+        refresh_records_cache_key(model_class, tenant)
+
+        api_patterns = API_PATTERNS[model].select { |pattern| pattern.start_with?(TENANT_PREFIX) == tenant.present? }
+
+        # Empty when the model has no API in this namespace, e.g. homepage backgrounds for a tenant,
+        # and CloudFront rejects an empty batch.
+        SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(patterns: api_patterns) if api_patterns.any?
+
+        success(api_patterns: api_patterns)
+      end
+
+      private
+
+      # updated_at keys Spree's serializer and collection caches, so only this storefront's records
+      # are touched when the model is tenant-scoped.
+      def refresh_records_cache_key(model_class, tenant)
+        scope = model_class.column_names.include?('tenant_id') ? model_class.where(tenant_id: tenant&.id) : model_class.all
+
+        scope.find_each(&:touch)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/guests/build_dynamic_field_attributes.rb

@@ -0,0 +1,34 @@
+module SpreeCmCommissioner
+  module Guests
+    # Option-based fields (checkbox/radio/selection) become one GuestDynamicField row per selected
+    # option id; Guests::Update's own auto-cleanup destroys rows for deselected options. Fields not
+    # enabled on the guest's product are dropped.
+    class BuildDynamicFieldAttributes
+      def self.call(guest:, dynamic_fields:)
+        new(guest, dynamic_fields).call
+      end
+
+      def initialize(guest, dynamic_fields)
+        @guest = guest
+        @dynamic_fields = dynamic_fields
+      end
+
+      def call
+        return [] if @dynamic_fields.blank?
+
+        enabled_fields = @guest.line_item.product.dynamic_fields.index_by(&:id)
+
+        @dynamic_fields.flat_map do |dynamic_field_id, value|
+          dynamic_field = enabled_fields[dynamic_field_id.to_s.to_i]
+          next [] unless dynamic_field
+
+          if dynamic_field.requires_dynamic_field_options?
+            Array(value).compact_blank.map { |option_id| { dynamic_field_id: dynamic_field.id, dynamic_field_option_id: option_id } }
+          else
+            [{ dynamic_field_id: dynamic_field.id, value: value }]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -38,6 +38,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       stop_times = trip_mapping.external_payload&.dig('stop_times')
       return [] unless stop_times.is_a?(Array)
 
+      previous_time = nil
+
       synced_mappings = stop_times.each_with_index.map do |stop_time_data, index|
         # BookMeBus's stop_times[i]['arrival_time'] is the time the trip arrives at the NEXT
         # physical stop (i+1), not at stop i itself - it's 0/absent on the last entry, which has
@@ -50,7 +52,15 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
         # missing' on every booking attempt - never caught by specs because their fixtures set
         # arrival_time == departure_time on the same entry, sidestepping the real shape.
         incoming_arrival_time = index.positive? ? stop_times[index - 1]['arrival_time'] : nil
-        sync_item!(trip_mapping, stop_time_data, incoming_arrival_time, index + 1, stop_times.size)
+
+        # BookMeBus sends time-of-day only, so an overnight trip (23:00 -> 05:00) needs its days rolled
+        # here: TransitOrder::Create trusts the stored datetimes and raises when arrival < departure.
+        arrival_time = roll_forward(parse_time(incoming_arrival_time), previous_time)
+        departure_time = roll_forward(parse_time(stop_time_data['departure_time']), arrival_time || previous_time)
+        previous_time = departure_time || arrival_time || previous_time
+
+        times = { arrival_time: arrival_time, departure_time: departure_time }
+        sync_item!(trip_mapping, stop_time_data, times, index + 1, stop_times.size)
       end.compact
 
       cleanup_stale_mappings!(trip_mapping, synced_mappings)
@@ -82,7 +92,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     end
 
     # Sync a single trip stop
-    def sync_item!(trip_mapping, stop_time_data, incoming_arrival_time, sequence, total_stops)
+    def sync_item!(trip_mapping, stop_time_data, times, sequence, total_stops)
       stop_data = stop_time_data['stop']
       location_data = stop_time_data['location']
       return nil unless stop_data.is_a?(Hash) && location_data.is_a?(Hash)
@@ -119,8 +129,8 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
           # 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)
+          departure_time: times[:departure_time],
+          arrival_time: times[:arrival_time]
         )
         tracker.save_if_changed!(trip_stop)
       end
@@ -206,6 +216,13 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
       mapping&.internal
     end
 
+    def roll_forward(time, not_before)
+      return time if time.nil? || not_before.nil?
+
+      time += 1.day while time < not_before
+      time
+    end
+
     def parse_time(seconds_from_midnight)
       return nil unless seconds_from_midnight.present? && seconds_from_midnight.to_i.positive?
 

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

@@ -762,6 +762,7 @@ module SpreeCmCommissioner::Integrations::BookMeBusV1::Polling
     def map_route_type(route_type)
       case route_type&.to_s&.downcase
       when 'ferry' then :ferry
+      when 'private_taxi' then :intercity_taxi
       else :bus
       end
     end