spree_cm_commissioner 2.8.1.pre.3 → 2.8.2

data/app/models/spree_cm_commissioner/route.rb

@@ -1,10 +1,10 @@
 module SpreeCmCommissioner
   class Route < Base
     include SpreeCmCommissioner::RouteType
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
     include SpreeCmCommissioner::StoreMetadata
+    include SpreeCmCommissioner::ServiceOrigin
 
-    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :routes, optional: false
     belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
 
     belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
@@ -67,6 +67,10 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      vendor&.service_origin_id
+    end
+
     def validate_route_stops
       return if route_stops.valid?
 

data/app/models/spree_cm_commissioner/seat_layout.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class SeatLayout < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     has_many :seat_sections, class_name: 'SpreeCmCommissioner::SeatSection', dependent: :destroy
 
     has_many :blocks, class_name: 'SpreeCmCommissioner::Block'

data/app/models/spree_cm_commissioner/stock_item_decorator.rb

@@ -6,9 +6,6 @@ module SpreeCmCommissioner
 
       base.after_commit :create_inventory_items, on: :create
       base.after_commit :adjust_inventory_items_async, on: :destroy
-
-      # Create maintaining task to purge product related caches
-      base.after_commit { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product) }
     end
 
     def update_vendor_total_inventory
@@ -18,10 +15,6 @@ module SpreeCmCommissioner
     private
 
     def create_inventory_items
-      # Skip automatic inventory generation when variant has manual_generate_inventory_items set to true
-      # Use case: For variants where inventory items need to be manually created/managed (e.g., external integrations)
-      return if variant.manual_generate_inventory_items?
-
       SpreeCmCommissioner::InventoryItems::GenerateInventoryItemsJob.perform_later(variant_id: variant.id)
     end
 

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -74,6 +74,7 @@ module SpreeCmCommissioner
       base.has_many :taxon_option_values, class_name: 'SpreeCmCommissioner::TaxonOptionValue'
 
       base.after_commit :send_transaction_email_to_organizers, on: :create
+      base.after_commit :send_event_creation_telegram_alert, on: :create
 
       base.has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
       base.has_many :places, through: :taxon_places
@@ -82,21 +83,7 @@ module SpreeCmCommissioner
 
       base.has_many :import_orders, as: :importable, class_name: 'SpreeCmCommissioner::Imports::ImportOrder', dependent: :destroy
 
-      base.scope :shows, -> { where(taxonomy_id: Spree::Taxonomy.shows.id, depth: 1) }
-      base.scope :events,     -> { where(taxonomy_id: Spree::Taxonomy.events.id, depth: 1) }
       base.has_many :agencies, class_name: 'SpreeCmCommissioner::Agency', foreign_key: :agency_category_id
-      base.has_many :preview_roles, class_name: 'SpreeCmCommissioner::PreviewRole', as: :previewable
-
-      base.scope :visible_to, lambda { |user|
-        publicly_available = where(preview: false)
-
-        if user
-          allowed_ids = user.preview_roles.where(previewable_type: polymorphic_name).select(:previewable_id)
-          publicly_available.or(where(preview: true, id: allowed_ids))
-        else
-          publicly_available
-        end
-      }
 
       # Create maintaining task to purge taxon related caches
       base.after_save { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: self) }
@@ -109,7 +96,6 @@ module SpreeCmCommissioner
           .joins('INNER JOIN cm_homepage_sections ON cm_homepage_section_relatables.homepage_section_id = cm_homepage_sections.id')
           .where(cm_homepage_sections: { tenant_id: nil, active: true })
           .where(kind: :event)
-          .where(preview: false)
       end
 
       def base.find_event(id)
@@ -154,6 +140,12 @@ module SpreeCmCommissioner
       SpreeCmCommissioner::OrganizersTransactionalEmailNotifier.call(event_id: id)
     end
 
+    def send_event_creation_telegram_alert
+      return unless kind == 'event' && depth == 1
+
+      SpreeCmCommissioner::EventCreationTelegramAlertSenderJob.perform_later(event_id: id)
+    end
+
     def sync_event_dates_to_line_items
       return unless event? && depth == 1
 

data/app/models/spree_cm_commissioner/taxonomy_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   module TaxonomyDecorator
-    def self.prepended(base) # rubocop:disable Metrics/MethodLength
+    def self.prepended(base)
       base.include SpreeCmCommissioner::TaxonKind
 
       base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
