spree_cm_commissioner 2.3.2.pre.pre6 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ca9307610d54be6741944d0ebe1d7afc65a2769cd4efa059d71d9c1bbbdb9d
-  data.tar.gz: 998984150b755cadaddd27b62aebd2dd227999d23e5f92829698b1d234af20a5
+  metadata.gz: f69009264c3f351003ddd4885f403db68bc0a589a9e28123188a26bdd382b3d6
+  data.tar.gz: fea37b83621c4eb39ee2936ae4d72c377ee6d0767fb240be01c2de82e63d4c83
 SHA512:
-  metadata.gz: 8cd9413f816f3bacea04edaf65dd7536a31f933f2884015f81d11e84e1eb67b1c82a0bd910f95b017735eeaa7d1b1455ad4cec6ba678ef3ac7012bfbaa72cfc3
-  data.tar.gz: 285883b393f3e67ab6a969b3bd13f2c468ca419e306ade9206dc0e3ead9d8c63630fc65dd67cfed1ac5517c732b8d9e675e46c9c74a9b08dcac3bf338c74f126
+  metadata.gz: 8530a8855d325ffae9223d3ed705be0f445bd5ce01c2479ef809f783804af5d4b90cd716a5c10076cbad561f6d57c03becf4d8ccb2e7e33bd57144c29bd1ff5e
+  data.tar.gz: 9d2bada64c5ac4701bb9f18d233e8948e0e8b6b9cf6fd0e923157007bd06cde7ef79b13ffa0476aad2a3ec955a268e66249b3f49097fce93136a61dfa0856f4f

data/Gemfile.lock

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

data/app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb

@@ -4,70 +4,29 @@ module Spree
       module Storefront
         module IntercityTaxi
           class DraftOrdersController < ::Spree::Api::V2::ResourceController
-            include Spree::Api::V2::Storefront::OrderConcern
-            include SpreeCmCommissioner::OrderConcern
-
-            before_action :ensure_order, only: :update
-
             def create
-              result = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
-                user: spree_current_user,
+                user_id: params[:user_id],
                 quantity: params[:quantity]
               )
 
-              if result.success?
-                render_serialized_payload { serialize_resource(result.value) }
-              else
-                render_error_payload(result.error)
-              end
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
             end
 
             def update
-              result = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                order: spree_current_order,
-                remark: params[:remark],
-                pickup_map_place_attributes: params.require(:pickup_map_place_attributes).permit(
-                  :place_name,
-                  :lat,
-                  :lng,
-                  :oob_confirmed
-                ),
-                dropoff_map_place_attributes: params.require(:dropoff_map_place_attributes).permit(
-                  :place_name,
-                  :lat,
-                  :lng,
-                  :oob_confirmed
-                ),
-                distance_attributes: params.require(:distance_attributes).permit(
-                  :distance_km,
-                  :ordered_points,
-                  :estimated_time_minutes,
-                  :base_km,
-                  :detour_pickup_km,
-                  :detour_dropoff_km,
-                  :extra_pickup_km,
-                  :extra_dropoff_km
-                )
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+                order_number: params[:id],
+                params: params
               )
 
-              if result.success?
-                render_serialized_payload { serialize_resource(result.value) }
-              else
-                render_error_payload(result.error)
-              end
-            end
-
-            private
-
-            def required_schema
-              if action_name == 'create'
-                SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
-              else
-                SpreeCmCommissioner::IntercityTaxiDraftOrderUpdateSchema
-              end
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
             end
 
             def resource_serializer

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -19,7 +19,6 @@
 # Name: Vaneath Awesome
 # Tel: <code>+85570760548</code>
 # Email: <code>admin_dev@cm.com</code>
-# Delivery Address: #123, St. 456, Phnom Penh
 
 module SpreeCmCommissioner
   class OrderTelegramMessageFactory < TelegramMessageFactory
@@ -80,7 +79,6 @@ module SpreeCmCommissioner
       text << "Name: #{order.name}"
       text << "Tel: #{inline_code(order.intel_phone_number || order.phone_number)}"
       text << "Email: #{inline_code(order.email)}" if order.email.present?
-      text << "Delivery Address: #{formatted_shipping_address.presence || 'N/A'}" if order.delivery_required?
 
       if show_details_link && order.guests.any?
         text << ''
@@ -91,16 +89,6 @@ module SpreeCmCommissioner
       text.compact.join("\n")
     end
 
