spree_cm_commissioner 2.1.9.pre.pre2 → 2.2.0

data/config/locales/en.yml

@@ -1,6 +1,14 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
+  views:
+    manage_team:
+      add:
+        user_not_found: "User not found"
+        user_assigned_successfully: "User assigned successfully"
+      create:
+        user_already_exists: "A user with this email already exists"
+        success: "User created and assigned successfully"
   account_checker:
     verify:
       already_exist: "%{login} already exist"
@@ -183,6 +191,18 @@ en:
     riel: "៛"
 
   spree:
+    registered_by:
+      system_registered: "System Registered"
+      self_registered: "Self Registered"
+    registration_source: "Registration source"
+    service_types:
+      organizer: "Organizer"
+      transit: "Transit"
+      intercity_taxi: "Intercity Taxi"
+    service_type: "Service Type"
+    primary_service_type: "Primary Service Type"
+    select_service_type: "Select Service Type"
+    add_on: "Add-Ons"
     cancel: "Cancel"
     confirm: "Confirm"
     logo: "Logo"

data/config/locales/km.yml

@@ -2,6 +2,14 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 km:
+  views:
+    manage_team:
+      add:
+        user_not_found: "រកមិនឃើញអ្នកប្រើប្រាស់"
+        user_assigned_successfully: "បានចាត់តាំងអ្នកប្រើប្រាស់ដោយជោគជ័យ"
+      create:
+        user_already_exists: "មានអ្នកប្រើប្រាស់អ៊ីមែលនេះរួចហើយ"
+        success: "បានបង្កើត និងចាត់តាំងអ្នកប្រើប្រាស់ដោយជោគជ័យ"
   account_checker:
     verify:
       already_exist: "%{login} already exist"
@@ -171,6 +179,18 @@ km:
     riel: "៛"
 
   spree:
+    registered_by:
+      system_registered: "ចុះឈ្មោះដោយប្រព័ន្ធ"
+      self_registered: "ចុះឈ្មោះដោយខ្លួនឯង"
+    registration_source: "ប្រភេទការចុះឈ្មោះ"
+    service_types:
+      organizer: "Organizer"
+      transit: "Transit"
+      intercity_taxi: "Intercity Taxi"
+    service_type: "ប្រភេទសេវាកម្ម"
+    primary_service_type: "ប្រភេទសេវាកម្មចម្បង"
+    select_service_type: "ជ្រើសរើសប្រភេទសេវាកម្ម"
+    add_on: "ផ្នែកបន្ថែម"
     km: "ភាសារខ្មែរ"
     date_of_birth: "ថ្ងៃខែឆ្នាំកំណើត"
     kind: "ប្រភេទ"

data/db/migrate/20250911042815_create_cm_routes.rb

@@ -0,0 +1,16 @@
+class CreateCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_routes, if_not_exists: true do |t|
+      t.string :route_name
+      t.integer :origin_place_id
+      t.integer :destination_place_id
+      t.integer :order_count, default: 0
+      t.integer :trip_count, default: 0
+      t.integer :fulfilled_order_count, default: 0
+      t.integer :lock_version, default: 0, null: false
+      t.timestamps
+    end
+
+    add_index :cm_routes, [:origin_place_id, :destination_place_id], unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250911045649_create_cm_vendor_routes.rb

@@ -0,0 +1,12 @@
+class CreateCmVendorRoutes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_vendor_routes, if_not_exists: true do |t|
+      t.integer :trip_count, default: 0
+
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }, null: false
+      t.references :route, foreign_key: { to_table: :cm_routes }, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20251008064344_add_route_id_to_cm_trips.rb

@@ -0,0 +1,7 @@
+class AddRouteIdToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_trips, :route_id)
+      add_reference :cm_trips, :route, foreign_key: { to_table: :cm_routes }, null: true
+    end
+  end
+end

data/db/migrate/20251009033331_add_registered_by_to_spree_users.rb