@@ -15,15 +15,6 @@ module SpreeCmCommissioner
         end
       end
 
-      def base.shows
-        ActiveRecord::Base.connected_to(role: :writing) do
-          shows = Spree::Taxonomy.find_or_create_by(name: 'Shows', store: Spree::Store.default)
-          shows.kind = :event
-          shows.save if shows.changed?
-          shows
-        end
-      end
-
       def base.businesses
         ActiveRecord::Base.connected_to(role: :writing) do
           businesses = Spree::Taxonomy.find_or_create_by(name: 'Businesses', store: Spree::Store.default)

data/app/models/spree_cm_commissioner/tenant.rb

@@ -24,8 +24,6 @@ module SpreeCmCommissioner
 
     before_validation :generate_slug, if: -> { slug.blank? && name.present? }
 
-    validate :single_active_vendor
-
     def active_vendor
       vendors.where(state: :active).first
     end
@@ -45,12 +43,5 @@ module SpreeCmCommissioner
     def generate_slug
       self.slug = name.parameterize if slug.blank?
     end
-
-    # Add Guardrails to ensure data integrity and make system predictable.
-    def single_active_vendor
-      return unless vendors.where(state: :active).count > 1
-
-      errors.add(:base, 'must have at most one active vendor')
-    end
   end
 end

data/app/models/spree_cm_commissioner/trip.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class Trip < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::RouteType
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
+    include SpreeCmCommissioner::ServiceOrigin
 
     attr_accessor :hours, :minutes, :seconds
 
@@ -26,7 +26,7 @@ module SpreeCmCommissioner
     after_commit :update_route_price_range, on: %i[create update]
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
-    belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: true
+    belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
 
     belongs_to :service_origin, class_name: 'Spree::Taxon', optional: true
 
@@ -134,6 +134,10 @@ module SpreeCmCommissioner
 
     private
 
+    def resolve_service_origin_id
+      route&.service_origin_id || vendor&.service_origin_id
+    end
+
     def duplicate_seat_layout_from_vehicle
       # Duplicate the vehicle's seat layout into this trip. Copies nested
       # seat sections and blocks while excluding identifying columns and

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class TripStop < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     acts_as_list column: :sequence, scope: :trip_id
 
     belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -19,8 +19,6 @@ module SpreeCmCommissioner
       base.has_many :payments, as: :payable, class_name: 'Spree::Payment', dependent: :nullify
       base.has_many :role_permissions, through: :spree_roles, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
-      base.has_many :preview_spree_roles, -> { where(role_type: :preview) }, through: :role_users, source: :role, class_name: 'Spree::Role'
-      base.has_many :preview_roles, through: :preview_spree_roles, class_name: 'SpreeCmCommissioner::PreviewRole'
       base.has_many :line_items, through: :orders, source: :line_items
       base.has_many :check_ins, foreign_key: 'check_in_by_id', class_name: 'SpreeCmCommissioner::CheckIn'
       base.has_many :user_events, class_name: 'SpreeCmCommissioner::UserEvent'
@@ -37,9 +35,6 @@ module SpreeCmCommissioner
       base.has_many :user_agencies, class_name: 'SpreeCmCommissioner::UserAgency'
       base.has_many :user_places, class_name: 'SpreeCmCommissioner::UserPlace'
       base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
-      base.has_many :voting_credits, class_name: 'SpreeCmCommissioner::VotingCredit', dependent: :destroy
-      base.has_many :votes, class_name: 'SpreeCmCommissioner::Vote', dependent: :destroy
-      base.has_many :voting_credit_transactions, through: :voting_credits, class_name: 'SpreeCmCommissioner::VotingCreditTransaction'
 
       base.has_one :profile, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::UserProfile'
       base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer'

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -6,7 +6,6 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
       base.include SpreeCmCommissioner::Integrations::IntegrationMappable
-      base.include SpreeCmCommissioner::VariantMetadata
 
       base.after_commit :update_vendor_price
       base.validate     :validate_option_types

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -146,10 +146,6 @@ module SpreeCmCommissioner
       @seat_type ||= option_value_name_for(option_type_name: 'seat-type')
     end
 
-    def vote_package_amount
-      @vote_package_amount ||= option_value_name_for(option_type_name: 'vote-package')&.to_i
-    end
-
     # can consider as customers.
     def number_of_guests
       number_of_adults + number_of_kids

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,7 +1,6 @@
 module SpreeCmCommissioner
   class Vehicle < Base
     include SpreeCmCommissioner::VehicleKind
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     belongs_to :vendor, class_name: 'Spree::Vendor'
     belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
