spree_cm_commissioner 2.5.0.pre.pre13 → 2.5.0.pre.pre14

data/app/views/spree_cm_commissioner/cancel_order_mailer/purchased_items/_summary.html.erb

@@ -0,0 +1,108 @@
+<table class="purchase purchase-summary">
+  <tr>
+    <td valign="middle" colspan="2">
+      <p class="f-fallback purchase_total purchase_total--label">
+        <%= Spree.t('order_mailer.subtotal') %>
+      </p>
+    </td>
+    <td valign="middle">
+      <p class="f-fallback purchase_total align-right">
+        <%= order.display_item_total %>
+      </p>
+    </td>
+  </tr>
+  <% if order.line_item_adjustments.exists? %>
+    <% if order.all_adjustments.promotion.eligible.exists? %>
+      <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr class="purchase-summary-item">
+          <td class="purchase_footer" valign="middle">
+            <p class="f-fallback purchase_total purchase_total--label">
+              <%= Spree.t(:promotion) %>
+            </p>
+          </td>
+          <td class="purchase_footer" valign="middle">
+            <p class="f-fallback purchase_total--name purchase_total--label">
+              <%= label %>
+            </p>
+          </td>
+          <td class="purchase_footer" valign="middle">
+            <p class="f-fallback purchase_total align-right">
+              <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+            </p>
+          </td>
+        </tr>
+      <% end %>
+    <% end %>
+  <% end %>
+  <% order.shipments.group_by { |s| s.selected_shipping_rate&.name }.each do |name, shipments| %>
+    <tr class="purchase-summary-item">
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= Spree.t(:shipping) %>
+        </p>
+      </td>
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total--name purchase_total--label">
+          <%= name %>
+        </p>
+      </td>
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total align-right">
+          <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: order.currency) %>
+        </p>
+      </td>
+    </tr>
+  <%end%>
+  <% if order.additional_tax_total != 0 %>
+    <tr class="purchase-summary-item">
+      <td class="purchase_footer" valign="middle" colspan="2">
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= Spree.t(:tax) %>
+        </p>
+      </td>
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total align-right">
+          <%= order.display_additional_tax_total.to_html %>
+        </p>
+      </td>
+    </tr>
+  <% end %>
+
+  <% order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
+    <tr>
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total purchase_total--label">
+          <%= Spree.t(:adjustments) %>
+        </p>
+      </td>
+      <td class="purchase_footer" valign="middle">
+        <p class="f-fallback purchase_total--name purchase_total--label">
+          <%= raw(adjustment.label) %>:
+        </p>
+      </td>
+      <td class="purchase_total-col align-right">
+        <p class="f-fallback purchase_total">
+          <%= Spree::Money.new(adjustment.amount, currency: order.currency) %>
+        </p>
+      </td>
+    </tr>
+  <% end %>
+  <tr>
+    <td class="purchase_footer" colspan="2">
+      <p class="f-fallback purchase_total purchase_total--label">
+        <strong><%= I18n.t('mail.order_mailer.etotal') %></strong> (<%= I18n.t('mail.order_mailer.including_vat') %>)
+      </p>
+    </td>
+    <td class="purchase_total-col align-right">
+        <p class="f-fallback purchase_total">
+          <strong><%= order.display_total %></strong>
+        </p>
+    </td>
+  </tr>
+  <tr>
+      <td colspan="4">
+          <hr style="border-top-width: 1px; border-top-color: #E5E7EB; height: 0; margin: 1.5rem 0 0; border-style: solid none none;" />
+      </td>
+  </tr>
+</table>

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_cancel_email.html.erb

@@ -0,0 +1,12 @@
+<div class="cancel-greeting">
+  <h1>
+    <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order))%>
+  </h1>
+  <p class="description">
+    <%= I18n.t('mail.order_mailer.cancel_description') %>
+  </p>
+  <b>
+    <%= I18n.t('mail.order_mailer.order_cancelled', order_number: order.number || 'NA') %>
+  </b>
+  <div style="border-bottom: 1px solid #E5E7EB; margin-top: 1.5rem;">
+</div>

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_footer.html.erb

@@ -0,0 +1,8 @@
+<div class="footer">
+  <p>
+    <%= I18n.t('mail.order_mailer.cancel_thank') %>
+  </p>
+  <p class="team">
+    <%= I18n.t('mail.order_mailer.from_team', store: name) %>
+  </p>
+</div>  

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_header.html.erb

@@ -0,0 +1,15 @@
+<div class="header-tenant">
+  <table width="100%" cellpadding="0" cellspacing="0">
+    <tr>
+      <td class="tenant-name">
+        <%= name %>
+      </td>
+
+      <% if logo.present? %>
+        <td class="logo-tenant" align="right">
+          <img src="<%= logo %>">
+        </td>
+      <% end %>
+    </tr>
+  </table>
+</div>

