spree_cm_commissioner 2.5.0.pre.pre13 → 2.5.0.pre.pre15

data/db/migrate/20260106093359_add_contact_phone_to_cm_vendor_places.rb

@@ -0,0 +1,5 @@
+class AddContactPhoneToCmVendorPlaces < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_vendor_places, :contact_phone, :string, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/distance.rb

@@ -0,0 +1,88 @@
+module SpreeCmCommissioner
+  # Generic value object representing a computed trip distance and detours.
+  # This is the canonical class used by distance calculation services
+  # and line item metadata (see LineItemTransitable concern).
+  class Distance
+    attr_accessor :id,
+                  :distance_km,
+                  :ordered_points,
+                  :estimated_time_minutes,
+                  :base_km,
+                  :detour_pickup_km,
+                  :detour_dropoff_km,
+                  :extra_pickup_km,
+                  :extra_dropoff_km
+
+    def initialize(options = {})
+      options = options.stringify_keys if options.is_a?(Hash)
+
+      @id = SecureRandom.hex
+      @distance_km = options['distance_km']&.to_f
+      @ordered_points = options['ordered_points']
+      @estimated_time_minutes = options['estimated_time_minutes']&.to_i
+      @base_km = options['base_km']&.to_f
+      @detour_pickup_km = options['detour_pickup_km']&.to_f
+      @detour_dropoff_km = options['detour_dropoff_km']&.to_f
+      @extra_pickup_km = options['extra_pickup_km']&.to_f
+      @extra_dropoff_km = options['extra_dropoff_km']&.to_f
+    end
+
+    def self.from_hash(hash)
+      new(hash || {})
+    end
+
+    # Build a Distance from a signed hash (used for request-time verification).
+    def self.from_signed_hash(hash)
+      return nil unless valid_signature?(hash)
+
+      new(hash || {})
+    end
+
+    def self.valid_signature?(signed_hash)
+      return false if signed_hash.nil?
+
+      verify_result = SpreeCmCommissioner::Signing::VerifySignature.call(
+        signed_hash: signed_hash,
+        signing_key: ENV.fetch('DISTANCE_SIGNING_KEY')
+      )
+
+      verify_result.success? && verify_result.value == true
+    end
+
+    def to_h
+      {
+        'distance_km' => @distance_km,
+        'ordered_points' => @ordered_points,
+        'estimated_time_minutes' => @estimated_time_minutes,
+        'base_km' => @base_km,
+        'detour_pickup_km' => @detour_pickup_km,
+        'detour_dropoff_km' => @detour_dropoff_km,
+        'extra_pickup_km' => @extra_pickup_km,
+        'extra_dropoff_km' => @extra_dropoff_km
+      }.compact
+    end
+
+    def to_signed_h
+      hash = {
+        'distance_km' => @distance_km,
+        'ordered_points' => @ordered_points,
+        'estimated_time_minutes' => @estimated_time_minutes,
+        'base_km' => @base_km,
+        'detour_pickup_km' => @detour_pickup_km,
+        'detour_dropoff_km' => @detour_dropoff_km,
+        'extra_pickup_km' => @extra_pickup_km,
+        'extra_dropoff_km' => @extra_dropoff_km,
+        'signed_at' => Time.current.utc.iso8601
+      }.compact
+
+      sign_result = SpreeCmCommissioner::Signing::SignData.call(
+        hash: hash,
+        signing_key: ENV.fetch('DISTANCE_SIGNING_KEY')
+      )
+
+      return hash unless sign_result.success?
+
+      hash.merge('signature' => sign_result.value)
+    end
+  end
+end

data/lib/spree_cm_commissioner/engine.rb

@@ -38,6 +38,9 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::Promotion::Actions::CreateDateSpecificItemAdjustments,
         SpreeCmCommissioner::Promotion::Actions::CreateGuestItemAdjustments,
       ]
+
+      # Register PricingAction adjuster to include pricing_action adjustments in totals
+      Rails.application.config.spree.adjusters << SpreeCmCommissioner::Adjustable::Adjuster::PricingAction
     end
 
     config.to_prepare(&method(:activate).to_proc)

