spree_cm_commissioner 2.3.0.pre.pre20 → 2.3.1.pre.pre1

data/app/interactors/spree_cm_commissioner/trip_distance_calculator.rb

@@ -0,0 +1,165 @@
+module SpreeCmCommissioner
+  # Computes trip distance details and pricing payload.
+  #
+  # Inputs via context:
+  # - origin: { lat:, lng: }
+  # - configured_destination: { lat:, lng: }
+  # - pickups: Array<{ lat:, lng: }> (optional)
+  # - dropoffs: Array<{ lat:, lng: }> (optional)
+  # - pickup_oob_confirmed: Boolean (optional)
+  # - dropoff_oob_confirmed: Boolean (optional)
+  # - base_price_usd: Numeric
+  # - boundary_km: Numeric (optional, default 0)
+  #
+  # Outputs via context on success:
+  # - payload: Hash (compatible with previous controller response)
+  # - base_km, detour_pickup_km, detour_dropoff_km: Floats or nil
+  # - distance_km, directions_url, ordered_points, estimated_time_minutes (when optimize true)
+  class TripDistanceCalculator < BaseInteractor
+    delegate :origin,
+             :configured_destination,
+             :pickups,
+             :dropoffs,
+             :pickup_oob_confirmed,
+             :dropoff_oob_confirmed,
+             :base_price_usd,
+             :boundary_km,
+             to: :context
+
+    def call
+      validate_inputs
+
+      pickups_points, dropoffs_points, final_destination = prepare_points
+      base_km, detour_pickup_km, detour_dropoff_km = compute_route_kms(pickups_points, dropoffs_points, final_destination)
+      details_ctx = fetch_details(final_destination, pickups_points, dropoffs_points)
+      extra_data = compute_extra_data(base_km, detour_pickup_km, detour_dropoff_km)
+      payload = build_payload(details_ctx, base_km, detour_pickup_km, detour_dropoff_km, extra_data)
+      assign_context(details_ctx, base_km, detour_pickup_km, detour_dropoff_km, payload)
+    end
+
+    private
+
+    def validate_inputs
+      context.fail!(message: 'origin is required') if origin.blank?
+      context.fail!(message: 'configured_destination is required') if configured_destination.blank?
+    end
+
+    def compute_km(origin:, destination:, pickups: nil, dropoffs: nil, optimize: nil)
+      ctx = SpreeCmCommissioner::GoogleRoutesDistanceCalculator.call(
+        origin: origin,
+        destination: destination,
+        pickups: pickups,
+        dropoffs: dropoffs,
+        optimize: optimize
+      )
+      return nil unless ctx.success?
+
+      ctx.distance_km
+    end
+
+    def prepare_points
+      pickups_points = Array(pickups).compact
+      dropoffs_points = Array(dropoffs).compact
+      final_destination = dropoffs_points.last || configured_destination
+      [pickups_points, dropoffs_points, final_destination]
+    end
+
+    def compute_route_kms(pickups_points, dropoffs_points, final_destination)
+      base_km = compute_km(origin: origin, destination: configured_destination)
+      detour_pickup_km =
+        if pickups_points.any?
+          compute_km(
+            origin: origin,
+            destination: configured_destination,
+            pickups: pickups_points,
+            optimize: false
+          )
+        end
+      detour_dropoff_km =
+        if dropoffs_points.any?
+          compute_km(
+            origin: origin,
+            destination: final_destination,
+            dropoffs: dropoffs_points,
+            optimize: false
+          )
+        end
+      [base_km, detour_pickup_km, detour_dropoff_km]
+    end
+
+    def fetch_details(final_destination, pickups_points, dropoffs_points)
+      ctx = SpreeCmCommissioner::GoogleRoutesDistanceCalculator.call(
+        origin: origin,
+        destination: final_destination,
+        pickups: pickups_points,
+        dropoffs: dropoffs_points,
+        optimize: true
+      )
+      context.fail!(message: ctx.message || 'Unable to calculate') unless ctx.success?
+      ctx
+    end
+
+    def compute_extra_data(base_km, detour_pickup_km, detour_dropoff_km)
+      extra_pickup_km = compute_extra_km(detour_pickup_km, base_km, pickup_oob_confirmed)
+      extra_dropoff_km = compute_extra_km(detour_dropoff_km, base_km, dropoff_oob_confirmed)
+      extra_pickup_charge_usd = charge_for_extra_km(extra_pickup_km)
+      extra_dropoff_charge_usd = charge_for_extra_km(extra_dropoff_km)
+      extra_charge_usd = (extra_pickup_charge_usd + extra_dropoff_charge_usd).round(2)
+      total_price_usd = (base_price_usd.to_f + extra_charge_usd).round(2)
+
+      {
+        extra_pickup_km: extra_pickup_km,
+        extra_dropoff_km: extra_dropoff_km,
+        extra_pickup_charge_usd: extra_pickup_charge_usd,
+        extra_dropoff_charge_usd: extra_dropoff_charge_usd,
+        total_price_usd: total_price_usd
+      }
+    end
+
+    def build_payload(details_ctx, base_km, detour_pickup_km, detour_dropoff_km, data)
+      {
+        distance_km: details_ctx.distance_km,
+        directions_url: details_ctx.directions_url,
+        ordered_points: details_ctx.ordered_points,
+        estimated_time_minutes: details_ctx.estimated_time_minutes,
+        base_price_usd: base_price_usd.to_f,
+        total_price_usd: data[:total_price_usd],
+        extra_pickup_km: data[:extra_pickup_km],
+        extra_dropoff_km: data[:extra_dropoff_km],
+        extra_pickup_charge_usd: data[:extra_pickup_charge_usd],
+        extra_dropoff_charge_usd: data[:extra_dropoff_charge_usd],
+        extra_charge_usd: data[:extra_charge_usd],
+        base_km: base_km,
+        detour_pickup_km: detour_pickup_km,
+        detour_dropoff_km: detour_dropoff_km
+      }
+    end
+
+    def assign_context(details_ctx, base_km, detour_pickup_km, detour_dropoff_km, payload)
+      context.payload = payload
+      context.distance_km = details_ctx.distance_km
+      context.directions_url = details_ctx.directions_url
+      context.ordered_points = details_ctx.ordered_points
+      context.estimated_time_minutes = details_ctx.estimated_time_minutes
+      context.base_km = base_km
+      context.detour_pickup_km = detour_pickup_km
+      context.detour_dropoff_km = detour_dropoff_km
+    end
+
+    def compute_extra_km(detour_km, base_km, confirmed)
+      return 0.0 unless confirmed && detour_km && base_km
+
+      [(detour_km - base_km - boundary_km), 0.0].max
+    end
+
+    def charge_for_extra_km(extra_km)
+      x = extra_km.to_f
+      return 0.0 if x <= 0
+      return 2.0 if x <= 5.0
+      return 5.0 if x <= 10.0
+      return 10.0 if x <= 20.0
+
+      (10.0 + ((x - 20.0) * 0.5)).round(2)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def admin_chat_id
-      ENV.fetch('EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID', nil)
+      Spree::Store.default&.preferred_telegram_new_vendor_alert_chat_id
     end
   end
 end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -37,22 +37,21 @@ module Spree
 
     def setup_tenant_and_store
       @tenant = @order.tenant
