spree_cm_commissioner 2.3.2.pre.pre2 → 2.3.2.pre.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4090589caa9f83b8b2020e1ed20383647e2671b87692bcecf57f2f455bee7a58
-  data.tar.gz: 8cd128d3b2764b6ba6b309c8e0c9b71108b7057ccdd4e03fe92ec4e9d8702d9a
+  metadata.gz: 41cc123a59db2cddcf70bc8769d9a99a1d5fe1dbc81121d2002e8683032cb4a2
+  data.tar.gz: 49729cab30781d0bfe470c7b4d3d3b5912e888104263122cb62ef37f46cdf813
 SHA512:
-  metadata.gz: 692a3b8079e7f44d84556a826f8519ece6226334b28f78b194829f908f005902a4aaa34f18683aecbb161450197f3c808a82d84545fcc868975306ae45b396a5
-  data.tar.gz: e5e0191151979f1476f7ba43fe46ce13dd346c9d44d729d18da9fcff587004c21c7f028bc814356fa2c08a3a32dc867e3bd155ccc0f7659761ab7a9a6201b9b9
+  metadata.gz: d981677facf743342469f9749e35550db74983bbc458c86d623c93fd7e3309e635ca45ee1ac65893e4b7186ee6f933b7785a6475631a8b3f7fde280518340457
+  data.tar.gz: ee81f47e4c74fdcb25ee291371bb81740127709910479d551adc9b2cc26c0d73036380bd7c2c5cd8ece6154605a062e4646d747179a26eac3ed00614d4f51bfd

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.3.2.pre.pre2)
+    spree_cm_commissioner (2.3.2.pre.pre5)
       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

@@ -8,8 +8,9 @@ module Spree
             include SpreeCmCommissioner::OrderConcern
 
             before_action :ensure_order, only: :update
+
             def create
-              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+              result = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
@@ -17,51 +18,50 @@ module Spree
                 quantity: params[:quantity]
               )
 
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
             end
 
             def update
-              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+              result = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
                 order: spree_current_order,
-                order_params: intercity_taxi_update_order_params
+                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
+                )
               )
 
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
             end
 
             private
 
-            def intercity_taxi_update_order_params
-              params.require(:order).permit(
-                line_items_attributes: %i[
-                  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
-                  estimated_time_minutes
-                  remark
-                  passenger_count
-                ]
-              )
-            end
-
             def required_schema
               if action_name == 'create'
                 SpreeCmCommissioner::IntercityTaxiDraftOrderSchema

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

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

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

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

@@ -8,8 +8,9 @@ module Spree
             include SpreeCmCommissioner::OrderConcern
 
             before_action :ensure_order, only: :update
+
             def create
-              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+              result = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
@@ -17,51 +18,50 @@ module Spree
                 user: spree_current_user
               )
 
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
             end
 
             def update
-              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+              result = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
                 order: spree_current_order,
-                order_params: intercity_taxi_update_order_params
+                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
+                )
               )
 
-              render_serialized_payload { serialize_resource(order) }
-            rescue StandardError => e
-              render_error_payload(e.message)
+              if result.success?
+                render_serialized_payload { serialize_resource(result.value) }
+              else
+                render_error_payload(result.error)
+              end
             end
 
             private
 
-            def intercity_taxi_update_order_params
-              params.require(:order).permit(
-                line_items_attributes: %i[
-                  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
-                  estimated_time_minutes
-                  remark
-                  passenger_count
-                ]
-              )
-            end
-
             def required_schema
               if action_name == 'create'
                 SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
@@ -71,7 +71,7 @@ module Spree
             end
 
             def resource_serializer
-              SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
+              Spree::V2::Tenant::IntercityTaxiCartSerializer
             end
           end
         end

data/app/controllers/spree/api/v2/tenant/trip_places_controller.rb

@@ -3,18 +3,9 @@ module Spree
     module V2
       module Tenant
         class TripPlacesController < BaseController
-          def index
-            render_serialized_payload do
-              serialize_collection(paginated_collection)
-            end
-          end
-
           private
 
-          def paginated_collection
-            collection.page(params[:page]).per(params[:per_page])
-          end
-
+          # override
           def collection
             @collection ||= begin
               base_scope = scope
@@ -28,18 +19,21 @@ module Spree
             end
           end
 
+          # override
           def scope
             model_class.joins(:location_vendor_places)
                        .where(location_vendor_places: { tenant_id: @tenant.id })
                        .distinct
           end
 