@@ -14,8 +13,6 @@ module SpreeCmCommissioner
     validates :name, presence: true
     validates :license_plate, uniqueness: true, allow_blank: true
 
-    has_one :seat_layout, through: :vehicle_type
-
     self.whitelisted_ransackable_attributes = %w[name license_plate kind]
 
     def display_name

data/app/models/spree_cm_commissioner/vehicle_type.rb

@@ -2,7 +2,6 @@ module SpreeCmCommissioner
   class VehicleType < Base
     include SpreeCmCommissioner::StoreMetadata
     include SpreeCmCommissioner::VehicleKind
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
 
     # This model has no seat_layout column (polymorphic association), so we store the preload_seat_layout_id ID in public_metadata.
     # This lets us check if a seat layout exists without triggering a database query.

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -30,14 +30,9 @@ module SpreeCmCommissioner
       base.has_many :nearby_places, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VendorPlace', dependent: :destroy
 
       base.has_many :stock_items, through: :variants, class_name: 'Spree::StockItem'
-      base.has_many :currency_rates, class_name: 'SpreeCmCommissioner::CurrencyRate', dependent: :destroy
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :taxons, through: :taxon_vendors
-      base.has_many :shows, -> { where(spree_taxons: { type: 'SpreeCmCommissioner::Show' }) },
-                    through: :taxon_vendors, source: :taxon, class_name: 'SpreeCmCommissioner::Show'
-
-      base.has_many :voting_sessions, class_name: 'SpreeCmCommissioner::VotingSession', dependent: :destroy
 
       base.has_many :promoted_option_types, -> { where(promoted: true).order(:position) },
                     through: :vendor_option_types, source: :option_type
@@ -102,7 +97,6 @@ module SpreeCmCommissioner
       base.has_many :boarding_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :boarding_trip_stops
       base.has_many :drop_off_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :drop_off_trip_stops
       base.has_many :pricing_models, class_name: 'SpreeCmCommissioner::PricingModel', foreign_key: :vendor_id, dependent: :destroy
-      base.has_many :orders, -> { distinct }, through: :variants, source: :orders
 
       base.has_many :agency_categories, -> { where(kind: :agency_category) }, class_name: 'Spree::Taxon', foreign_key: :vendor_id
 
@@ -245,21 +239,6 @@ module SpreeCmCommissioner
     end
 
     delegate :present?, to: :tenant, prefix: true
-
-    # Returns the exchange rate between two currencies
-    # If no direct rate exists, calculates the inverse rate from the reverse pair
-    # Returns 1.0 for identical currencies, nil if no rate is found
-    def exchange_rate(from_currency, to_currency)
-      return 1.0 if from_currency == to_currency
-
-      pair = currency_rates.by_pair(from_currency, to_currency).first
-      return pair.rate if pair.present?
-
-      reverse_pair = currency_rates.by_pair(to_currency, from_currency).first
-      return (1.0 / reverse_pair.rate).round(6) if reverse_pair.present?
-
-      nil
-    end
   end
 end
 

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -1,7 +1,5 @@
 module SpreeCmCommissioner
   class VendorPlace < Base
-    include SpreeCmCommissioner::Integrations::IntegrationMappable
-
     enum place_type: { venue: 0, branch: 1, stop: 2, location: 3 }
     acts_as_list scope: :vendor
 

data/app/overrides/spree/admin/stores/_form/store_preferences.html.erb.deface

@@ -46,6 +46,15 @@
             <% end %>
           </div>
 
+          <!-- Telegram New Event Alert Chat ID -->
+          <div class="col-6">
+            <%= f.field_container :preferred_telegram_new_event_alert_chat_id do %>
+              <%= f.label :preferred_telegram_new_event_alert_chat_id, Spree.t(:telegram_new_event_alert_chat_id) %>
+              <%= f.text_field :preferred_telegram_new_event_alert_chat_id, class: 'form-control' %>
+              <%= f.error_message_on :preferred_telegram_new_event_alert_chat_id %>
+            <% end %>
+          </div>
+
           <!-- Assetlinks -->
           <div class="col-12">
             <%= f.field_container :preferred_assetlinks do %>

data/app/queries/spree_cm_commissioner/multi_leg_trips_query.rb