-      if @tenant.present?
-        @brand_color = @tenant.preferences[:brand_primary_color]
-        @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
-        @current_store = @tenant
-      else
-        @current_store = @order.store
-      end
+      @current_store = @order.store
+      return if @tenant.blank?
+
+      @brand_color = @tenant.preferences[:brand_primary_color]
+      @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
     end
 
     def build_subject(resend)
       prefix = resend ? "[#{Spree.t(:resend).upcase}] " : ''
-      "#{prefix}#{@current_store&.name} Booking Confirmation ##{@order.number}"
+      store_name = @tenant.present? ? @tenant.name : @current_store&.name
+      "#{prefix}#{store_name} Booking Confirmation ##{@order.number}"
     end
 
     def store_url
-      @tenant.present? ? @current_store.host : @current_store.url
+      @tenant.present? ? @tenant.url : @current_store.url
     end
 
     def ticket_email(guest, email)

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

@@ -17,16 +17,15 @@ module SpreeCmCommissioner
       # Inactive orders scopes with parameterized dates
       # Usage: Spree::Order.inactive_incomplete_all(threshold: 14.days.ago)
       scope :inactive_incomplete_all, lambda { |threshold: 14.days.ago|
-        where(archived_at: nil, completed_at: nil)
-          .where('updated_at < ?', threshold)
+        where('updated_at < ?', threshold)
+          .where(archived_at: nil, completed_at: nil)
       }
 
       # Usage: Spree::Order.inactive_incomplete(threshold: 14.days.ago, window: 7.days)
       # Returns orders updated between (threshold - window) and threshold
       scope :inactive_incomplete, lambda { |threshold: 14.days.ago, window: 7.days|
-        where(archived_at: nil, completed_at: nil)
-          .where('updated_at >= ?', threshold - window)
-          .where('updated_at < ?', threshold)
+        where('updated_at >= ? AND updated_at < ?', threshold - window, threshold)
+          .where(archived_at: nil, completed_at: nil)
       }
 
       # Filter scopes

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

