spree_cm_commissioner 2.3.2.pre.pre2 → 2.3.2.pre.pre4

data/db/migrate/20251003093408_create_spree_cm_commissioner_pricing_rule.rb

@@ -0,0 +1,19 @@
+class CreateSpreeCmCommissionerPricingRule < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_pricing_rules, if_not_exists: true do |t|
+      t.references :pricing_rule_group, null: false, foreign_key: { to_table: :cm_pricing_rule_groups }
+      t.references :product, null: true, foreign_key: { to_table: :spree_products }
+      t.references :variant, null: true, foreign_key: { to_table: :spree_variants }
+      t.string :type, null: false
+      t.jsonb :public_metadata
+      t.jsonb :private_metadata
+      t.integer :position, null: false, default: 0
+
+      t.timestamps
+    end
+
+    add_index :cm_pricing_rules, :position, name: 'idx_pricing_rules_on_position'
+    add_index :cm_pricing_rules, [:pricing_rule_group_id, :product_id], name: 'idx_pricing_rules_on_group_product'
+    add_index :cm_pricing_rules, [:pricing_rule_group_id, :variant_id], name: 'idx_pricing_rules_on_group_variant'
+  end
+end

data/db/migrate/20251003093643_create_spree_cm_commissioner_pricing_action.rb

@@ -0,0 +1,14 @@
+class CreateSpreeCmCommissionerPricingAction < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_pricing_actions, if_not_exists: true do |t|
+      t.references :pricing_rule_group, null: false, foreign_key: { to_table: :cm_pricing_rule_groups }
+      t.references :product, null: true, foreign_key: { to_table: :spree_products }
+      t.references :variant, null: true, foreign_key: { to_table: :spree_variants }
+
+      t.timestamps
+    end
+
+    add_index :cm_pricing_actions, [:pricing_rule_group_id, :product_id], name: 'idx_pricing_actions_on_group_product'
+    add_index :cm_pricing_actions, [:pricing_rule_group_id, :variant_id], name: 'idx_pricing_actions_on_group_variant'
+  end
+end

data/db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb

@@ -1,7 +1,8 @@
 class AddTenantIdToCmVendorPlaces < ActiveRecord::Migration[7.0]
   def change
     add_column :cm_vendor_places, :tenant_id, :integer, if_not_exists: true
+    # Why: VendorPlace#before_save sets tenant_id from vendor; tenant APIs (TripPlacesController) and TripQuery
+    # join on vendor_places scoped by tenant, so this speeds tenant-scoped lookups
     add_index :cm_vendor_places, :tenant_id, if_not_exists: true
-    add_index :cm_vendor_places, %i[tenant_id vendor_id], if_not_exists: true, name: 'index_cm_vendor_places_on_tenant_and_vendor'
   end
 end

data/lib/spree_cm_commissioner/intercity_taxi/distance.rb

@@ -0,0 +1,38 @@
+module SpreeCmCommissioner
+  module IntercityTaxi
+    class Distance
+      attr_accessor :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)
+
+        @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
+
+      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
+    end
+  end
+end

data/lib/spree_cm_commissioner/intercity_taxi/map_place.rb

@@ -0,0 +1,31 @@
+module SpreeCmCommissioner
+  module IntercityTaxi
+    class MapPlace
+      attr_accessor :place_name, :lat, :lng, :oob_confirmed
+
+      def initialize(options = {})
+        options = options.stringify_keys if options.is_a?(Hash)
+
+        @place_name = options['place_name']
+        @lat = options['lat']&.to_f
+        @lng = options['lng']&.to_f
+
+        # Normalize truthy/falsey values ("true", "1", 1, etc.) to a real boolean.
+        @oob_confirmed = ActiveModel::Type::Boolean.new.cast(options['oob_confirmed'])
+      end
+
+      def self.from_hash(hash)
+        new(hash || {})
+      end
+
+      def to_h
+        {
+          'place_name' => @place_name,
+          'lat' => @lat,
+          'lng' => @lng,
+          'oob_confirmed' => @oob_confirmed
+        }.compact
+      end
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :pricing_action, class: 'SpreeCmCommissioner::PricingAction' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :cm_pricing_model, class: "SpreeCmCommissioner::PricingModel" do
+    association :vendor, factory: :cm_vendor
+    sequence(:name) { |n| "Pricing Model #{n}" }
+    description { "Test pricing model description" }
+    status { 'active' }
+  end
+end

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

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :pricing_rule_nationality, class: 'SpreeCmCommissioner::PricingRules::Nationality' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+    rule_type { 'must' }
+    nationalities { ["Cambodian"] }
+  end
+
+  factory :pricing_rule_extra_pick_up_distance, class: 'SpreeCmCommissioner::PricingRules::ExtraPickUpDistance' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+    min_distance { 5 }
+  end
+
+  factory :pricing_rule_extra_drop_off_distance, class: 'SpreeCmCommissioner::PricingRules::ExtraDropOffDistance' do
+    association :pricing_rule_group, factory: :pricing_rule_group
+    min_distance { 5 }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :pricing_rule_group, class: 'SpreeCmCommissioner::PricingRuleGroup' do
+    association :pricing_model, factory: :cm_pricing_model
+    sequence(:name) { |n| "Rule Group #{n}" }
+    match_type { 'all' }
+    position { 0 }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

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

data/lib/spree_cm_commissioner.rb

@@ -23,6 +23,8 @@ 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.pre2
+  version: 2.3.2.pre.pre4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-03 00:00:00.000000000 Z
+date: 2025-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -969,11 +969,13 @@ 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
@@ -1128,7 +1130,9 @@ 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
@@ -1402,6 +1406,8 @@ 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
@@ -1487,6 +1493,14 @@ 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
@@ -1757,6 +1771,7 @@ files:
 - 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
@@ -1825,6 +1840,7 @@ 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
@@ -1842,6 +1858,9 @@ 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
@@ -1906,6 +1925,7 @@ 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
@@ -1971,6 +1991,11 @@ 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
@@ -1988,6 +2013,10 @@ 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
@@ -2851,8 +2880,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
@@ -2883,6 +2917,8 @@ 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
@@ -2931,6 +2967,10 @@ 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