data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   # use cm_guest instead for consistency
   factory :guest, class: SpreeCmCommissioner::Guest do
-    line_item { |a| a.association(:line_item) }
+    line_item { |a| a.association(:cm_line_item) }
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     gender { 1 }
@@ -10,7 +10,7 @@ FactoryBot.define do
   end
 
   factory :cm_guest, class: SpreeCmCommissioner::Guest do
-    line_item { |a| a.association(:line_item) }
+    line_item { |a| a.association(:cm_line_item) }
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     gender { 1 }

data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb

@@ -7,13 +7,13 @@ FactoryBot.define do
 
     product do
       if order&.store&.present?
-        create(:cm_product_with_product_kind_option_types, stores: [order.store])
+        create(:cm_product, stores: [order.store])
       else
-        create(:cm_product_with_product_kind_option_types)
+        create(:cm_product)
       end
     end
 
-    variant { product.master }
+    variant { create(:cm_variant, product: product, track_inventory: false) }
 
     factory :cm_need_confirmation_line_item do
       product { create(:cm_product, need_confirmation: true) }

data/lib/spree_cm_commissioner/test_helper/factories/pricing_model_variant_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cm_pricing_model_variant, class: 'SpreeCmCommissioner::PricingModelVariant' do
+    association :pricing_model, factory: :cm_pricing_model
+    association :variant, factory: :cm_variant
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
-    association :layoutable, factory: :cm_vehicle
+    association :layoutable, factory: :cm_vehicle_type
 
     name { "Layout #{rand(1.0..50.0)}" }
     status { :active }

data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb

@@ -7,6 +7,7 @@ FactoryBot.define do
     product { create(:cm_product, product_type: :transit) }
 
     association :vendor, factory: :cm_transit_vendor
+    association :vehicle_type, factory: :cm_vehicle_type
     association :vehicle, factory: :cm_vehicle
     association :origin_place, factory: :cm_place
     association :destination_place, factory: :cm_place

data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb

@@ -1,6 +1,9 @@
 FactoryBot.define do
   factory :cm_vehicle, class: SpreeCmCommissioner::Vehicle do
-    sequence(:code) { |n| "vehicle_#{n}" }
+    sequence(:name) { |n| "vehicle_#{n}" }
     sequence(:license_plate) { |n| "2KH-#{'%04d' % (n % 10000)}" }
+    kind { :air_bus }
+    association :vendor, factory: :vendor
+    association :vehicle_type, factory: :cm_vehicle_type
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_vehicle_type, class: SpreeCmCommissioner::VehicleType do
+    sequence(:name) { |n| "vehicle_type_#{n}" }
+    kind { :air_bus }
+    association :vendor, factory: :vendor
+  end
+end

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -58,7 +58,7 @@ module SpreeCmCommissioner
     end
 
     def vehicle_types
-      @trips.map(&:vehicle).map(&:vehicle_type).uniq
+      @trips.map(&:vehicle_type).uniq
     end
   end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class TripResult
     attr_accessor :id, :origin_place, :destination_place, :allow_seat_selection,
                   :departure_time, :duration, :route_type,
-                  :vehicle_id, :vehicle, :vendor_id, :vendor,
+                  :vehicle_type_id, :vehicle_type, :vendor_id, :vendor,
                   :quantity_available, :max_capacity, :boarding, :drop_off,
                   :product_id, :amenities, :price, :compare_at_amount, :currency, :distance
 
@@ -37,6 +37,12 @@ module SpreeCmCommissioner
       departure_time + duration.seconds
     end
 
+    def display_price
+      return nil if price.nil? || currency.nil?
+
+      Spree::Money.new(price, currency: currency).to_s
+    end
+
     # Enable serializer-level caching (like ActiveRecord's cache_key_with_version)
     # Create a version hash based on attributes that matter for caching
     def cache_key_with_version

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.0.pre.pre13'.freeze
+  VERSION = '2.5.0.pre.pre15'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -24,7 +24,7 @@ require 'spree_cm_commissioner/cached_inventory_item'
 require 'spree_cm_commissioner/transit/leg'
 require 'spree_cm_commissioner/transit/seat_selection'
 require 'spree_cm_commissioner/intercity_taxi/map_place'
