spree_cm_commissioner 2.3.2.pre.pre6 → 2.3.2

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

@@ -1,19 +1,35 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Create
-      prepend ::Spree::ServiceModule::Base
+      attr_reader :trip_id, :from_date, :to_date, :user_id, :quantity
 
-      def call(trip_id:, from_date:, to_date:, user: nil, quantity: 1)
-        validate!(trip_id: trip_id, from_date: from_date, to_date: to_date, quantity: quantity)
+      def self.call(trip_id:, from_date:, to_date:, user_id: nil, quantity: 1)
+        new(
+          trip_id: trip_id,
+          from_date: from_date,
+          to_date: to_date,
+          user_id: user_id,
+          quantity: quantity
+        ).call
+      end
+
+      def initialize(trip_id:, from_date:, to_date:, user_id:, quantity:)
+        @trip_id = trip_id
+        @from_date = from_date
+        @to_date = to_date
+        @user_id = user_id
+        @quantity = quantity.to_i <= 0 ? 1 : quantity.to_i
+      end
 
-        quantity = quantity.to_i
+      def call
+        validate!
 
-        order = ActiveRecord::Base.transaction do
+        ActiveRecord::Base.transaction do
           trip = SpreeCmCommissioner::Trip.find(trip_id)
           variant = trip.product.variants.first
           raise ArgumentError, 'No variant found for trip' if variant.blank?
 
-          order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
+          order = Spree::Order.new(state: 'cart', use_billing: true, user_id: user_id)
 
           line_item = order.line_items.new(
             variant_id: variant.id,
@@ -26,39 +42,26 @@ module SpreeCmCommissioner
           )
 
           build_guests_for!(line_item, quantity)
-          assign_saved_guests_to_line_item(line_item)
 
           order.save!
           order.update_with_updater!
 
           order
         end
-
-        success(order)
-      rescue StandardError => e
-        failure(nil, e.message)
       end
 
       private
 
-      def validate!(trip_id:, from_date:, to_date:, quantity:)
+      def validate!
         raise ArgumentError, 'trip_id is required' if trip_id.blank?
         raise ArgumentError, 'from_date is required' if from_date.blank?
         raise ArgumentError, 'to_date is required' if to_date.blank?
         raise ArgumentError, 'to_date must be after from_date' if from_date.present? && to_date.present? && to_date < from_date
-        raise ArgumentError, 'quantity must be 1' if quantity.to_i != 1
       end
 
       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

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

@@ -1,42 +1,78 @@
 module SpreeCmCommissioner
   module IntercityTaxiOrder
     class Update
-      prepend ::Spree::ServiceModule::Base
-
-      def call(
-        order:,
-        remark: nil,
-        pickup_map_place_attributes: nil,
-        dropoff_map_place_attributes: nil,
-        distance_attributes: nil
-      )
-        line_item = order.line_items.first
-
-        raise ArgumentError, 'Order has no line items' if line_item.blank?
-
-        if pickup_map_place_attributes.present?
-          line_item.pickup_map_place = SpreeCmCommissioner::IntercityTaxi::MapPlace.new(
-            pickup_map_place_attributes
-          )
-        end
-
-        if dropoff_map_place_attributes.present?
-          line_item.dropoff_map_place = SpreeCmCommissioner::IntercityTaxi::MapPlace.new(
-            dropoff_map_place_attributes
-          )
-        end
-
-        if distance_attributes.present?
-          line_item.distance = SpreeCmCommissioner::IntercityTaxi::Distance.new(
-            distance_attributes
-          )
-        end
-
-        line_item.update!(remark: remark)
-
-        success(order.reload)
-      rescue StandardError => e
-        failure(nil, e.message)
+      attr_reader :order_number, :params
+
+      def self.call(order_number:, params:)
+        new(order_number: order_number, params: params).call
+      end
+
+      def initialize(order_number:, params:)
+        @order_number = order_number
+        @params = ensure_parameters(params)
+      end
+
+      def call
+        order = Spree::Order.find_by!(number: order_number)
+        order.update!(order_params)
+
+        create_billing_address_if_missing(order)
+
+        order
+      end
+
+      private
+
+      def ensure_parameters(params)
+        return params if params.is_a?(::ActionController::Parameters)
+
+        ::ActionController::Parameters.new(params)
+      end
+
+      def create_billing_address_if_missing(order)
+        return if order.bill_address.present?
+
+        SpreeCmCommissioner::BillingAddressCreator.call(order: order)
+      end
+
+      def order_params
+        params.require(:order).permit(
+          :intel_phone_number,
+          :email,
+          line_items_attributes: [
+            :id,
+            :pickup_place_name,
+            :drop_off_place_name,
+            :from_date,
+            :pickup_lat,
+            :pickup_lng,
+            :pickup_oob_confirmed,
+            :drop_off_lat,
+            :drop_off_lng,
+            :drop_off_oob_confirmed,
+            :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,
+            :remark,
+            :passenger_count,
+            { guests_attributes: %i[
+              id
+              first_name
+              last_name
+              gender
+              nationality_id
+              age
+            ]
+            }
+          ]
+        )
       end
     end
   end

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -16,7 +16,7 @@
               </div>
             <% else %>
               <div class="f-fallback">
