spree_cm_commissioner 2.3.0.pre.pre16 → 2.3.0.pre.pre17

data/config/locales/km.yml

@@ -466,3 +466,67 @@ km:
   event_blazer_queries:
     success: "បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ"
     fail: "បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs"
+
+  blazer:
+    columns:
+      'No.': "លេខរៀង"
+      'Reservation No.': "លេខកក់"
+      'Direction': "ទិសដៅ"
+      'Vehicle type': "ប្រភេទយានយន្ត"
+      'Seller': "អ្នកលក់"
+      'Paid to': "បង់ទៅ"
+      'Branch': "សាខា"
+      'Gateway': "ច្រកទ្វារ"
+      'Departure': "ចេញដំណើរ"
+      'Issued': "ចេញឲ្យ"
+      'Paid': "បានបង់"
+      '# of seats': "ចំនួនកៅអី"
+      'Source': "ប្រភព"
+      'Status': "ស្ថានភាព"
+      'Fare': "តម្លៃឈ្នួល"
+      'Discount': "ការបញ្ចុះតម្លៃ"
+      'Commission': "កម្រៃជើងសារ"
+      'Amount': "ចំនួនទឹកប្រាក់"
+      'Metric': "រង្វាស់"
+      'Value': "តម្លៃ"
+      'Group': "ក្រុម"
+      'Orders': "ការបញ្ជាទិញ"
+      'Passengers': "អ្នកដំណើរ"
+      'Total fare': "តម្លៃឈ្នួលសរុប"
+      'Total discount': "ការបញ្ចុះតម្លៃសរុប"
+      'Total commission': "កម្រៃជើងសារសរុប"
+      'Total amount': "ចំនួនទឹកប្រាក់សរុប"
+      'Trip ID': "លេខសម្គាល់ជើងដំណើរ"
+      'Route': "ផ្លូវ"
+      'Origin': "ទីតាំងដើម"
+      'Destination': "ទីតាំងគោលដៅ"
+      'Departure Time': "ម៉ោងចេញដំណើរ"
+      'Vehicle': "យានយន្ត"
+      'Total Seats': "ចំនួនកៅអីសរុប"
+      'Bookings': "ការកក់"
+      'Seats Sold': "កៅអីលក់បាន"
+      'Occupancy %': "ភាគរយនៃការកាន់កាប់"
+      'Total Revenue': "ចំណូលសរុប"
+      'Avg Ticket Price': "តម្លៃសំបុត្រជាមធ្យម"
+      'Date': "កាលបរិច្ឆេទ"
+      'Time': "ម៉ោង"
+      'From': "ពី"
+      'To': "ទៅ"
+      'Capacity': "ចំណុះ"
+      'Available': "ទំនេរ"
+      'Filled %': "ភាគរយនៃការបំពេញ"
+      'Vehicle Code': "លេខកូដយានយន្ត"
+      'Plate': "ស្លាកលេខ"
+      'Type': "ប្រភេទ"
+      'Total Trips': "ចំនួនជើងដំណើរ​សរុប"
+      'Trips with Bookings': "ជើងដំណើរ​មានការកក់"
+      'Total Bookings': "ចំនួនការកក់​សរុប"
+      'Total Passengers': "ចំនួនអ្នកដំណើរ​សរុប"
+      'Avg Occupancy %': "ភាគរយនៃការកាន់កាប់​ជាមធ្យម"
+      'Lead Time': "រយៈពេលនៃការរង់ចាំ"
+      'Revenue': "ចំណូល"
+      'Avg Days in Advance': "ចំនួនថ្ងៃជាមធ្យមមុន"
+      'Current Period': "រយៈពេលបច្ចុប្បន្ន"
+      'Previous Period': "រយៈពេលមុន"
+      'Change': "បំលាស់ប្តូរ"
+      'Change %': "ភាគរយនៃបំលាស់ប្តូរ"

data/config/routes.rb

@@ -1,7 +1,7 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
 
-  authenticate :spree_user, -> (user) { user.admin? || user.organizer? } do
+  authenticate :spree_user, -> (user) { user.admin? || user.organizer? || user.vendors.exists? } do
     mount Blazer::Engine, at: 'admin/bi_reports'
   end
 
@@ -684,6 +684,9 @@ Spree::Core::Engine.add_routes do
         namespace :transit do
           resources :draft_orders, only: %i[create]
         end
+        namespace :intercity_taxi do
+          resources :draft_orders, only: %i[create update]
+        end
       end
 
       namespace :operator do

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

@@ -153,6 +153,24 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
+    trait :color do
+      attr_type { :string }
+      name { 'color' }
+      presentation { 'color' }
+    end
+
+    trait :ticket_type do
+      attr_type { :string }
+      name { 'ticket-type' }
+      presentation { 'ticket-type' }
+    end
+
+    trait :seat_type do
+      attr_type { :string }
+      name { 'seat-type' }
+      presentation { 'seat-type' }
+    end
+
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

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

@@ -12,4 +12,34 @@ FactoryBot.define do
     association :destination_place, factory: :cm_place
     association :route, factory: :cm_route
   end
+
+  factory :cm_trip_with_seat_counts, parent: :cm_trip do
+    after(:create) do |trip, evaluator|
+      seat_option_type = create(:cm_option_type, name: 'seat-type')
+      sleeping_seat = create(
+        :cm_option_value,
+        name: 'sleeping',
+        option_type: seat_option_type
+      )
+
+      tomorrow = Date.current + 1.day
+      trip.product.option_types << seat_option_type
+      trip.product.save!
+
+      trip.product.variants.create!(
+        option_values: [sleeping_seat],
+        price: 20.0
+      )
+
+      trip.variants.each do |variant|
+        create(
+          :cm_inventory_item,
+          variant: variant,
+          inventory_date: tomorrow,
+          quantity_available: 10,
+          max_capacity: 45
+        )
+      end
+    end
+  end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -36,5 +36,20 @@ module SpreeCmCommissioner
 
       departure_time + duration.seconds
     end