@@ -43,7 +43,7 @@ module SpreeCmCommissioner
       @date             = normalize_date(date)
       @vendor_id        = vendor_id
       @tenant_id        = tenant_id
-      @number_of_guests = number_of_guests || 1
+      @number_of_guests = Integer(number_of_guests || 1)
       @route_type       = route_type
       @options          = options
     end
@@ -106,7 +106,12 @@ module SpreeCmCommissioner
 
                 INNER JOIN spree_prices prices
                   ON prices.variant_id = master.id
+                 AND prices.inventory_item_id IS NULL
                  AND prices.deleted_at IS NULL
+
+                LEFT JOIN spree_prices AS date_prices
+                  ON date_prices.inventory_item_id = cm_inventory_items.id
+                 AND date_prices.deleted_at IS NULL
               SQL
               .where(parent: { origin_place_id: origin_id, destination_place_id: destination_id })
 
@@ -114,14 +119,6 @@ module SpreeCmCommissioner
       scope = scope.where(parent: { route_type: SpreeCmCommissioner::Trip.route_types[route_type] }) if route_type.present?
       scope = scope.where(parent: { vendor_id: vendor_id }) if vendor_id.present?
 
-      if options.key?(:featured)
-        scope = if ActiveModel::Type::Boolean.new.cast(options[:featured])
-                  scope.where('parent.featured_until >= ?', Time.current)
-                else
-                  scope.where('parent.featured_until IS NULL OR parent.featured_until < ?', Time.current)
-                end
-      end
-
       if tenant_id.present?
         scope = scope.joins('INNER JOIN spree_vendors v ON v.id = parent.vendor_id')
                      .where(v: { tenant_id: tenant_id })
@@ -140,9 +137,9 @@ module SpreeCmCommissioner
         SUM(cm_inventory_items.quantity_available) AS quantity_available,
         SUM(cm_inventory_items.max_capacity) AS max_capacity,
 
-        prices.amount,
-        prices.compare_at_amount,
-        prices.currency
+        COALESCE(MIN(date_prices.amount), MIN(prices.amount)) AS price,
+        COALESCE(MIN(date_prices.compare_at_amount), MIN(prices.compare_at_amount)) AS compare_at_price,
+        MIN(COALESCE(date_prices.currency, prices.currency)) AS currency
       SQL
            # GROUP BY ensures one result row per parent+leg combination, and SUM aggregates inventory
            # across all variants for that leg. Without aggregation, the single JOIN on spree_variants
@@ -157,10 +154,7 @@ module SpreeCmCommissioner
              parent.destination_place_id,
              parent.vendor_id,
              stop_legs.sequence,
-             stop_legs.offset_days,
-             prices.amount,
-             prices.compare_at_amount,
-             prices.currency
+             stop_legs.offset_days
            SQL
            .having('SUM(cm_inventory_items.quantity_available) >= ?', number_of_guests)
     end
@@ -232,47 +226,35 @@ module SpreeCmCommissioner
         vendor: trip.vendor,
         product_id: trip.product_id,
 
-        price: trip_row.amount,
+        price: trip_row.price,
         currency: trip_row.currency,
-        compare_at_amount: trip_row.compare_at_amount,
+        compare_at_price: trip_row.compare_at_price,
 
         quantity_available: trip_row.quantity_available,
         max_capacity: trip_row.max_capacity,
         offset_days: trip_row.offset_days,
         sequence: trip_row.sequence,
 
-        boarding: build_boarding_info_from_record(trip),
-        drop_off: build_drop_off_info_from_record(trip),
+        stops: build_stops_from_record(trip),
 
         amenities: trip.vehicle_type&.option_values || []
       )
     end
 
-    # @return Hash { stop_id, stop_name, departure_time } or nil
-    def build_boarding_info_from_record(trip)
-      trip_stop = trip.trip_stops.min_by(&:sequence)&.then do |stop|
-        stop if stop&.allow_boarding
+    # @return [Array<Hash>] All stops ordered by sequence with lat/lon and timing info
+    def build_stops_from_record(trip)
+      trip.trip_stops.sort_by(&:sequence).map do |stop|
+        {
+          stop_id: stop.stop_place_id,
+          stop_name: stop.stop_name,
+          allow_boarding: stop.allow_boarding,
+          allow_drop_off: stop.allow_drop_off,
+          departure_time: stop.departure_time,
+          arrival_time: stop.arrival_time,
+          lat: stop.stop_place&.lat,
+          lon: stop.stop_place&.lon
+        }
       end