@@ -50,9 +50,9 @@ module SpreeCmCommissioner
       private
 
       def tenant_link_or_default(tenant, default_link)
-        return default_link unless tenant.respond_to?(:host)
+        return default_link unless tenant.respond_to?(:url)
 
-        site = tenant.host.to_s.strip
+        site = tenant.url.to_s.strip
         site.presence || default_link
       rescue StandardError
         default_link

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

@@ -6,6 +6,7 @@ module SpreeCmCommissioner
       preference :sms_sender_id, :string
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
+      preference :telegram_new_vendor_alert_chat_id, :string
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
     end

data/app/models/spree_cm_commissioner/product_completion_step.rb

@@ -4,6 +4,8 @@ module SpreeCmCommissioner
 
     belongs_to :product, class_name: '::Spree::Product', optional: false
 
+    has_one :banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::ProductCompletionStepBanner'
+
     # When a completion step is changed, regenerate completion steps for all line items
     # of the product so they reflect the latest step configuration.
     after_destroy :regenerate_line_items_completion_steps
@@ -28,7 +30,8 @@ module SpreeCmCommissioner
         action_label: action_label,
         action_url: action_url_for(line_item),
         completed_at: existing_data&.dig('completed_at'),
-        completed: completed?(line_item)
+        completed: completed?(line_item),
+        banner_url: banner.present? ? banner.original_url : nil
       }
     end
 

data/app/models/spree_cm_commissioner/product_completion_step_banner.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class ProductCompletionStepBanner < Asset
+    # 16x9 aspect ratio
+    def asset_styles
+      {
+        mini: '160x90>',
+        small: '480x270>',
+        medium: '960x540>'
+      }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/product_completion_steps/social_entry_url.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
       # - https://t.me/ThePlatformKHBot?start={order.number}
       # - https://example.com?guest_name={guests[0].first_name}&phone={guests[0].phone_number}
       # - https://example.com?line_item_id={line_item.id}&quantity={line_item.quantity}
+      # - https://example.com?bill_address.first_name={bill_address.first_name}&bill_address.lastname={bill_address.lastname}
       preference :entry_point_link, :string
 
       # Allowed fields per object (excludes private/reference fields like *_id, *_by_id, metadata, etc.)
@@ -14,7 +15,11 @@ module SpreeCmCommissioner
         state
         email
         total
+        display_total
         item_total
+        display_item_total
+        adjustment_total
+        display_adjustment_total
         created_at
         completed_at
         token
@@ -23,12 +28,31 @@ module SpreeCmCommissioner
         currency
         item_count
         channel
+        special_instructions
+      ].freeze
+
+      BILL_ADDRESS_ALLOWED_FIELDS = %w[
+        first_name
+        last_name
+        full_name
+        address1
+        address2
+        city
+        zipcode
+        phone
+        state_name
+        alternative_phone
+        company
+        label
+        age
+        gender
       ].freeze
 
       LINE_ITEM_ALLOWED_FIELDS = %w[
         qr_data
         quantity
         price
+        display_price
         from_date
         to_date
         number
@@ -45,7 +69,6 @@ module SpreeCmCommissioner
         dob
         gender
         age
-        email
         phone_number
         address
         seat_number
@@ -60,9 +83,6 @@ module SpreeCmCommissioner
         expectation
         other_occupation
         other_organization
-        entry_type
-        upload_later
-        data_fill_stage_phase
         created_at
         updated_at
       ].freeze
@@ -72,32 +92,79 @@ module SpreeCmCommissioner
         return nil if preferred_entry_point_link.blank?
 
         url = preferred_entry_point_link.dup