data/app/views/spree_cm_commissioner/layouts/cancel_order_mailer.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="x-apple-disable-message-reformatting"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <%= render partial: 'spree_cm_commissioner/cancel_order_mailer/mailer_stylesheets' %>
+  </head>
+   <body>
+    <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%">
+      <%= yield %>
+    </table>    
+  </body>
+</html>

data/config/locales/en.yml

@@ -119,6 +119,17 @@ en:
     product_kind_option_types:
       empty_info: "<b>Note:</b> Set service option types to service first. To edit, go to <b>Details</b> tab > <b>Option Types</b>"
 
+  vehicle_type:
+    suv: "SUV"
+    sedan: "Sedan"
+    van: "Van"
+    minivan: "Minivan"
+    sleeping_bus: "Sleeping Bus"
+    luxury_van: "Luxury Van"
+    air_bus: "Air Bus"
+    bus: "Bus"
+    ferry: "Ferry"
+
   line_item:
     validation:
       exceeded_max_quantity_per_order: "Exceeded maximum quantity per order"
@@ -528,6 +539,10 @@ en:
       hello: "Hello %{full_name},"
       thanks: "Thanks %{full_name},"
       booking_event: "Your booking for %{order_number} is successfully complete!"
+      cancel_description: "Your order has been CANCELED. Please retain this cancellation information for your records."
+      order_cancelled: "Order %{order_number} Summary [CANCELED]"
+      cancel_thank: "Thank you for your business."
+      from_team: "The %{store} Team"
       booking_reference: "For reference, your booking ID is %{order_number}."
       booking_id: "Booking ID <b>%{order_number}</b>"
       booking_summary: "Booking Summary"

data/config/locales/km.yml

@@ -113,6 +113,17 @@ km:
     product_kind_option_types:
       empty_info: "<b>ចំណាំ:</b> កំណត់ប្រភេទសម្រាប់ផលិតផល. ដើម្បីកែប្រែ, សូមចូលទៅ <b>លម្អិត</b> tab > <b>ប្រភេទ</b>"
 
+  vehicle_type:
+    suv: "SUV"
+    sedan: "Sedan"
+    van: "Van"
+    minivan: "Minivan"
+    sleeping_bus: "Sleeping Bus"
+    luxury_van: "Luxury Van"
+    air_bus: "Air Bus"
+    bus: "Bus"
+    ferry: "Ferry"
+
   line_item:
     validation:
       exceeded_max_quantity_per_order: "លើសពីបរិមាណអតិបរមាក្នុងមួយការបញ្ជាទិញ"
@@ -190,6 +201,16 @@ km:
       system_registered: "ចុះឈ្មោះដោយប្រព័ន្ធ"
       self_registered: "ចុះឈ្មោះដោយខ្លួនឯង"
     registration_source: "ប្រភេទការចុះឈ្មោះ"
+    vehicle_kind:
+      suv: "SUV"
+      sedan: "Sedan"
+      van: "Van"
+      minivan: "Minivan"
+      sleeping_bus: "Sleeping Bus"
+      luxury_van: "Luxury Van"
+      air_bus: "Air Bus"
+      bus: "Bus"
+      ferry: "Ferry"
     service_types:
       organizer: "Organizer"
       transit: "Transit"
@@ -388,9 +409,13 @@ km:
       booking_confirm: "Confirmed!"
       hello: "Hello %{full_name},"
       thanks: "Thanks %{full_name},"
-      booking_event: "Your booking for %{order_name} is successfully complete!"
+      booking_event: "Your booking for %{order_number} is successfully complete!"
+      cancel_description: "Your order has been CANCELED. Please retain this cancellation information for your records."
+      order_cancelled: "Order %{order_number} Summary [CANCELED]"
+      cancel_thank: "Thank you for your business."
+      from_team: "The %{store} Team"
       booking_reference: "For reference, your booking ID is %{order_number}."
-      booking_id: "Booking ID <b>%{order_number}<b>"
+      booking_id: "Booking ID <b>%{order_number}</b>"
       booking_summary: "Booking Summary"
       check_in: "Check in:"
       check_out: "Check out:"

data/config/routes.rb

@@ -563,6 +563,7 @@ Spree::Core::Engine.add_routes do
 
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]
+          resource :distance_calculator, controller: :distance_calculator, only: [:create]
         end
 
         resource :reset_passwords, only: [:update]
