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

data/app/models/spree_cm_commissioner/option_type_decorator.rb

@@ -14,7 +14,10 @@ module SpreeCmCommissioner
 
       base.has_many :variants, through: :products
 
-      base.has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', foreign_key: :option_type_id, dependent: :destroy
+      base.has_many :vehicle_type_option_types,
+                    class_name: 'SpreeCmCommissioner::VehicleTypeOptionType',
+                    foreign_key: :option_type_id,
+                    dependent: :destroy
 
       base.scope :promoted, -> { where(promoted: true) }
       base.whitelisted_ransackable_attributes = %w[kind]

data/app/models/spree_cm_commissioner/option_value_decorator.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module OptionValueDecorator
     def self.prepended(base)
       base.include SpreeCmCommissioner::OptionValueAttrType
-      base.has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', foreign_key: :option_value_id, dependent: :destroy
+      base.has_many :option_value_vehicle_types,
+                    class_name: 'SpreeCmCommissioner::OptionValueVehicleType',
+                    foreign_key: :option_value_id,
+                    dependent: :destroy
 
       base.validates :name, presence: true, uniqueness: { scope: :option_type_id, case_sensitive: -> { name_case_sensitive? } }
 

data/app/models/spree_cm_commissioner/{option_value_vehicle.rb → option_value_vehicle_type.rb}

@@ -1,8 +1,8 @@
 require_dependency 'spree_cm_commissioner'
 
 module SpreeCmCommissioner
-  class OptionValueVehicle < ApplicationRecord
-    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle'
+  class OptionValueVehicleType < ApplicationRecord
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
     belongs_to :option_value, class_name: 'Spree::OptionValue'
   end
 end

data/app/models/spree_cm_commissioner/trip.rb

@@ -13,10 +13,15 @@ module SpreeCmCommissioner
 
     before_validation :convert_duration_to_seconds
 
+    # before create, duplicate seat layout from vehicle_type if present
+    before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle_type&.seat_layout.present? }
+    before_validation :assign_route_and_vendor_route, if: :changed_route_attributes?
+
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
 
-    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: false
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', optional: false
+    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: true
     has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
 
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
@@ -38,10 +43,6 @@ module SpreeCmCommissioner
     validates :duration, numericality: { greater_than: 0 }
     validate :origin_and_destination_cannot_be_the_same
 
-    # before create, duplicate seat layout from vehicle if present
-    before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle.present? && vehicle.seat_layout.present? }
-    before_validation :assign_route_and_vendor_route, if: :changed_route_attributes?
-
     accepts_nested_attributes_for :trip_stops, :product, :seat_layout, allow_destroy: true
 
     self.whitelisted_ransackable_associations = %w[product vehicle]
@@ -84,7 +85,7 @@ module SpreeCmCommissioner
       # Duplicate the vehicle's seat layout into this trip. Copies nested
       # seat sections and blocks while excluding identifying columns and
       # timestamps to avoid collisions when creating new records.
-      original = vehicle.seat_layout
+      original = vehicle_type.seat_layout
 
       self.seat_layout_attributes =
         original.attributes.except('id', 'created_at', 'updated_at', 'layoutable_id', 'layoutable_type')

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,34 +1,22 @@
 module SpreeCmCommissioner
   class Vehicle < Base
-    include SpreeCmCommissioner::StoreMetadata
-    include SpreeCmCommissioner::VehicleType
-
-    # This model has no seat_layout column (polymorphic association), so we store the preload_seat_layout_id ID in public_metadata.
-    # This lets us check if a seat layout exists without triggering a database query.
-    # The ID is automatically updated whenever the seat_layout is saved.
-    store_public_metadata :preload_seat_layout_id, :integer
+    include SpreeCmCommissioner::VehicleKind
 
     belongs_to :vendor, class_name: 'Spree::Vendor'
-
-    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
-    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
-
-    has_many :vehicle_photos, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
-
-    has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
-    has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
-    has_many :option_values, through: :option_value_vehicles, class_name: 'Spree::OptionValue'
-    has_many :amenities, through: :option_value_vehicles, source: :option_value
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
 
     has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :nullify
+    has_many :amenities, through: :vehicle_type
+    has_many :option_values, through: :vehicle_type
+    has_many :vehicle_photos, through: :vehicle_type, source: :vehicle_photos
 
-    validates :code, uniqueness: { scope: :vendor_id }, presence: true
+    validates :name, presence: true
     validates :license_plate, uniqueness: true, allow_blank: true
 