+        url = replace_order_placeholders(url, line_item)
+        url = replace_bill_address_placeholders(url, line_item)
+        url = replace_line_item_placeholders(url, line_item)
+
+        replace_guest_placeholders(url, line_item)
+      end
+
+      def completed?(line_item)
+        return false if line_item.completion_steps.blank?
+
+        step_data = line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
+        step_data&.dig('completed_at').present?
+      end
+
+      # Returns a hash of all supported placeholder fields grouped by object type.
+      # Used by the admin UI to display available placeholders when configuring the entry_point_link template.
+      # Example usage in template: {order.number}, {bill_address.first_name}, {line_item.quantity}, {guests[0].email}
+      #
+      # @return [Hash] Hash with keys :order, :bill_address, :line_item, :guests
+      #                Each key maps to an array of allowed field names for that object type
+      def supported_fields
+        {
+          order: ORDER_ALLOWED_FIELDS,
+          bill_address: BILL_ADDRESS_ALLOWED_FIELDS,
+          line_item: LINE_ITEM_ALLOWED_FIELDS,
+          guests: GUEST_ALLOWED_FIELDS
+        }
+      end
+
+      private
 
-        # Replace order placeholders: {order.field_name}
-        line_item.order.attributes.each do |field, value|
-          url.gsub!("{order.#{field}}", value.to_s) if ORDER_ALLOWED_FIELDS.include?(field)
+      def replace_order_placeholders(url, line_item)
+        return url if line_item.order.blank?
+
+        ORDER_ALLOWED_FIELDS.each do |field|
+          value = line_item.order.public_send(field)
+          url.gsub!("{order.#{field}}", value.to_s) if value.present?
         end
 
-        # Replace line_item placeholders: {line_item.field_name}
-        line_item.attributes.each do |field, value|
-          url.gsub!("{line_item.#{field}}", value.to_s) if LINE_ITEM_ALLOWED_FIELDS.include?(field)
+        url
+      end
+
+      def replace_bill_address_placeholders(url, line_item)
+        return url if line_item.order&.bill_address.blank?
+
+        BILL_ADDRESS_ALLOWED_FIELDS.each do |field|
+          value = line_item.order.bill_address.public_send(field)
+          url.gsub!("{bill_address.#{field}}", value.to_s) if value.present?
         end
 
-        # Replace guest placeholders: {guests[index].field_name}
-        line_item.guests.each_with_index do |guest, index|
-          guest.attributes.each do |field, value|
-            url.gsub!("{guests[#{index}].#{field}}", value.to_s) if GUEST_ALLOWED_FIELDS.include?(field)
-          end
+        url
+      end
+
+      def replace_line_item_placeholders(url, line_item)
+        LINE_ITEM_ALLOWED_FIELDS.each do |field|
+          value = line_item.public_send(field)
+          url.gsub!("{line_item.#{field}}", value.to_s) if value.present?
         end
 
         url
       end
 
-      def completed?(line_item)
-        return false if line_item.completion_steps.blank?
+      def replace_guest_placeholders(url, line_item)
+        return url if line_item.guests.blank?
 
-        step_data = line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
-        step_data&.dig('completed_at').present?
+        line_item.guests.each_with_index do |guest, index|
+          GUEST_ALLOWED_FIELDS.each do |field|
+            value = guest.public_send(field)
+            url.gsub!("{guests[#{index}].#{field}}", value.to_s) if value.present?
+          end
+        end
+
+        url
       end
     end
   end

data/app/models/spree_cm_commissioner/tenant.rb

@@ -12,7 +12,10 @@ module SpreeCmCommissioner
                                       through: :vendors,
                                       source: :payment_methods
 