-    def formatted_shipping_address
-      return 'N/A' if order.shipping_address.blank?
-
-      @formatted_shipping_address ||= [
-        order.shipping_address.address1,
-        order.shipping_address.address2,
-        order.shipping_address.state&.name
-      ].compact.compact_blank.join(', ')
-    end
-
     # Result:
     # | No. A24 | No. A24 |
     # | No. A24 | No. A24 |

data/app/mailers/spree/order_mailer_decorator.rb

@@ -12,20 +12,14 @@ module Spree
       return false if @order.email.blank?
 
       setup_tenant_and_store
-      if @tenant.present?
-        @name = @order.tenant.name
-        @logo = @order.tenant.active_vendor&.logo&.original_url
-        @brand_color = @order.tenant.preferred_brand_primary_color
-      end
       @product_type = @order.products.first&.product_type || 'accommodation'
 
       subject = build_subject(resend)
 
       mail(to: @order.email,
-           from: from_email_address,
-           subject: subject,
+           from: from_email_address, subject: subject,
            store_url: store_url
-          ) do |format|
+      ) do |format|
         format.html { render layout: 'spree_cm_commissioner/layouts/order_mailer' }
         format.text
       end
@@ -44,6 +38,10 @@ module Spree
     def setup_tenant_and_store
       @tenant = @order.tenant
       @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)

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

@@ -27,6 +27,11 @@ module SpreeCmCommissioner
       validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
+      validates :pickup_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
+      validates :pickup_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
+      validates :drop_off_lat, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90 }, allow_nil: true
+      validates :drop_off_lng, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180 }, allow_nil: true
+
       validates :passenger_count, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
       # Groups LineItems by trip fields. Some fields can be null,
@@ -56,71 +61,121 @@ module SpreeCmCommissioner
     def boarding_trip_stop_id = private_metadata['boarding_trip_stop_id']&.to_i
     def drop_off_trip_stop_id = private_metadata['drop_off_trip_stop_id']&.to_i
 
-    def passenger_count = public_metadata['passenger_count']&.to_i
+    def pickup_place_name = public_metadata['pickup_place_name']
+    def drop_off_place_name = public_metadata['drop_off_place_name']
 
-    def pickup_map_place
-      pickup_hash = public_metadata&.dig('pickup_map_place')
-      return nil if pickup_hash.blank?
+    def pickup_lat = public_metadata['pickup_lat']&.to_f
+    def pickup_lng = public_metadata['pickup_lng']&.to_f
+    def drop_off_lat = public_metadata['drop_off_lat']&.to_f
+    def drop_off_lng = public_metadata['drop_off_lng']&.to_f
+    def passenger_count = public_metadata['passenger_count']&.to_i
+    def distance_km = public_metadata['distance_km']&.to_f
+    def ordered_points = public_metadata['ordered_points']
+    def base_km = public_metadata['base_km']&.to_f
+    def detour_pickup_km = public_metadata['detour_pickup_km']&.to_f
+    def detour_dropoff_km = public_metadata['detour_dropoff_km']&.to_f
+    def extra_pickup_km = public_metadata['extra_pickup_km']&.to_f
+    def extra_dropoff_km = public_metadata['extra_dropoff_km']&.to_f
+    def extra_pickup_charge_usd = public_metadata['extra_pickup_charge_usd']&.to_f
+    def extra_dropoff_charge_usd = public_metadata['extra_dropoff_charge_usd']&.to_f
+    def estimated_time_minutes = public_metadata['estimated_time_minutes']&.to_i
+    def pickup_oob_confirmed = private_metadata['pickup_oob_confirmed']
+    def drop_off_oob_confirmed = private_metadata['drop_off_oob_confirmed']
 
-      SpreeCmCommissioner::IntercityTaxi::MapPlace.from_hash(pickup_hash)
+    def direction=(value)
+      set_private_metadata_value('direction', value)
     end
 
-    def dropoff_map_place
-      dropoff_hash = public_metadata&.dig('dropoff_map_place')
-      return nil if dropoff_hash.blank?
+    def trip_id=(value)
+      set_private_metadata_value('trip_id', value)
+    end
 
-      SpreeCmCommissioner::IntercityTaxi::MapPlace.from_hash(dropoff_hash)
+    def boarding_trip_stop_id=(value)
+      set_private_metadata_value('boarding_trip_stop_id', value)
     end
 
-    def distance
-      distance_hash = public_metadata&.dig('distance')
-      return nil if distance_hash.blank?
+    def drop_off_trip_stop_id=(value)
+      set_private_metadata_value('drop_off_trip_stop_id', value)
+    end
 
-      SpreeCmCommissioner::IntercityTaxi::Distance.from_hash(distance_hash)
+    def pickup_oob_confirmed=(value)
+      set_private_metadata_value('pickup_oob_confirmed', value)
     end
 