-                <%= render 'spree_cm_commissioner/order_mailer/tenant/greeting', order: @order, logo: @logo, name: @name%>
+                <%= render 'spree_cm_commissioner/order_mailer/tenant/greeting', order: @order %>
                 <div class="content">
                   <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
                   <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>

data/app/views/spree_cm_commissioner/order_mailer/_mailer_stylesheets.html.erb

@@ -74,9 +74,7 @@
     background-position: center;
     background-repeat: no-repeat;
     border-radius: 1.5625rem 1.5625rem 0 0;
-    <% if @brand_color.present? %>
-      background: <%= @brand_color %>;
-    <% end %>
+    background: <%= @brand_color %>;
   }
   #confirm-email #greeting-card-1 p,
   #confirm-email #greeting-card-1 .header,
@@ -95,20 +93,21 @@
     margin-bottom: 0.625rem;
   }
   #confirm-email .icon-hang-meas {
-    width: 50%; 
-    text-align: right;
+    width: 6.25rem;
+    height: 6.25rem;
+    border-radius: 50%;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
   }
+
   #confirm-email .icon-hang-meas img {
-    width: 6.25rem;
-    height: 6.25rem; 
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
     border-radius: 50%; 
-    background-color: #fff; 
-    display: inline-block;
-  }
-  #confirm-email .header h1 {
-    margin: 0; 
-    color: #fff; 
-    width: 50%;
   }
 
   #confirm-email .header {

data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb

@@ -1,11 +1,9 @@
 <div id="greeting-card-1">
   <div>
     <div class="header">
-      <h1><%= name %></h1>
-      <% if logo.present? %>
-        <div class="icon-hang-meas">
-          <img src="<%= logo %>" alt="<%= name %> Logo">
-        </div>
+      <h1><%=@order.tenant.name %></h1>
+      <% if @vendor_logo_url.present? %>
+        <img src="<%= @vendor_logo_url %>" alt="Vendor Logo" class="icon-hang-meas">
       <% end %>
     </div>
     <div class="booking-confirm">
@@ -15,7 +13,7 @@
       <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order)) %>
     </div>
     <div class="description">
-      <%= I18n.t('mail.order_mailer.booking_event', order_number: order.number || 'NA') %>
+      <%= I18n.t('mail.order_mailer.booking_event', order_number: @order.number || 'NA') %>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -550,14 +550,6 @@ Spree::Core::Engine.add_routes do
         resources :guest_card_classes
         resources :tickets, only: :index
 
-        resources :trip_places, only: :index
-        resources :trip_search, only: [:index]
-        resources :trips, only: %i[show]
-
-        namespace :intercity_taxi do
-          resource :draft_orders, only: %i[create update]
-        end
-
         resource :reset_passwords, only: [:update]
         resource :change_passwords, only: [:update]
         resource :user_contacts, only: [:update]
@@ -583,8 +575,6 @@ Spree::Core::Engine.add_routes do
         resources :trip_places
         resources :trip_search, only: [:index]
         resources :trips, only: %i[show]
-        resources :route_places, only: [:index]
-        resources :popular_route_places, only: [:index]
 
         namespace :queue_cart do
           resources :line_items, only: [:create]
@@ -699,7 +689,7 @@ Spree::Core::Engine.add_routes do
           resources :draft_orders, only: %i[create]
         end
         namespace :intercity_taxi do