-    self.whitelisted_ransackable_attributes = %w[license_plate code vehicle_type]
+    self.whitelisted_ransackable_attributes = %w[name license_plate kind]
 
     def display_name
-      "#{code} (#{license_plate})"
+      license_plate.present? ? "#{name} (#{license_plate})" : name
     end
   end
 end

data/app/models/spree_cm_commissioner/vehicle_type.rb

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  class VehicleType < Base
+    include SpreeCmCommissioner::StoreMetadata
+    include SpreeCmCommissioner::VehicleKind
+
+    # This model has no seat_layout column (polymorphic association), so we store the preload_seat_layout_id ID in public_metadata.
+    # This lets us check if a seat layout exists without triggering a database query.
+    # The ID is automatically updated whenever the seat_layout is saved.
+    store_public_metadata :preload_seat_layout_id, :integer
+
+    belongs_to :vendor, class_name: 'Spree::Vendor'
+
+    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
+
+    has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+    has_many :vehicle_photos, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+
+    has_many :vehicle_type_option_types, class_name: 'SpreeCmCommissioner::VehicleTypeOptionType', dependent: :destroy
+    has_many :option_value_vehicle_types, class_name: 'SpreeCmCommissioner::OptionValueVehicleType', dependent: :destroy
+    has_many :option_values, through: :option_value_vehicle_types, class_name: 'Spree::OptionValue'
+    has_many :amenities, through: :option_value_vehicle_types, source: :option_value
+
+    validates :name, uniqueness: { scope: :vendor_id }, presence: true
+
+    self.whitelisted_ransackable_attributes = %w[name kind]
+  end
+end

data/app/models/spree_cm_commissioner/vehicle_type_option_type.rb

@@ -0,0 +1,6 @@
+module SpreeCmCommissioner
+  class VehicleTypeOptionType < ApplicationRecord
+    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
+    belongs_to :option_type, class_name: 'Spree::OptionType'
+  end
+end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -90,6 +90,7 @@ module SpreeCmCommissioner
                     dependent: :destroy,
                     inverse_of: :relatable
 
+      base.has_many :vehicle_types, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
       base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
       base.has_many :trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop'

data/app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
 
-<%= button_link_to Spree.t(:clear_cache), admin_invalidate_api_caches_path(model: Spree::Product.name),method: :post, class: "btn btn-outline-primary" %>
+<%= button_link_to Spree.t(:clear_cache), admin_invalidate_api_caches_path(model: Spree::Product.name, id: @product.id), method: :post, class: "btn btn-outline-primary" %>

data/app/overrides/spree/admin/taxons/edit/clear_cache_button.html.erb.deface

@@ -2,6 +2,7 @@
 
 <% if @taxon.depth == 1 %>
       <%= button_link_to Spree.t(:clear_cache),
-          admin_invalidate_api_caches_path(model: Spree::Taxon.name),
-          method: :post, class: "btn btn-outline-primary" %>
+          admin_invalidate_api_caches_path(model: Spree::Taxon.name, id: @taxon.id),
+          method: :post, 
+          class: "btn btn-outline-primary" %>
 <% end %>

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -71,7 +71,7 @@ module SpreeCmCommissioner
                 prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
                 prices.currency AS currency
               SQL
-              .includes(vendor: :logo, vehicle: :option_values)
+              .includes(vendor: :logo, vehicle_type: :option_values)
 
       scope = scope.joins(:vendor) if tenant_id.present?
 
@@ -100,7 +100,7 @@ module SpreeCmCommissioner
     end
 
     def build_trip_result(trip)
-      vehicle = trip&.vehicle
+      vehicle_type = trip&.vehicle_type
       vendor = trip&.vendor
       trip_result_options = {
         id: trip&.id,
@@ -117,8 +117,8 @@ module SpreeCmCommissioner
           id: trip&.destination_place_id,
           name: trip&.destination_place_name
         },
-        vehicle_id: trip&.vehicle_id,
-        vehicle: vehicle,
+        vehicle_type_id: trip&.vehicle_type_id,
+        vehicle_type: vehicle_type,
         vendor_id: trip&.vendor_id,
         vendor: vendor,
         product_id: trip&.product_id,
@@ -129,7 +129,7 @@ module SpreeCmCommissioner
         drop_off: build_drop_off_info(trip),
         quantity_available: trip&.quantity_available,
         max_capacity: trip&.max_capacity,