+
+    # Enable serializer-level caching (like ActiveRecord's cache_key_with_version)
+    # Create a version hash based on attributes that matter for caching
+    def cache_key_with_version
+      version_parts = [
+        id,
+        price,
+        quantity_available,
+        max_capacity,
+        departure_time&.to_i
+      ].compact.join('-')
+
+      version_hash = Digest::MD5.hexdigest(version_parts)
+      "trip_results/#{id}-#{version_hash}"
+    end
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre16'.freeze
+  VERSION = '2.3.0-pre17'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre16
+  version: 2.3.0.pre.pre17
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-01 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -953,6 +953,7 @@ files:
 - app/controllers/spree/api/v2/storefront/homepage_data_controller.rb
 - app/controllers/spree/api/v2/storefront/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/storefront/id_cards_controller.rb
+- app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/inventory_items_controller.rb
 - app/controllers/spree/api/v2/storefront/line_item_qrs_controller.rb
 - app/controllers/spree/api/v2/storefront/line_items_controller.rb
@@ -1117,6 +1118,7 @@ files:
 - app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/order_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/telegram_message_factory.rb
+- app/factory/spree_cm_commissioner/vendor_telegram_message_factory.rb
 - app/finders/spree_cm_commissioner/accommodations/find.rb
 - app/finders/spree_cm_commissioner/accommodations/find_variant.rb
 - app/finders/spree_cm_commissioner/orders/find.rb
@@ -1273,6 +1275,7 @@ files:
 - 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
+- app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb
 - app/interactors/spree_cm_commissioner/vendor_nearby_place_builder.rb
 - app/interactors/spree_cm_commissioner/vendor_updater.rb
 - app/interactors/spree_cm_commissioner/video_on_demand_creator.rb
@@ -1329,6 +1332,7 @@ files:
 - 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_creation_telegram_alert_sender_job.rb
 - app/jobs/spree_cm_commissioner/vendor_job.rb
 - app/jobs/spree_cm_commissioner/waiting_guests_caller_job.rb
 - app/jobs/spree_cm_commissioner/waiting_room_latest_system_metadata_puller_job.rb
@@ -1876,6 +1880,8 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_banner_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_data_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/icon_serializer_decorator.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/intercity_taxi_cart_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/intercity_taxi_line_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/inventory_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/menu_item_serializer_decorator.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/payment_method_group_serializer.rb
@@ -1942,6 +1948,8 @@ files:
 - app/services/spree_cm_commissioner/imports/base_import_order_service.rb
 - app/services/spree_cm_commissioner/imports/create_order_service.rb
 - app/services/spree_cm_commissioner/imports/update_order_service.rb
+- app/services/spree_cm_commissioner/intercity_taxi_order/create.rb
+- app/services/spree_cm_commissioner/intercity_taxi_order/update.rb
 - app/services/spree_cm_commissioner/metafields/product_metadata_service.rb
 - app/services/spree_cm_commissioner/order_params_checker.rb
 - app/services/spree_cm_commissioner/orders/generate_commissions_decorator.rb
@@ -1951,17 +1959,18 @@ files:
 - app/services/spree_cm_commissioner/penalty_calculator.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
+- app/services/spree_cm_commissioner/routes/decrement_previous_trip_count.rb
+- app/services/spree_cm_commissioner/routes/decrement_trip_count.rb
+- app/services/spree_cm_commissioner/routes/increment_fulfilled_order_count.rb
+- app/services/spree_cm_commissioner/routes/increment_order_count.rb
+- app/services/spree_cm_commissioner/routes/increment_trip_count.rb
 - app/services/spree_cm_commissioner/rsa_service.rb
 - app/services/spree_cm_commissioner/seats/bulk_release_on_hold_blocks.rb
 - app/services/spree_cm_commissioner/seats/release_expired_blocks.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/trips/search.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
@@ -2077,6 +2086,7 @@ files:
 - app/views/spree/admin/notifications/index.html.erb
 - app/views/spree/admin/option_types/_array_field.html.erb
 - app/views/spree/admin/option_types/_boolean_field.html.erb
+- app/views/spree/admin/option_types/_color_field.html.erb
 - app/views/spree/admin/option_types/_coordinate_field.html.erb
 - app/views/spree/admin/option_types/_date_field.html.erb
 - app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -2155,6 +2165,7 @@ files:
 - app/views/spree/admin/user_security/show.html.erb
 - app/views/spree/admin/variant_guest_card_classes/_variant_guest_card_class.html.erb
 - app/views/spree/admin/variant_guest_card_classes/index.html.erb
+- app/views/spree/admin/variants/_color_field.html.erb
 - app/views/spree/admin/variants/_date_field.html.erb
 - app/views/spree/admin/variants/_default_field.html.erb
 - app/views/spree/admin/variants/_option_values.html.erb
@@ -2301,6 +2312,7 @@ files:
 - app/views/spree/layouts/error_template.html.erb
 - app/views/spree/layouts/event.html.erb
 - app/views/spree/layouts/transit.html.erb
+- app/views/spree/order_mailer/_adjustment.html.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/ticket_email.html.erb
 - app/views/spree/order_mailer/ticket_email.text.erb