-          resource :draft_orders, only: %i[create update]
+          resources :draft_orders, only: %i[create update]
         end
       end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.2.pre.pre6'.freeze
+  VERSION = '2.3.2'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -23,8 +23,6 @@ require 'spree_cm_commissioner/trip_query_result'
 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 '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.3.2.pre.pre6
+  version: 2.3.2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-08 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -969,13 +969,11 @@ files:
 - app/controllers/spree/api/v2/storefront/pin_code_generators_controller.rb
 - app/controllers/spree/api/v2/storefront/pin_code_otp_checkers_controller.rb
 - app/controllers/spree/api/v2/storefront/pin_code_otp_generators_controller.rb
-- app/controllers/spree/api/v2/storefront/popular_route_places_controller.rb
 - app/controllers/spree/api/v2/storefront/profile_images_controller.rb
 - app/controllers/spree/api/v2/storefront/provinces_controller.rb
 - app/controllers/spree/api/v2/storefront/qr_urls_controller.rb
 - app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb
 - app/controllers/spree/api/v2/storefront/reset_passwords_controller.rb
-- app/controllers/spree/api/v2/storefront/route_places_controller.rb
 - app/controllers/spree/api/v2/storefront/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/storefront/seat_layouts_controller.rb
 - app/controllers/spree/api/v2/storefront/self_check_in_controller.rb
@@ -1015,7 +1013,6 @@ 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/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
@@ -1028,9 +1025,6 @@ files:
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/tickets_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_places_controller.rb
-- app/controllers/spree/api/v2/tenant/trip_search_controller.rb
-- app/controllers/spree/api/v2/tenant/trips_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_contacts_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
@@ -1130,9 +1124,7 @@ files:
 - app/finders/spree_cm_commissioner/orders/find.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
-- app/finders/spree_cm_commissioner/places/find_with_route.rb
 - app/finders/spree_cm_commissioner/products/find_decorator.rb
-- app/finders/spree_cm_commissioner/routes/find_popular.rb
 - app/helpers/spree/admin/base_helper_decorator.rb
 - app/helpers/spree/admin/google_wallets_helper.rb
 - app/helpers/spree/base_helper_decorator.rb
@@ -1406,8 +1398,6 @@ files:
 - app/models/spree_cm_commissioner/base.rb
 - app/models/spree_cm_commissioner/blazer_queryable.rb
 - app/models/spree_cm_commissioner/block.rb
-- app/models/spree_cm_commissioner/calculators/extra_drop_off_distance.rb
-- app/models/spree_cm_commissioner/calculators/extra_pick_up_distance.rb
 - app/models/spree_cm_commissioner/check_in.rb
 - app/models/spree_cm_commissioner/check_in_ability.rb
 - app/models/spree_cm_commissioner/check_in_record.rb
@@ -1493,14 +1483,6 @@ files:
 - app/models/spree_cm_commissioner/pin_code_update_user_login.rb
 - app/models/spree_cm_commissioner/place.rb
 - app/models/spree_cm_commissioner/price_decorator.rb
-- app/models/spree_cm_commissioner/pricing_action.rb
-- app/models/spree_cm_commissioner/pricing_model.rb
-- app/models/spree_cm_commissioner/pricing_model_variant.rb
-- app/models/spree_cm_commissioner/pricing_rule.rb
-- app/models/spree_cm_commissioner/pricing_rule_group.rb
-- app/models/spree_cm_commissioner/pricing_rules/extra_drop_off_distance.rb
-- app/models/spree_cm_commissioner/pricing_rules/extra_pick_up_distance.rb
-- app/models/spree_cm_commissioner/pricing_rules/nationality.rb
 - app/models/spree_cm_commissioner/product_completion_step.rb
 - app/models/spree_cm_commissioner/product_completion_step_banner.rb
 - app/models/spree_cm_commissioner/product_completion_steps/chatrace_telegram.rb
@@ -1767,11 +1749,8 @@ files:
 - app/queries/spree_cm_commissioner/users_by_event_fetcher_query.rb
 - app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/application_request_schema.rb
-- app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb
-- app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb
 - app/request_schemas/spree_cm_commissioner/inventory_item_schema.rb
 - app/request_schemas/spree_cm_commissioner/profile_image_request_schema.rb