-        amenities: (trip.vehicle&.option_values || [])
+        amenities: (trip.vehicle_type&.option_values || [])
       }
       SpreeCmCommissioner::TripResult.new(trip_result_options)
     end

data/app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_update_schema.rb

@@ -23,6 +23,8 @@ module SpreeCmCommissioner
         optional(:detour_dropoff_km).filled(:float)
         optional(:extra_pickup_km).filled(:float)
         optional(:extra_dropoff_km).filled(:float)
+        optional(:signed_at).filled(:string)
+        optional(:signature).filled(:string)
       end
     end
   end

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

@@ -17,6 +17,18 @@ module Spree
           base.attribute :delivery_required, &:delivery_required?
           base.attribute :sufficient_stock, &:sufficient_stock?
 
+          base.attribute :pickup_map_place do |line_item|
+            line_item.pickup_map_place&.to_h
+          end
+
+          base.attribute :dropoff_map_place do |line_item|
+            line_item.dropoff_map_place&.to_h
+          end
+
+          base.attribute :distance do |line_item|
+            line_item.distance&.to_h
+          end
+
           base.has_one :vendor
 
           base.belongs_to :order, serializer: Spree::V2::Storefront::OrderSerializer

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

@@ -10,7 +10,8 @@ module Spree
                    :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount,
                    :display_amount, :number, :qr_data, :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                    :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking,
-                   :discontinue_on, :high_demand, :jwt_token, :pre_tax_amount, :display_pre_tax_amount, :public_metadata
+                   :discontinue_on, :high_demand, :jwt_token, :pre_tax_amount, :display_pre_tax_amount, :public_metadata,
+                   :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id
 
         attribute :required_self_check_in_location, &:required_self_check_in_location?
         attribute :allowed_self_check_in, &:allowed_self_check_in?
@@ -18,6 +19,18 @@ module Spree
         attribute :delivery_required, &:delivery_required?
         attribute :sufficient_stock, &:sufficient_stock?
 
+        attribute :pickup_map_place do |line_item|
+          line_item.pickup_map_place&.to_h
+        end
+
+        attribute :dropoff_map_place do |line_item|
+          line_item.dropoff_map_place&.to_h
+        end
+
+        attribute :distance do |line_item|
+          line_item.distance&.to_h
+        end
+
         has_one :vendor, serializer: Spree::V2::Tenant::VendorSerializer
         has_one :product, serializer: Spree::V2::Storefront::ProductSerializer
         has_many :saved_guests, serializer: SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer

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

@@ -0,0 +1,26 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class DistanceSerializer < BaseSerializer
+        attributes :distance_km,
+                   :ordered_points,
+                   :estimated_time_minutes,
+                   :extra_pickup_km,
+                   :extra_dropoff_km,
+                   :base_km,
+                   :detour_pickup_km,
+                   :detour_dropoff_km
+
+        attribute :signed_at do |object|
+          object.to_signed_h['signed_at'] if object.respond_to?(:to_signed_h)
+        end
+
+        attribute :signature do |object|
+          object.to_signed_h['signature'] if object.respond_to?(:to_signed_h)
+        end
+
+        cache_options store: nil
+      end
+    end
+  end
+end

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

@@ -13,15 +13,15 @@ module SpreeCmCommissioner
 
         cache_options store: nil
 
-        def pickup_map_place
+        attribute :pickup_map_place do |object|
           object.pickup_map_place&.to_h
         end
 
-        def dropoff_map_place
+        attribute :dropoff_map_place do |object|
           object.dropoff_map_place&.to_h
         end
 
-        def distance
+        attribute :distance do |object|
           object.distance&.to_h
         end
       end

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

@@ -16,11 +16,11 @@ module SpreeCmCommissioner
         )
 
         attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
-                   :allow_seat_selection, :departure_time, :route_type, :distance
+                   :allow_seat_selection, :departure_time, :route_type, :distance, :display_price
         attribute :duration_in_hms, &:duration_in_hms
         attribute :arrival_time, &:arrival_time
         belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
-        belongs_to :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+        belongs_to :vehicle_type, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleTypeSerializer
         has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
       end
     end

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

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
       class TripSerializer < BaseSerializer
         attributes :departure_time, :arrival_time, :duration_in_hms, :route_type, :allow_seat_selection
 
-        has_one :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+        has_one :vehicle_type, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleTypeSerializer
         has_one :seat_layout, serializer: SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
 
         has_one :origin_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/{trip_vehicle_serializer.rb → trip_vehicle_type_serializer.rb}