-require 'spree_cm_commissioner/intercity_taxi/distance'
+require 'spree_cm_commissioner/distance'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre.pre13
+  version: 2.5.0.pre.pre15
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -731,6 +731,8 @@ files:
 - app/assets/images/mailer/bookme-plus.png
 - app/assets/images/mailer/bookme-plus_light.svg
 - app/assets/images/mailer/calendar.png
+- app/assets/images/mailer/call.png
+- app/assets/images/mailer/email.png
 - app/assets/images/mailer/envelope.png
 - app/assets/images/mailer/event-mailer-bg.png
 - app/assets/images/mailer/facebook.png
@@ -742,6 +744,7 @@ files:
 - app/assets/images/mailer/tenant_phone.png
 - app/assets/images/mailer/tenant_user.png
 - app/assets/images/mailer/twitter.png
+- app/assets/images/mailer/user-tenant.png
 - app/assets/images/mailer/user.png
 - app/assets/images/payment_methods/cm-payment-affirm.svg
 - app/assets/images/payment_methods/cm-payment-alipay.svg
@@ -957,6 +960,7 @@ files:
 - app/controllers/spree/api/v2/storefront/homepage_data_controller.rb
 - app/controllers/spree/api/v2/storefront/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/storefront/id_cards_controller.rb
+- app/controllers/spree/api/v2/storefront/intercity_taxi/distance_calculator_controller.rb
 - app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/inventory_items_controller.rb
 - app/controllers/spree/api/v2/storefront/line_item_qrs_controller.rb
@@ -1020,6 +1024,7 @@ files:
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
+- app/controllers/spree/api/v2/tenant/intercity_taxi/distance_calculator_controller.rb
 - app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
@@ -1270,7 +1275,6 @@ files:
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
 - app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb
 - app/interactors/spree_cm_commissioner/trip_clone_creator.rb
-- app/interactors/spree_cm_commissioner/trip_distance_calculator.rb
 - app/interactors/spree_cm_commissioner/trip_stops_creator.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
@@ -1293,7 +1297,7 @@ files:
 - app/interactors/spree_cm_commissioner/user_vendor_assigner.rb
 - app/interactors/spree_cm_commissioner/variant_block_updater.rb
 - app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb
-- app/interactors/spree_cm_commissioner/vehicle_updater.rb
+- app/interactors/spree_cm_commissioner/vehicle_type_updater.rb
 - app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb
 - app/interactors/spree_cm_commissioner/vendor_nearby_place_builder.rb
 - app/interactors/spree_cm_commissioner/vendor_updater.rb
@@ -1379,6 +1383,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/line_item_durationable.rb
 - app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb
 - app/models/concerns/spree_cm_commissioner/line_item_integration.rb
+- app/models/concerns/spree_cm_commissioner/line_item_seat_selection.rb
 - app/models/concerns/spree_cm_commissioner/line_item_transitable.rb
 - app/models/concerns/spree_cm_commissioner/line_items_filter_scope.rb
 - app/models/concerns/spree_cm_commissioner/metafield.rb
@@ -1408,7 +1413,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/user_notification.rb
 - app/models/concerns/spree_cm_commissioner/user_preference.rb
 - app/models/concerns/spree_cm_commissioner/variant_options_concern.rb
-- app/models/concerns/spree_cm_commissioner/vehicle_type.rb
+- app/models/concerns/spree_cm_commissioner/vehicle_kind.rb
 - app/models/concerns/spree_cm_commissioner/vendor_preference.rb
 - app/models/concerns/spree_cm_commissioner/vendor_promotable.rb
 - app/models/concerns/spree_cm_commissioner/video_on_demand_bitwise.rb
@@ -1416,6 +1421,7 @@ files:
 - app/models/spree_cm_commissioner.rb
 - app/models/spree_cm_commissioner/ability_decorator.rb
 - app/models/spree_cm_commissioner/address_decorator.rb