@@ -0,0 +1,6 @@
+class AddRegisteredByToSpreeUsers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_users, :registered_by, :integer, default: 0, if_not_exists: true
+    add_index :spree_users, :registered_by, if_not_exists: true
+  end
+end

data/db/migrate/20251009073040_add_lock_version_to_cm_routes.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_routes, :lock_version, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

data/db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToCmVendorRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_vendor_routes, :lock_version, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/engine.rb

@@ -13,6 +13,10 @@ module SpreeCmCommissioner
       Config = Configuration.new
     end
 
+    initializer 'spree_cm_commissioner.spree_auth', after: 'spree.auth.environment' do |_app|
+      Spree::Auth::Config[:confirmable] = true
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :cm_route, class: 'SpreeCmCommissioner::Route' do
+    sequence(:route_name) { |n| "Route #{n}" }
+    origin_place_id { create(:cm_place).id }
+    destination_place_id { create(:cm_place).id }
+    trip_count { 0 }
+    order_count { 0 }
+    fulfilled_order_count { 0 }
+  end
+end

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

@@ -10,5 +10,6 @@ FactoryBot.define do
     association :vehicle, factory: :cm_vehicle
     association :origin_place, factory: :cm_place
     association :destination_place, factory: :cm_place
+    association :route, factory: :cm_route
   end
 end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_vendor_route, class: 'SpreeCmCommissioner::VendorRoute' do
+    association :route, factory: :cm_route
+    association :vendor
+    trip_count { 0 }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.9-pre2'.freeze
+  VERSION = '2.2.0'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -1,6 +1,7 @@
 require 'spree'
 require 'spree_api_v1'
 require 'spree_backend'
+require 'spree_emails'
 require 'spree_auth_devise'
 require 'spree_multi_vendor'
 require 'blazer'
@@ -52,23 +53,16 @@ require 'byebug' if Rails.env.development? || Rails.env.test?
 
 module SpreeCmCommissioner
   class << self
-    # Allows overriding the default Redis connection pools with custom ones
-    attr_writer :inventory_redis_pool, :external_integrations_redis_pool
+    # Allows overriding the default Redis connection pool with a custom one
+    attr_writer :redis_pool
 
-    # Inventory Redis pool for inventory management
-    def inventory_redis_pool
-      @inventory_redis_pool ||= default_redis_pool
+    def redis_pool
+      @redis_pool ||= default_redis_pool
     end
 
-    # External integrations Redis pool for external API integrations
-    def external_integrations_redis_pool
-      @external_integrations_redis_pool ||= default_redis_pool
-    end
-
-    # Resets all Redis pools, useful for testing or reinitialization
-    def reset_redis_pools
-      @inventory_redis_pool = nil
-      @external_integrations_redis_pool = nil
+    # Resets the Redis pool, useful for testing or reinitialization
+    def reset_redis_pool
+      @redis_pool = nil
     end
 
     private

data/lib/tasks/backfill_confirmed_at.rake

@@ -0,0 +1,21 @@
+namespace :spree_cm_commissioner do
+  namespace :users do
+    desc 'Backfill confirmed_at for spree_users where NULL'
+    task backfill_confirmed_at: :environment do
+      batch_size = 1000
+      scope = Spree::User.where(confirmed_at: nil)
+      total = scope.count
+      puts "Users to backfill: #{total}"
+
+      updated = 0
+      scope.in_batches(of: batch_size) do |relation|
+        relation.find_each do |user|
+          user.update!(confirmed_at: Time.zone.now)
+          updated += 1
+        end
+      end
+
+      puts("Updated #{updated} users")
+    end
+  end
+end

data/spree_cm_commissioner.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree', spree_opts
   s.add_dependency 'spree_api_v1', spree_opts # latest spree_multi_vendor 2.4.0 still depends on the Spree v1 API
   s.add_dependency 'spree_auth_devise', spree_opts
+  s.add_dependency 'spree_emails', spree_opts
   s.add_dependency 'spree_backend', spree_opts
   s.add_dependency 'spree_multi_vendor', '>= 2.4.1'
   s.add_dependency 'spree_extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.9.pre.pre2