@@ -1,10 +1,8 @@
 module SpreeCmCommissioner
   module V2
     module Storefront
-      class TripVehicleSerializer < BaseSerializer
-        set_type :vehicle
-
-        attributes :id, :code, :vehicle_type, :number_of_seats
+      class TripVehicleTypeSerializer < BaseSerializer
+        attributes :id, :name, :kind
 
         has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -0,0 +1,98 @@
+module SpreeCmCommissioner
+  module ApiCaches
+    class Invalidate
+      prepend ::Spree::ServiceModule::Base
+
+      SUPPORTED_MODELS = {
+        'SpreeCmCommissioner::HomepageSection' => SpreeCmCommissioner::HomepageSection,
+        'SpreeCmCommissioner::HomepageBackground' => SpreeCmCommissioner::HomepageBackground,
+        'Spree::Menu' => Spree::Menu,
+        'Spree::Taxon' => Spree::Taxon,
+        'Spree::Product' => Spree::Product
+      }.freeze
+
+      SINGLE_API_PATTERN = {
+        SpreeCmCommissioner::HomepageSection => ['/api/v2/storefront/homepage/:id'],
+        SpreeCmCommissioner::HomepageBackground => ['/api/v2/storefront/homepage/:id'],
+        Spree::Menu => ['/api/v2/storefront/menus/:id'],
+        Spree::Taxon => ['/api/v2/storefront/taxons/:id'],
+        Spree::Product => [
+          '/api/v2/tenant/products/:id',
+          '/api/v2/tenant/products/:slug',
+          '/api/v2/storefront/products/:id',
+          '/api/v2/storefront/products/:slug'
+        ]
+      }.freeze
+
+      ALL_API_PATTERNS = {
+        SpreeCmCommissioner::HomepageSection => ['/api/v2/storefront/homepage/*'],
+        SpreeCmCommissioner::HomepageBackground => ['/api/v2/storefront/homepage/*'],
+        Spree::Menu => ['/api/v2/storefront/menus/*'],
+        Spree::Taxon => ['/api/v2/storefront/taxons/*'],
+        Spree::Product => [
+          '/api/v2/tenant/products/*',
+          '/api/v2/storefront/products/*'
+        ]
+      }.freeze
+
+      # eg. 'Spree::Product', 123 or 'Spree::Product', nil
+      def call(model:, id: nil)
+        model_class = SUPPORTED_MODELS[model]
+
+        return failure(nil, 'Model is not supported') if model_class.nil?
+
+        if id.present?
+          invalidate_single_record(model_class: model_class, id: id)
+        else
+          invalidate_all_records(model_class: model_class)
+        end
+      end
+
+      # eg. 'Spree::Product', 123 => ['/api/v2/tenant/products/123', '/api/v2/tenant/products/slug-of-product', ...]
+      def invalidate_single_record(model_class:, id:)
+        return failure(nil, "#{model_class.name} ID is required") if id.blank?
+
+        record = model_class.find_by(id: id)
+        return failure(nil, "#{model_class.name} #{id} record not found") if record.nil?
+
+        refresh_record_cache_key(record)
+
+        api_patterns = SINGLE_API_PATTERN[record.class].map do |pattern|
+          pattern.gsub(/:(\w+)/) do
+            key = Regexp.last_match(1)
+            record.public_send(key).to_s
+          end
+        end
+
+        enqueue_invalidate(api_patterns)
+
+        success(record: record, api_patterns: api_patterns)
+      end
+
+      # eg. 'Spree::Product' => ['/api/v2/tenant/products/*', '/api/v2/storefront/products/*']
+      def invalidate_all_records(model_class:)
+        model_class.find_each do |record|
+          refresh_record_cache_key(record)
+        end
+
+        enqueue_invalidate(ALL_API_PATTERNS[model_class])
+
+        success(api_patterns: ALL_API_PATTERNS[model_class])
+      end
+
+      private
+
+      # eg. updated_at: Fri, 26 Dec 2025 10:40:56.505450000 +07 +07:00
+      def refresh_record_cache_key(record)
+        # rubocop:disable Rails/SkipsModelValidations
+        record.touch
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+
+      # Enqueue cache invalidation jobs
+      def enqueue_invalidate(patterns)
+        SpreeCmCommissioner::InvalidateCacheRequestJob.perform_later(patterns: patterns)
+      end
+    end
+  end
+end