@@ -708,6 +709,7 @@ Spree::Core::Engine.add_routes do
         end
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]
+          resource :distance_calculator, controller: :distance_calculator, only: [:create]
         end
       end
 

data/db/migrate/20251127074809_change_guest_dynamic_fields_value_from_jsonb_to_text.rb

@@ -0,0 +1,40 @@
+class ChangeGuestDynamicFieldsValueFromJsonbToText < ActiveRecord::Migration[7.0]
+  def up
+    # Check if the migration has already been run
+    return if column_exists?(:cm_guest_dynamic_fields, :value, :text)
+
+    add_column :cm_guest_dynamic_fields, :value_text, :text
+
+    # Convert JSONB value to TEXT value
+    execute <<-SQL
+      UPDATE cm_guest_dynamic_fields
+      SET value_text = value ->> 0
+    SQL
+
+    remove_column :cm_guest_dynamic_fields, :value
+    rename_column :cm_guest_dynamic_fields, :value_text, :value
+
+    # Restore NOT NULL and default value constraints
+    #To make it the same as the original: t.jsonb :value, default: [], null: false
+    change_column_default :cm_guest_dynamic_fields, :value, ''
+    change_column_null :cm_guest_dynamic_fields, :value, false
+  end
+
+  def down
+    add_column :cm_guest_dynamic_fields, :value_jsonb, :jsonb
+
+    # Convert TEXT value to JSONB value
+    execute <<-SQL
+      UPDATE cm_guest_dynamic_fields
+      SET value_jsonb = to_jsonb(value)
+    SQL
+
+    remove_column :cm_guest_dynamic_fields, :value
+    rename_column :cm_guest_dynamic_fields, :value_jsonb, :value
+
+    # Restore NOT NULL and default value constraints
+    #To make it the same as the original: t.jsonb :value, default: [], null: false
+    change_column_default :cm_guest_dynamic_fields, :value, []
+    change_column_null :cm_guest_dynamic_fields, :value, false
+  end
+end

data/db/migrate/20251219035243_add_migrations_to_support_vehicle_types.rb

@@ -0,0 +1,36 @@
+class AddMigrationsToSupportVehicleTypes < ActiveRecord::Migration[7.0]
+  def change
+    # 1. rename amentity table from vehicle to vehicle type
+    rename_table :cm_vehicle_option_types, :cm_vehicle_type_option_types if table_exists?(:cm_vehicle_option_types)
+    rename_table :cm_option_value_vehicles, :cm_option_value_vehicle_types if table_exists?(:cm_option_value_vehicles)
+    rename_table :cm_vehicles, :cm_vehicle_types if table_exists?(:cm_vehicles) && !table_exists?(:cm_vehicle_types)
+
+    rename_column :cm_vehicle_type_option_types, :vehicle_id, :vehicle_type_id if column_exists?(:cm_vehicle_type_option_types, :vehicle_id)
+    rename_column :cm_option_value_vehicle_types, :vehicle_id, :vehicle_type_id if column_exists?(:cm_option_value_vehicle_types, :vehicle_id)
+
+    # 2. remove uncessary column for vehicle type.
+    # also rename code to name to make it more friendly. Meyhong also use name.
+    # rename vehicle_type to kind to avoid confusion with vehicle_type association
+    change_table :cm_vehicle_types do |t|
+      t.remove :license_plate if column_exists?(:cm_vehicle_types, :license_plate)
+      t.remove :allow_seat_selection if column_exists?(:cm_vehicle_types, :allow_seat_selection)
+      t.rename :code, :name if column_exists?(:cm_vehicle_types, :code)
+      t.rename :vehicle_type, :kind if column_exists?(:cm_vehicle_types, :vehicle_type)
+    end
+
+    # 3. new vehicle table
+    create_table :cm_vehicles, if_not_exists: true do |t|
+      t.string :license_plate
+      t.string :name
+      t.integer :kind
+      t.references :vendor, null: false, foreign_key: { to_table: :spree_vendors }
+      t.references :vehicle_type, null: false, foreign_key: { to_table: :cm_vehicle_types }
+      t.timestamps
+    end
+
+    # 4. drop existing vehicle assocation, and add vehicle/vehicle type assocation type to trip again.
+    remove_column :cm_trips, :vehicle_id if column_exists?(:cm_trips, :vehicle_id)
+    add_reference :cm_trips, :vehicle, null: true, foreign_key: { to_table: :cm_vehicles } unless column_exists?(:cm_trips, :vehicle_id)
+    add_reference :cm_trips, :vehicle_type, null: true, foreign_key: { to_table: :cm_vehicle_types } unless column_exists?(:cm_trips, :vehicle_type_id)
+  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.pre14'.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'