+- app/models/spree_cm_commissioner/adjustable/adjuster/pricing_action.rb
 - app/models/spree_cm_commissioner/adjustment_decorator.rb
 - app/models/spree_cm_commissioner/asset.rb
 - app/models/spree_cm_commissioner/back_image.rb
@@ -1493,7 +1499,7 @@ files:
 - app/models/spree_cm_commissioner/oauth_application_decorator.rb
 - app/models/spree_cm_commissioner/option_type_decorator.rb
 - app/models/spree_cm_commissioner/option_value_decorator.rb
-- app/models/spree_cm_commissioner/option_value_vehicle.rb
+- app/models/spree_cm_commissioner/option_value_vehicle_type.rb
 - app/models/spree_cm_commissioner/option_value_vendor.rb
 - app/models/spree_cm_commissioner/order/address_book_decorator.rb
 - app/models/spree_cm_commissioner/order_decorator.rb
@@ -1605,8 +1611,9 @@ files:
 - app/models/spree_cm_commissioner/variant_options.rb
 - app/models/spree_cm_commissioner/vector_icon.rb
 - app/models/spree_cm_commissioner/vehicle.rb
-- app/models/spree_cm_commissioner/vehicle_option_type.rb
 - app/models/spree_cm_commissioner/vehicle_photo.rb
+- app/models/spree_cm_commissioner/vehicle_type.rb
+- app/models/spree_cm_commissioner/vehicle_type_option_type.rb
 - app/models/spree_cm_commissioner/vendor_app_promotion_banner.rb
 - app/models/spree_cm_commissioner/vendor_decorator.rb
 - app/models/spree_cm_commissioner/vendor_logo.rb
@@ -1922,6 +1929,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/calculator_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/category_taxon_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/check_in_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/distance_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/event_option_value_serializer.rb
@@ -1961,7 +1969,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_stop_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_variant_serializer.rb
-- app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_type_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_vendor_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/user_contact_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/user_identity_provider_serializer.rb
@@ -1973,6 +1981,8 @@ files:
 - app/services/sms_adapter/plasgate.rb
 - app/services/sms_adapter/twillio.rb
 - app/services/spree_cm_commissioner/aes_encryption_service.rb
+- app/services/spree_cm_commissioner/api_caches/invalidate.rb
+- app/services/spree_cm_commissioner/calculate_distance.rb
 - app/services/spree_cm_commissioner/cart/add_guest.rb
 - app/services/spree_cm_commissioner/cart/destroy_decorator.rb
 - app/services/spree_cm_commissioner/cart/recalculate_decorator.rb
@@ -1999,6 +2009,7 @@ files:
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_creator.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_updater.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_object_builder.rb
+- app/services/spree_cm_commissioner/guests/claim_invite_guest_service.rb
 - app/services/spree_cm_commissioner/homepage_data_loader.rb
 - app/services/spree_cm_commissioner/imports/base_import_order_service.rb
 - app/services/spree_cm_commissioner/imports/create_order_service.rb
@@ -2021,8 +2032,10 @@ files:
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/full_sync_strategy.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/incremental_sync_strategy.rb
 - app/services/spree_cm_commissioner/integrations/stadium_x_v1/sync_strategies/webhook_sync_strategy.rb
+- app/services/spree_cm_commissioner/intercity_taxi_order/calculate_distance.rb
 - app/services/spree_cm_commissioner/intercity_taxi_order/create.rb
 - app/services/spree_cm_commissioner/intercity_taxi_order/update.rb
+- app/services/spree_cm_commissioner/line_items/apply_pricing_models.rb
 - app/services/spree_cm_commissioner/metafields/product_metadata_service.rb
 - app/services/spree_cm_commissioner/order_params_checker.rb
 - app/services/spree_cm_commissioner/orders/bulk_archive_inactive_orders.rb
@@ -2049,9 +2062,13 @@ files:
 - app/services/spree_cm_commissioner/seats/bulk_release_on_hold_blocks.rb
 - app/services/spree_cm_commissioner/seats/release_expired_blocks.rb
 - app/services/spree_cm_commissioner/seeds/roles_decorator.rb