-    validates :host, uniqueness: true, presence: true
+    validates :host, presence: true, uniqueness: true,
+                     format: { without: %r{\Ahttps?://},
+                               message: :format
+                             }
 
     enum state: { enabled: 0, disabled: 1 }
 
@@ -22,6 +25,12 @@ module SpreeCmCommissioner
       vendors.where(state: :active).first
     end
 
+    def url
+      return if host.blank?
+
+      Rails.env.development? || Rails.env.test? ? "http://#{host}" : "https://#{host}"
+    end
+
     private
 
     def generate_slug

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -1,8 +1,9 @@
 module SpreeCmCommissioner
   class VendorPlace < Base
-    enum place_type: { location: 0, branch: 1, stop: 2 }
+    enum place_type: { venue: 0, branch: 1, stop: 2, location: 3 }
     acts_as_list scope: :vendor
 
+    belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
@@ -16,6 +17,8 @@ module SpreeCmCommissioner
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
+    before_save :set_tenant_id
+
     # include place when using these delegate to avoid N+1
     def display_name
       place&.name
@@ -28,5 +31,11 @@ module SpreeCmCommissioner
     def selected
       vendor.selected_place_references.include?(place&.reference)
     end
+
+    private
+
+    def set_tenant_id
+      self.tenant_id = vendor&.tenant_id
+    end
   end
 end

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

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

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,13 +1,15 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :params
+    attr_reader :origin_id, :destination_id, :date, :vendor_id, :tenant_id, :number_of_guests, :route_type, :params
 
-    def initialize(origin_id:, destination_id:, date:, vendor_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
+    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_id: nil, tenant_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
       @origin_id = origin_id
       @destination_id = destination_id
       @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @vendor_id = vendor_id
+      @tenant_id = tenant_id
       @number_of_guests = number_of_guests || 1
+      @route_type = route_type
       @params = params
       @page = (params[:page] || 1).to_i
       @per_page = params[:per_page]
@@ -34,37 +36,11 @@ module SpreeCmCommissioner
     end
 
     def direct_trips
-      @inventory_sql ||= product_inventory_totals
-      result = SpreeCmCommissioner::Trip
-               .select(<<~SQL.squish)
-                 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 AS amount, prices.compare_at_amount AS compare_at_amount,
-                 prices.currency AS currency
-               SQL
-               .includes(vendor: :logo, vehicle: :option_values)
-               .joins(<<~SQL.squish)
-                 INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
-                 INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
-                 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
-               SQL
-               .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ? OR cm_trips.origin_place_id = ?)
-                        AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ? OR cm_trips.destination_place_id = ?)',
-                      origin_id, origin_id, origin_id, destination_id, destination_id, destination_id
-               )
-               .joins("INNER JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
-
-      result = result.where(vendor_id: vendor_id) if vendor_id.present?
-      @per_page.to_i.positive? ? result.page(@page).per(@per_page) : result.page(@page)
+      result = trip_scope
+      result = result.where({ vendor_id: vendor_id }.compact) if vendor_id.present?
+      result = result.where(route_type: route_type) if route_type.present?
+      result = result.where(spree_vendors: { tenant_id: tenant_id }) if tenant_id.present?
+      paginate(result)
     end
 
     def product_inventory_totals
@@ -81,6 +57,48 @@ module SpreeCmCommissioner
 
     private
 
+    def trip_scope
+      scope = SpreeCmCommissioner::Trip
+              .select(<<~SQL.squish)
+                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 AS amount, prices.compare_at_amount AS compare_at_amount,
+                prices.currency AS currency
+              SQL
+              .includes(vendor: :logo, vehicle: :option_values)
+
+      scope = scope.joins(:vendor) if tenant_id.present?
+
+      scope
+        .joins(<<~SQL.squish)
+          INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
+          INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
+          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
+        SQL
+        .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ? OR cm_trips.origin_place_id = ?)
+                 AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ? OR cm_trips.destination_place_id = ?)',
+               origin_id, origin_id, origin_id, destination_id, destination_id, destination_id
+        )
+        .joins("INNER JOIN (#{inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
+    end
+
+    def paginate(result)
+      @per_page.to_i.positive? ? result.page(@page).per(@per_page) : result.page(@page)
+    end
+
+    def inventory_sql
+      @inventory_sql ||= product_inventory_totals
+    end
+
     def build_trip_result(trip)
       vehicle = trip&.vehicle
       vendor = trip&.vendor

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

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
       class TripVehicleSerializer < BaseSerializer
         set_type :vehicle
 
-        attributes :id, :code, :vehicle_type
+        attributes :id, :code, :vehicle_type, :number_of_seats
 
         has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer

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

@@ -42,6 +42,7 @@ module SpreeCmCommissioner
           )
 
           build_guests_for!(line_item, quantity)
+          assign_saved_guests_to_line_item(line_item)
 
           order.save!
           order.update_with_updater!
@@ -62,6 +63,13 @@ module SpreeCmCommissioner
       def build_guests_for!(line_item, qty)
         Array.new(qty) { line_item.guests.new }
       end
+
+      def assign_saved_guests_to_line_item(line_item)
+        line_item.guests.each do |guest|
+          saved_guest = SpreeCmCommissioner::SavedGuest.new
+          guest.saved_guest = saved_guest
+        end
+      end
     end
   end
 end