+  version: 2.2.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-15 00:00:00.000000000 Z
+date: 2025-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.5.0
+- !ruby/object:Gem::Dependency
+  name: spree_emails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
@@ -1163,6 +1177,7 @@ files:
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
+- app/interactors/spree_cm_commissioner/guest_dynamic_field_notification_sender.rb
 - app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
 - app/interactors/spree_cm_commissioner/guest_seat_updater.rb
@@ -1219,6 +1234,8 @@ files:
 - app/interactors/spree_cm_commissioner/subscriptions_order_cron_executor.rb
 - app/interactors/spree_cm_commissioner/subscriptions_prepaid_order_creator.rb
 - app/interactors/spree_cm_commissioner/taxi_trip_creator.rb
+- app/interactors/spree_cm_commissioner/team_member_adder.rb
+- app/interactors/spree_cm_commissioner/team_member_creator.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb
@@ -1249,6 +1266,7 @@ files:
 - app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb
 - app/interactors/spree_cm_commissioner/user_telegram_web_app_authenticator.rb
 - app/interactors/spree_cm_commissioner/user_vattanac_bank_web_app_authenticator.rb
+- app/interactors/spree_cm_commissioner/user_vendor_assigner.rb
 - app/interactors/spree_cm_commissioner/variant_block_updater.rb
 - app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb
 - app/interactors/spree_cm_commissioner/vehicle_updater.rb
@@ -1298,6 +1316,11 @@ files:
 - app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_notification_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_start_message_sender_job.rb
+- app/jobs/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_job.rb
+- app/jobs/spree_cm_commissioner/transit/route_order_count_incrementer_job.rb
+- app/jobs/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_job.rb
+- app/jobs/spree_cm_commissioner/transit/route_trip_count_decrementer_job.rb
+- app/jobs/spree_cm_commissioner/transit/route_trip_count_incrementer_job.rb
 - app/jobs/spree_cm_commissioner/unique_device_token_cron_job.rb
 - app/jobs/spree_cm_commissioner/variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/vendor_job.rb
@@ -1331,8 +1354,11 @@ files:
 - app/models/concerns/spree_cm_commissioner/phone_number_sanitizer.rb
 - app/models/concerns/spree_cm_commissioner/product_delegation.rb
 - app/models/concerns/spree_cm_commissioner/product_type.rb
+- app/models/concerns/spree_cm_commissioner/route_order_countable.rb
+- app/models/concerns/spree_cm_commissioner/route_trip_count_callbacks.rb
 - app/models/concerns/spree_cm_commissioner/route_type.rb
 - app/models/concerns/spree_cm_commissioner/service_calendar_type.rb
+- app/models/concerns/spree_cm_commissioner/service_type.rb
 - app/models/concerns/spree_cm_commissioner/store_metadata.rb
 - app/models/concerns/spree_cm_commissioner/store_preference.rb
 - app/models/concerns/spree_cm_commissioner/taxon_kind.rb
@@ -1470,6 +1496,7 @@ files:
 - app/models/spree_cm_commissioner/reserved_block.rb
 - app/models/spree_cm_commissioner/role_decorator.rb
 - app/models/spree_cm_commissioner/role_permission.rb
+- app/models/spree_cm_commissioner/route.rb
 - app/models/spree_cm_commissioner/s3_presigned_url.rb
 - app/models/spree_cm_commissioner/s3_presigned_url_builder.rb
 - app/models/spree_cm_commissioner/saved_guest.rb
@@ -1537,6 +1564,7 @@ files:
 - app/models/spree_cm_commissioner/vendor_photo.rb
 - app/models/spree_cm_commissioner/vendor_place.rb
 - app/models/spree_cm_commissioner/vendor_promotion_rule.rb
+- app/models/spree_cm_commissioner/vendor_route.rb
 - app/models/spree_cm_commissioner/vendor_web_promotion_banner.rb
 - app/models/spree_cm_commissioner/video.rb
 - app/models/spree_cm_commissioner/video_on_demand.rb