-- app/request_schemas/spree_cm_commissioner/route_places_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/seat_layout_schema.rb
 - app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_account_linkage_request_schema.rb
@@ -1840,7 +1819,6 @@ files:
 - app/serializers/spree/v2/tenant/homepage_section_serializer.rb
 - app/serializers/spree/v2/tenant/id_card_serializer.rb
 - app/serializers/spree/v2/tenant/image_serializer.rb
-- app/serializers/spree/v2/tenant/intercity_taxi_cart_serializer.rb
 - app/serializers/spree/v2/tenant/line_item_serializer.rb
 - app/serializers/spree/v2/tenant/notification_serializer.rb
 - app/serializers/spree/v2/tenant/option_type_serializer.rb
@@ -1858,9 +1836,6 @@ files:
 - app/serializers/spree/v2/tenant/taxon_serializer.rb
 - app/serializers/spree/v2/tenant/taxonomy_serializer.rb
 - app/serializers/spree/v2/tenant/ticket_serializer.rb
-- app/serializers/spree/v2/tenant/trip_place_serializer.rb
-- app/serializers/spree/v2/tenant/trip_query_result_serializer.rb
-- app/serializers/spree/v2/tenant/trip_serializer.rb
 - app/serializers/spree/v2/tenant/user_contact_serializer.rb
 - app/serializers/spree/v2/tenant/user_device_token_serializer.rb
 - app/serializers/spree/v2/tenant/user_identity_provider_serializer.rb
@@ -1925,7 +1900,6 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/qr_url_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/reserved_block_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/reset_password_serializer.rb
-- app/serializers/spree_cm_commissioner/v2/storefront/route_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/saved_guest_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/seat_layout_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/seat_section_serializer.rb
@@ -1991,11 +1965,6 @@ files:
 - app/services/spree_cm_commissioner/organizer/export_invite_guest_csv_service.rb
 - app/services/spree_cm_commissioner/payment_method_type_mapper.rb
 - app/services/spree_cm_commissioner/penalty_calculator.rb
-- app/services/spree_cm_commissioner/pricing_models/apply.rb
-- app/services/spree_cm_commissioner/pricing_rules/build_params.rb
-- app/services/spree_cm_commissioner/pricing_rules/build_template.rb
-- app/services/spree_cm_commissioner/pricing_rules/create.rb
-- app/services/spree_cm_commissioner/pricing_rules/update.rb
 - app/services/spree_cm_commissioner/role_permissions_constructor.rb
 - app/services/spree_cm_commissioner/role_permissions_loader.rb
 - app/services/spree_cm_commissioner/routes/base_update_order_metrics.rb
@@ -2013,10 +1982,6 @@ files:
 - 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
-- app/services/spree_cm_commissioner/vendor_places/base.rb
-- app/services/spree_cm_commissioner/vendor_places/bulk_create.rb
-- app/services/spree_cm_commissioner/vendor_places/create_with_google_map_data.rb
-- app/services/spree_cm_commissioner/vendor_places/update.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_fetcher.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_setter.rb
 - app/services/spree_cm_commissioner/webhooks/subscribers/handle_request_decorator.rb
@@ -2880,19 +2845,13 @@ files:
 - db/migrate/20250911174607_add_metadata_columns_to_cm_vehicles.rb
 - db/migrate/20250911174653_add_metadata_columns_to_cm_trips.rb
 - db/migrate/20250912084944_add_send_type_to_sms_log.rb
-- db/migrate/20250915075830_create_spree_cm_commissioner_pricing_models.rb
-- db/migrate/20250915080733_create_spree_cm_commissioner_pricing_model_variants.rb
 - db/migrate/20250930094228_add_application_id_to_cm_pin_codes.rb
 - db/migrate/20250930100657_add_settings_to_spree_oauth_applications.rb
-- db/migrate/20251003082144_create_spree_cm_commissioner_pricing_rule_groups.rb
-- db/migrate/20251003093408_create_spree_cm_commissioner_pricing_rule.rb
-- db/migrate/20251003093643_create_spree_cm_commissioner_pricing_action.rb
 - db/migrate/20251008064344_add_route_id_to_cm_trips.rb
 - db/migrate/20251009033331_add_registered_by_to_spree_users.rb
 - db/migrate/20251009073040_add_lock_version_to_cm_routes.rb
 - db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