-    def pickup_map_place=(value)
-      set_public_metadata_object('pickup_map_place', value)
+    def drop_off_oob_confirmed=(value)
+      set_private_metadata_value('drop_off_oob_confirmed', value)
     end
 
-    def dropoff_map_place=(value)
-      set_public_metadata_object('dropoff_map_place', value)
+    def pickup_place_name=(value)
+      set_public_metadata_value('pickup_place_name', value)
     end
 
-    def distance=(value)
-      set_public_metadata_object('distance', value)
+    def drop_off_place_name=(value)
+      set_public_metadata_value('drop_off_place_name', value)
     end
 
-    def direction=(value)
-      set_private_metadata_value('direction', value)
+    def pickup_lat=(value)
+      set_public_metadata_value('pickup_lat', value)
     end
 
-    def trip_id=(value)
-      set_private_metadata_value('trip_id', value)
+    def pickup_lng=(value)
+      set_public_metadata_value('pickup_lng', value)
     end
 
-    def boarding_trip_stop_id=(value)
-      set_private_metadata_value('boarding_trip_stop_id', value)
+    def drop_off_lat=(value)
+      set_public_metadata_value('drop_off_lat', value)
     end
 
-    def drop_off_trip_stop_id=(value)
-      set_private_metadata_value('drop_off_trip_stop_id', value)
+    def drop_off_lng=(value)
+      set_public_metadata_value('drop_off_lng', value)
     end
 
     def passenger_count=(value)
       set_public_metadata_value('passenger_count', value)
     end
 
-    private
+    def distance_km=(value)
+      set_public_metadata_value('distance_km', value)
+    end
 
-    def set_public_metadata_object(key, value)
-      if value.nil?
-        public_metadata.delete(key)
-      else
-        public_metadata[key] = value.to_h.stringify_keys
-      end
+    def ordered_points=(value)
+      set_public_metadata_value('ordered_points', value)
+    end
+
+    def base_km=(value)
+      set_public_metadata_value('base_km', value)
+    end
+
+    def detour_pickup_km=(value)
+      set_public_metadata_value('detour_pickup_km', value)
+    end
+
+    def detour_dropoff_km=(value)
+      set_public_metadata_value('detour_dropoff_km', value)
+    end
+
+    def extra_pickup_km=(value)
+      set_public_metadata_value('extra_pickup_km', value)
+    end
+
+    def extra_dropoff_km=(value)
+      set_public_metadata_value('extra_dropoff_km', value)
     end
 
+    def extra_pickup_charge_usd=(value)
+      set_public_metadata_value('extra_pickup_charge_usd', value)
+    end
+
+    def extra_dropoff_charge_usd=(value)
+      set_public_metadata_value('extra_dropoff_charge_usd', value)
+    end
+
+    def estimated_time_minutes=(value)
+      set_public_metadata_value('estimated_time_minutes', value)
+    end
+
+    private
+
     def set_public_metadata_value(key, value)
       if value.nil?
         public_metadata.delete(key)

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?(:formatted_url)
+        return default_link unless tenant.respond_to?(:url)
 
-        site = tenant.formatted_url.to_s.strip
+        site = tenant.url.to_s.strip
         site.presence || default_link
       rescue StandardError
         default_link

data/app/models/spree_cm_commissioner/adjustment_decorator.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module AdjustmentDecorator
     def self.prepended(base)
       base.belongs_to :payable, polymorphic: true, optional: true
-      base.scope :pricing_action, -> { where(source_type: 'SpreeCmCommissioner::PricingAction') }
+
       base.whitelisted_ransackable_attributes |= %w[payable_id]
     end
 

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -243,7 +243,7 @@ module SpreeCmCommissioner
 
     # override spree_vpago method
     def payment_host
-      tenant&.formatted_url.presence || ENV.fetch('DEFAULT_URL_HOST')
+      tenant&.host.presence || ENV.fetch('DEFAULT_URL_HOST')
     end
 
     private

data/app/models/spree_cm_commissioner/place.rb

@@ -21,13 +21,6 @@ module SpreeCmCommissioner
     has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
     has_many :taxons, through: :taxon_places
 
-    has_many :routes_as_origin, class_name: 'SpreeCmCommissioner::Route', foreign_key: :origin_place_id
-    has_many :routes_as_destination, class_name: 'SpreeCmCommissioner::Route', foreign_key: :destination_place_id
-
-    # Scopes for route-based filtering
-    scope :with_routes_as_origin, -> { joins(:routes_as_origin).distinct }
-    scope :with_routes_as_destination, -> { joins(:routes_as_destination).distinct }
-
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]
     end