@@ -1550,6 +1578,7 @@ files:
 - app/notifications/delivery_methods/database_decorator.rb
 - app/notifications/noticed_fcm_base.rb
 - app/notifications/spree_cm_commissioner/customer_content_notification.rb
+- app/notifications/spree_cm_commissioner/guest_dynamic_field_notification.rb
 - app/notifications/spree_cm_commissioner/order_accepted_notification.rb
 - app/notifications/spree_cm_commissioner/order_complete_notification.rb
 - app/notifications/spree_cm_commissioner/order_rejected_notification.rb
@@ -1661,6 +1690,7 @@ files:
 - app/overrides/spree/admin/users/_form/fields.html.erb.deface
 - app/overrides/spree/admin/users/_form/profile_pic.html.erb.deface
 - app/overrides/spree/admin/users/_form/roles_fields.html.erb.deface
+- app/overrides/spree/admin/users/_form/user_add_on.html.erb.deface
 - app/overrides/spree/admin/users/_tabs/tabs.html.erb.deface
 - app/overrides/spree/admin/users/index/body.html.erb.deface
 - app/overrides/spree/admin/users/index/headers.html.erb.deface
@@ -1916,9 +1946,16 @@ files:
 - app/services/spree_cm_commissioner/role_permissions_loader.rb
 - app/services/spree_cm_commissioner/rsa_service.rb
 - app/services/spree_cm_commissioner/seeds/roles_decorator.rb
+- app/services/spree_cm_commissioner/transit/base_route_order_metrics_updater.rb
 - app/services/spree_cm_commissioner/transit/legs_builder_service.rb
+- app/services/spree_cm_commissioner/transit/route_fulfilled_order_count_incrementer_service.rb
+- app/services/spree_cm_commissioner/transit/route_order_count_incrementer_service.rb
+- app/services/spree_cm_commissioner/transit/route_previous_trip_count_decrementer_service.rb
+- app/services/spree_cm_commissioner/transit/route_trip_count_decrementer_service.rb
+- app/services/spree_cm_commissioner/transit/route_trip_count_incrementer_service.rb
 - 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/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
@@ -2771,6 +2808,8 @@ files:
 - db/migrate/20250827083828_add_unique_index_on_guest_id_check_in_session_id_to_cm_check_ins.rb
 - db/migrate/20250902092904_add_section_to_cm_product_dynamic_fields.rb
 - db/migrate/20250903085931_add_importable_to_cm_imports.rb
+- db/migrate/20250911042815_create_cm_routes.rb
+- db/migrate/20250911045649_create_cm_vendor_routes.rb
 - db/migrate/20250911100738_drop_cm_variant_blocks.rb
 - db/migrate/20250911100835_add_variant_id_to_cm_blocks.rb
 - db/migrate/20250911174607_add_metadata_columns_to_cm_vehicles.rb
@@ -2778,6 +2817,10 @@ files:
 - db/migrate/20250912084944_add_send_type_to_sms_log.rb
 - db/migrate/20250930094228_add_application_id_to_cm_pin_codes.rb
 - db/migrate/20250930100657_add_settings_to_spree_oauth_applications.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
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -2857,6 +2900,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/role.rb
 - lib/spree_cm_commissioner/test_helper/factories/role_permission_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/route_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/saved_guest_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb
@@ -2886,6 +2930,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/vendor_logo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_photo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/vendor_route_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/video_on_demand_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_rule_factory.rb
@@ -2895,6 +2940,7 @@ files:
 - lib/spree_cm_commissioner/trip_result.rb
 - lib/spree_cm_commissioner/user_session_jwt_token.rb
 - lib/spree_cm_commissioner/version.rb
+- lib/tasks/backfill_confirmed_at.rake
 - lib/tasks/create_default_non_permanent_inventory_items.rake
 - lib/tasks/customer_notification_cron_scheduler.rake
 - lib/tasks/ensure_correct_product_type.rake
@@ -2938,9 +2984,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