+- app/services/spree_cm_commissioner/signing/sign_data.rb
+- app/services/spree_cm_commissioner/signing/verify_signature.rb
 - app/services/spree_cm_commissioner/telegram_alerts/integration_sync_failure.rb
+- app/services/spree_cm_commissioner/transit/export_order.rb
 - app/services/spree_cm_commissioner/transit/legs_builder_service.rb
 - app/services/spree_cm_commissioner/trips/search.rb
+- app/services/spree_cm_commissioner/update_guest_service.rb
 - app/services/spree_cm_commissioner/user_authenticator.rb
 - app/services/spree_cm_commissioner/user_roles_assigner.rb
 - app/services/spree_cm_commissioner/users/incomplete_guest_checker_service.rb
@@ -2410,6 +2427,7 @@ files:
 - app/views/spree/layouts/event.html.erb
 - app/views/spree/layouts/transit.html.erb
 - app/views/spree/order_mailer/_adjustment.html.erb
+- app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/ticket_email.html.erb
 - app/views/spree/order_mailer/ticket_email.text.erb
@@ -2488,6 +2506,13 @@ files:
 - app/views/spree/transit/vendors/_form.html.erb
 - app/views/spree/transit/vendors/_tabs.html.erb
 - app/views/spree/transit/vendors/edit.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/_cancel_email.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/_footer.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/_header.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/_mailer_stylesheets.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_cancel_email.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_footer.html.erb
+- app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_header.html.erb
 - app/views/spree_cm_commissioner/crew_invite_mailer/_mailer_stylesheets.html.erb
 - app/views/spree_cm_commissioner/crew_invite_mailer/send_crew_invite_email.html.erb
 - app/views/spree_cm_commissioner/event_transactional_mailer/_event_banner.html.erb
@@ -2501,6 +2526,7 @@ files:
 - app/views/spree_cm_commissioner/guest_mailer/_mailer_stylesheets.html.erb
 - app/views/spree_cm_commissioner/guest_mailer/_terms_and_conditions.html.erb
 - app/views/spree_cm_commissioner/guest_mailer/send_ticket_to_guest.html.erb
+- app/views/spree_cm_commissioner/layouts/cancel_order_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/crew_invite_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/event_transactional_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/guest_mailer.html.erb
@@ -2950,7 +2976,11 @@ files:
 - db/migrate/20251017101605_create_cm_integration_mappings.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
 - db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
+- db/migrate/20251127074809_change_guest_dynamic_fields_value_from_jsonb_to_text.rb
 - db/migrate/20251209022924_add_contact_fields_to_cm_tenants.rb
+- db/migrate/20251219035243_add_migrations_to_support_vehicle_types.rb
+- db/migrate/20260105072146_add_nationality_group_and_age_group_to_cm_saved_guests.rb
+- db/migrate/20260106093359_add_contact_phone_to_cm_vendor_places.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -2973,9 +3003,9 @@ files:
 - lib/spree_cm_commissioner.rb
 - lib/spree_cm_commissioner/cached_inventory_item.rb
 - lib/spree_cm_commissioner/calendar_event.rb
+- lib/spree_cm_commissioner/distance.rb
 - lib/spree_cm_commissioner/engine.rb
 - lib/spree_cm_commissioner/factories.rb
-- lib/spree_cm_commissioner/intercity_taxi/distance.rb
 - lib/spree_cm_commissioner/intercity_taxi/map_place.rb
 - lib/spree_cm_commissioner/jwt_token.rb
 - lib/spree_cm_commissioner/line_item_jwt_token.rb
@@ -3030,6 +3060,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/place_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_action_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_model_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/pricing_model_variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/pricing_rule_group_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/product_completion_step_banner_factory.rb
@@ -3066,11 +3097,11 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/user_identity_provider_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_logo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_photo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/vendor_route_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/video_on_demand_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_rule_factory.rb

data/app/interactors/spree_cm_commissioner/trip_distance_calculator.rb

@@ -1,165 +0,0 @@
-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