+          # override
           def model_class
             SpreeCmCommissioner::Place
           end
 
+          # override
           def collection_serializer
-            SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+            Spree::V2::Tenant::TripPlaceSerializer
           end
         end
       end

data/app/controllers/spree/api/v2/tenant/trip_search_controller.rb

@@ -70,7 +70,7 @@ module Spree
           end
 
           def serialize_collection(collection)
-            serialized_data = SpreeCmCommissioner::V2::Storefront::TripQueryResultSerializer.new(
+            serialized_data = Spree::V2::Tenant::TripQueryResultSerializer.new(
               collection,
               include: default_resource_includes,
               params: serializer_params

data/app/controllers/spree/api/v2/tenant/trips_controller.rb

@@ -3,27 +3,27 @@ module Spree
     module V2
       module Tenant
         class TripsController < BaseController
-          def show
-            resource = scope.find(params[:id])
+          private
 
-            render_serialized_payload do
-              serialize_resource(resource)
-            end
+          # override
+          def resource
+            scope.find(params[:id])
           end
 
-          private
-
+          # override
           def scope
             model_class.joins(:vendor)
                        .where(spree_vendors: { tenant_id: @tenant.id })
           end
 
+          # override
           def model_class
             SpreeCmCommissioner::Trip
           end
 
+          # override
           def resource_serializer
-            SpreeCmCommissioner::V2::Storefront::TripSerializer
+            Spree::V2::Tenant::TripSerializer
           end
         end
       end

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -19,6 +19,7 @@
 # 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
@@ -79,6 +80,7 @@ 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 << ''
@@ -89,6 +91,16 @@ 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/finders/spree_cm_commissioner/places/find_with_route.rb

@@ -0,0 +1,43 @@
+# Finds places that are used in routes (as origin or destination) by keyword search.
+#
+# @param keyword [String] Search term to match against place names (case-insensitive)
+# @param place_type [String] Type of route place: 'origin' or 'destination'
+#
+# @return [ActiveRecord::Relation<SpreeCmCommissioner::Place>] Places matching the keyword
+#   that are used as origins or destinations in existing routes. Returns empty relation if
+#   keyword is blank or place_type is invalid.
+#
+# @note For default/empty state display, use SpreeCmCommissioner::Routes::FindPopular instead
+#   to show popular routes to users before they enter a search term.
+#
+# @example
+#   finder = SpreeCmCommissioner::Places::FindWithRoute.new(keyword: 'Phnom', place_type: 'origin')
+#   finder.execute # => Returns places with "Phnom" in name that are used as route origins
+module SpreeCmCommissioner
+  module Places
+    class FindWithRoute
+      attr_reader :keyword, :place_type
+
+      def initialize(keyword:, place_type:)
+        @keyword = keyword
+        @place_type = place_type
+      end
+
+      def execute
+        return SpreeCmCommissioner::Place.none if keyword.blank? || place_type.blank?
+
+        scope.where('cm_places.name ILIKE ?', "%#{keyword}%")
+      end
+
+      private
+
+      def scope
+        if place_type == 'origin'
+          SpreeCmCommissioner::Place.with_routes_as_origin
+        else
+          SpreeCmCommissioner::Place.with_routes_as_destination
+        end
+      end
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/routes/find_popular.rb

@@ -0,0 +1,25 @@
+# Finds routes ordered by popularity based on order metrics.
+#
+# Routes are sorted by:
+# 1. fulfilled_order_count (completed orders) - DESC
+# 2. order_count (total orders including incomplete) - DESC
+#
+# @return [ActiveRecord::Relation<SpreeCmCommissioner::Route>] Routes with origin and destination places loaded,
+#   ordered from most to least popular
+#
+# @example
+#   finder = SpreeCmCommissioner::Routes::FindPopular.new
+#   finder.execute # => Returns routes sorted by fulfillment and order counts
+
+module SpreeCmCommissioner
+  module Routes
+    class FindPopular
+      def execute
+        SpreeCmCommissioner::Route
+          .includes(:origin_place, :destination_place)
+          .order(Arel.sql('COALESCE(fulfilled_order_count, 0) DESC'))
+          .order(Arel.sql('COALESCE(order_count, 0) DESC'))
+      end
+    end
+  end
+end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -12,14 +12,20 @@ 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
@@ -38,10 +44,6 @@ 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)