-
-      return nil unless trip_stop
-
-      {
-        stop_id: trip_stop.stop_place_id,
-        stop_name: trip_stop.stop_name,
-        departure_time: trip_stop.departure_time
-      }
-    end
-
-    # @return Hash { stop_id, stop_name, arrival_time } or nil
-    def build_drop_off_info_from_record(trip)
-      trip_stop = trip.trip_stops.reverse.find(&:allow_drop_off)
-      return nil unless trip_stop
-
-      {
-        stop_id: trip_stop.stop_place_id,
-        stop_name: trip_stop.stop_name,
-        arrival_time: trip_stop.arrival_time
-      }
     end
   end
 end

data/app/queries/spree_cm_commissioner/single_leg_trips_query.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
       @date = date.to_date == Time.zone.today ? Time.zone.now : Time.zone.parse(date.to_s)
       @vendor_id = vendor_id
       @tenant_id = tenant_id
-      @number_of_guests = number_of_guests || 1
+      @number_of_guests = Integer(number_of_guests || 1)
       @route_type = route_type
       @options = options
     end
@@ -72,8 +72,12 @@ module SpreeCmCommissioner
             INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
             INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
             INNER JOIN spree_variants AS master ON master.product_id = cm_trips.product_id AND master.is_master = true
-            INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.deleted_at IS NULL
+            INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.inventory_item_id IS NULL AND prices.deleted_at IS NULL
             INNER JOIN (#{inventory_subquery.to_sql}) iv ON iv.product_id = cm_trips.product_id
+            LEFT JOIN spree_variants AS trip_variant ON trip_variant.product_id = cm_trips.product_id AND trip_variant.is_master = false AND trip_variant.deleted_at IS NULL
+            LEFT JOIN cm_inventory_items AS date_iv ON date_iv.variant_id = trip_variant.id AND date_iv.inventory_date = '#{date.to_date}' AND date_iv.quantity_available >= #{number_of_guests}
+            LEFT JOIN spree_prices AS date_prices ON date_prices.inventory_item_id = date_iv.id AND date_prices.deleted_at IS NULL
+            LEFT JOIN (#{stops_subquery_sql}) all_stops ON all_stops.trip_id = cm_trips.id
           SQL
         )
         .where(<<~SQL.squish, origin: origin_id, destination: destination_id)
@@ -89,46 +93,47 @@ module SpreeCmCommissioner
             cm_trips.destination_place_id = :destination
           )
         SQL
-        .then { |scope| apply_featured_filter(scope) }
-        .order('cm_trips.id, boarding.departure_time')
+        .order(Arel.sql('cm_trips.id, COALESCE(date_prices.amount, prices.amount) ASC NULLS LAST'))
     end
 
-    def apply_featured_filter(scope)
-      return scope unless featured_filter_requested?
-
-      if featured?
-        scope.where('cm_trips.featured_until >= ?', Time.current)
-      else
-        scope.where('cm_trips.featured_until IS NULL OR cm_trips.featured_until < ?', Time.current)
-      end
-    end
-
-    def featured_filter_requested?
-      options.respond_to?(:key?) && options.key?(:featured)
-    end
-
-    def featured?
-      ActiveModel::Type::Boolean.new.cast(options[:featured])
-    end
-
-    # SQL to select trip attributes along with boarding/drop-off details, place names, pricing, and inventory
+    # SQL to select trip attributes along with place names, pricing, inventory, and ordered stop list
     def selected_columns_sql
       <<~SQL.squish
         DISTINCT ON (cm_trips.id)
         cm_trips.*,
         boarding.departure_time AS boarding_departure_time,
-        boarding.stop_place_id AS boarding_stop_id,
-        boarding.stop_name AS boarding_stop_name,
-        drop_off.stop_name AS drop_off_stop_name,
-        drop_off.stop_place_id AS drop_off_stop_id,
-        drop_off.arrival_time AS drop_off_arrival_time,
         COALESCE(iv.quantity_available, 0) AS quantity_available,
         COALESCE(iv.max_capacity, 0) AS max_capacity,
         origin_places.name AS origin_place_name,
         dest_places.name AS destination_place_name,