data/app/models/spree_cm_commissioner/tenant.rb

@@ -26,10 +26,6 @@ module SpreeCmCommissioner
     end
 
     def url
-      host
-    end
-
-    def formatted_url
       return if host.blank?
 
       Rails.env.development? || Rails.env.test? ? "http://#{host}" : "https://#{host}"

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -30,9 +30,6 @@ module SpreeCmCommissioner
 
       base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
 
-      base.has_many :pricing_model_variants, class_name: 'SpreeCmCommissioner::PricingModelVariant', dependent: :destroy
-      base.has_many :pricing_models, through: :pricing_model_variants, class_name: 'SpreeCmCommissioner::PricingModel'
-
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
       base.scope :with_permanent_stock, -> { where(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
       base.scope :with_non_permanent_stock, -> { where.not(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -91,7 +91,6 @@ module SpreeCmCommissioner
       base.has_many :trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop'
       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.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -3,7 +3,6 @@ module SpreeCmCommissioner
     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
@@ -17,8 +16,6 @@ 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
@@ -31,11 +28,5 @@ 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/queries/spree_cm_commissioner/trip_query.rb

@@ -1,13 +1,12 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date, :vendor_id, :tenant_id, :number_of_guests, :route_type, :params
+    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :route_type, :params
 
-    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
+    def initialize(origin_id:, destination_id:, date:, route_type: nil, vendor_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
@@ -37,9 +36,8 @@ module SpreeCmCommissioner
 
     def direct_trips
       result = trip_scope
-      result = result.where({ vendor_id: vendor_id }.compact) if vendor_id.present?
+      result = result.where({ vendor_id: vendor_id }.compact)
       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
 
@@ -58,24 +56,20 @@ 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
+      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

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

@@ -4,9 +4,8 @@ module Spree
       class PlaceSerializer < BaseSerializer
         set_type :place
 
-        # Included by default, pass false to exclude
-        has_many :vendors, if: proc { |_, params| params.nil? || params[:include_vendors] != false }
-        has_many :nearby_places, serializer: :nearby_place, if: proc { |_, params| params.nil? || params[:include_nearby_places] != false }
+        has_many :vendors
+        has_many :nearby_places, serializer: :nearby_place
 
         attributes :reference, :name, :vicinity, :lat, :lon, :icon, :url, :rating,
                    :formatted_phone_number, :formatted_address, :address_components, :types

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

@@ -20,7 +20,6 @@ module Spree
         has_many :promotions, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids,
                               serializer: Spree::V2::Storefront::PromotionSerializer
 
-        has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
         has_many :variants, serializer: Spree::V2::Tenant::VariantSerializer
         has_many :products, serializer: Spree::V2::Tenant::ProductSerializer
         has_many :line_items, serializer: Spree::V2::Tenant::LineItemSerializer

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

@@ -20,7 +20,6 @@ module Spree
 
         has_one :vendor, serializer: Spree::V2::Tenant::VendorSerializer
         has_one :product, serializer: Spree::V2::Storefront::ProductSerializer
-        has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
 
         belongs_to :variant, serializer: Spree::V2::Tenant::VariantSerializer
         belongs_to :order, serializer: Spree::V2::Tenant::OrderSerializer

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

@@ -2,28 +2,29 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class IntercityTaxiLineItemSerializer < BaseSerializer
-        # Nested-only API shape
-        attributes :pickup_map_place,
-                   :dropoff_map_place,
-                   :distance,
+        attributes :pickup_place_name,
+                   :drop_off_place_name,
+                   :pickup_lat,
+                   :pickup_lng,
+                   :drop_off_lat,
+                   :drop_off_lng,
+                   :passenger_count,
+                   :distance_km,
+                   :ordered_points,
+                   :base_km,
+                   :detour_pickup_km,
+                   :detour_dropoff_km,
+                   :extra_pickup_km,
+                   :extra_dropoff_km,
+                   :extra_pickup_charge_usd,
+                   :extra_dropoff_charge_usd,
+                   :estimated_time_minutes,
                    :from_date,
                    :to_date,
-                   :remark,
+                   :direction,
                    :trip_id
 
         cache_options store: nil
-
-        def pickup_map_place
-          object.pickup_map_place&.to_h
-        end
-
-        def dropoff_map_place
-          object.dropoff_map_place&.to_h
-        end
-
-        def distance
-          object.distance&.to_h
-        end
       end
     end
   end