-- db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -2917,8 +2876,6 @@ files:
 - lib/spree_cm_commissioner/calendar_event.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
 - lib/spree_cm_commissioner/order_jwt_token.rb
@@ -2967,10 +2924,6 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/permission.rb
 - lib/spree_cm_commissioner/test_helper/factories/pin_code_factory.rb
 - 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_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
 - lib/spree_cm_commissioner/test_helper/factories/product_completion_step_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/product_factory.rb
@@ -3063,9 +3016,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

data/app/controllers/spree/api/v2/storefront/popular_route_places_controller.rb

@@ -1,63 +0,0 @@
-# API endpoint for retrieving popular routes ordered by order metrics.
-#
-# GET /api/v2/storefront/popular_route_places
-#
-# Returns routes sorted by popularity (fulfilled_order_count, then order_count) with their
-# origin and destination places. Supports optional includes for vendors and nearby_places.
-#
-# Response: Collection of routes serialized with RouteSerializer
-#
-# @example
-#   GET /api/v2/storefront/popular_route_places
-module Spree
-  module Api
-    module V2
-      module Storefront
-        class PopularRoutePlacesController < ::Spree::Api::V2::ResourceController
-          private
-
-          # override
-          def collection
-            @collection ||= collection_finder.new.execute
-          end
-
-          # override
-          def default_resource_includes
-            %w[origin_place destination_place]
-          end
-
-          # override
-          def collection_finder
-            SpreeCmCommissioner::Routes::FindPopular
-          end
-
-          # override
-          def collection_serializer
-            resource_serializer
-          end
-
-          # override
-          def resource_serializer
-            SpreeCmCommissioner::V2::Storefront::RouteSerializer
-          end
-
-          # override
-          def serializer_params
-            super.merge(
-              include_vendors: include_vendors?,
-              include_nearby_places: include_nearby_places?
-            )
-          end
-
-          def include_vendors?
-            resource_includes.include?(:vendors) || false
-          end
-
-          def include_nearby_places?
-            resource_includes.include?(:nearby_places) || false
-          end
-        end
-      end
-    end
-  end
-end

data/app/controllers/spree/api/v2/storefront/route_places_controller.rb

@@ -1,68 +0,0 @@
-# API endpoint for searching places that are used in routes by keyword.
-#
-# GET /api/v2/storefront/route_places
-#
-# Searches for places (origins or destinations) that are used in existing routes,
-# filtered by keyword search on place names.
-#
-# Query Parameters:
-#   - query: [String] Required. Keyword to search in place names (case-insensitive)
-#   - place_type: [String] Required. Type of route place: 'origin' or 'destination'
-#   - include: Optional comma-separated list (e.g., 'vendors,nearby_places')
-#
-# Response: Collection of places serialized with PlaceSerializer
-#
-# Behavior:
-#   - Returns empty collection if query is blank or place_type is invalid
-#   - UI should only call this endpoint when user has input a search term
-#   - For initial/empty state, use GET /api/v2/storefront/popular_route_places instead
-#
-# @example
-#   GET /api/v2/storefront/route_places?query=Phnom&place_type=origin
-module Spree
-  module Api
-    module V2
-      module Storefront
-        class RoutePlacesController < ::Spree::Api::V2::ResourceController
-          private
-
-          # override
-          def collection
-            @collection ||= collection_finder.new(keyword: params[:query], place_type: params[:place_type]).execute
-          end
-
-          # override
-          def collection_finder
-            SpreeCmCommissioner::Places::FindWithRoute
-          end
-
-          # override
-          def collection_serializer
-            Spree::V2::Storefront::PlaceSerializer
-          end
-
-          # override
-          def required_schema
-            SpreeCmCommissioner::RoutePlacesRequestSchema
-          end
-
-          # override
-          def serializer_params
-            super.merge(
-              include_vendors: include_vendors?,
-              include_nearby_places: include_nearby_places?
-            )
-          end
-
-          def include_vendors?
-            resource_includes.include?(:vendors) || false
-          end
-
-          def include_nearby_places?
-            resource_includes.include?(:nearby_places) || false
-          end
-        end
-      end
-    end
-  end
-end