-        prices.amount,
-        prices.compare_at_amount,
-        prices.currency
+        COALESCE(date_prices.amount, prices.amount) AS price,
+        COALESCE(date_prices.compare_at_amount, prices.compare_at_amount) AS compare_at_price,
+        COALESCE(date_prices.currency, prices.currency) AS currency,
+        all_stops.stops AS stops
+      SQL
+    end
+
+    # Subquery to aggregate all stops for each trip into a JSON array, ordered by sequence.
+    # Each stop includes place coordinates (lat/lon) joined from cm_places.
+    # Returns one row per trip_id with a `stops` JSON column consumed by selected_columns_sql.
+    def stops_subquery_sql
+      <<~SQL.squish
+        SELECT ts.trip_id,
+          json_agg(
+            json_build_object(
+              'stop_id', ts.stop_place_id,
+              'stop_name', ts.stop_name,
+              'allow_boarding', ts.allow_boarding,
+              'allow_drop_off', ts.allow_drop_off,
+              'departure_time', ts.departure_time AT TIME ZONE 'UTC',
+              'arrival_time', ts.arrival_time AT TIME ZONE 'UTC',
+              'lat', p.lat,
+              'lon', p.lon
+            ) ORDER BY ts.sequence
+          ) AS stops
+        FROM cm_trip_stops ts
+        LEFT JOIN cm_places p ON p.id = ts.stop_place_id
+        GROUP BY ts.trip_id
       SQL
     end
 

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -11,16 +11,14 @@ module SpreeCmCommissioner
       @number_of_guests = number_of_guests || 1
       @route_type = route_type
       @options = options
-      @page = (options[:page] || 1).to_i
-      @per_page = options[:per_page]
     end
 
     def call
-      return Kaminari.paginate_array([]).page(@page).per(@per_page) if date.to_date < Date.current
+      return Kaminari.paginate_array([]) if date.to_date < Date.current
 
       result = direct_trips
       result += multi_leg_trips if result.empty? || result.size < 3 || ActiveModel::Type::Boolean.new.cast(@options[:include_multi_leg])
-      Kaminari.paginate_array(result).page(@page).per(@per_page)
+      Kaminari.paginate_array(result)
     end
 
     private

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class HomepageSectionSerializer < BaseSerializer
-        attributes :id, :title, :segments, :description, :active, :position, :preview, :created_at, :updated_at
+        attributes :id, :title, :segments, :description, :active, :position, :created_at, :updated_at
         has_many :homepage_section_relatables
       end
     end

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

@@ -13,7 +13,7 @@ module Spree
           base.has_one :venue, serializer: ::SpreeCmCommissioner::V2::Storefront::ProductPlaceSerializer
 
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking, :use_video_as_default
-          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on, :preview
+          base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on
 
           # Expose only the `event_id` here instead of the full event object.
           # This lets the client fetch event details separately (usually already cached),

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       class RoleSerializer < BaseSerializer
-        attributes :name, :role_type
+        attributes :name
       end
     end
   end

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

@@ -15,8 +15,7 @@ module Spree
 
           base.attributes :custom_redirect_url, :kind, :subtitle, :from_date, :to_date,
                           :background_color, :foreground_color, :show_badge_status,
-                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner,
-                          :preview
+                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner
 
           # To get full seat layout details, call the seat_layouts API with this ID.
           base.attribute :seat_layout_ids, &:preload_seat_layout_ids

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

@@ -3,7 +3,7 @@ module Spree
     module Tenant
       class HomepageSectionSerializer < BaseSerializer
         attributes :id, :title, :segments, :description,
-                   :active, :position, :preview, :created_at, :updated_at
+                   :active, :position, :created_at, :updated_at
 
         has_many :homepage_section_relatables, serializer: ::Spree::V2::Tenant::HomepageSectionRelatableSerializer
       end

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Tenant
       class RoleSerializer < BaseSerializer
-        attributes :name, :presentation, :role_type
+        attributes :name
       end
     end
   end

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

@@ -15,8 +15,13 @@ module SpreeCmCommissioner
           expires_in: 30.minutes
         )
 
-        attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
-                   :allow_seat_selection, :departure_time, :route_type, :distance, :display_price, :offset_days
+        attributes :origin_place, :destination_place, :stops, :price, :compare_at_price, :currency, :quantity_available, :max_capacity,
+                   :allow_seat_selection, :departure_time, :route_type, :distance, :offset_days,
+                   :featured_until, :display_price, :display_compare_at_price
+
+        # Deprecated for backwards compatibility
+        attribute :compare_at_amount, &:compare_at_price
+
         attribute :duration_in_hms, &:duration_in_hms
         attribute :arrival_time, &:arrival_time
         belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer