spree_cm_commissioner 2.3.1 → 2.3.2.pre.pre2

data/config/locales/km.yml

@@ -370,6 +370,10 @@ km:
           attributes:
             exception_rules:
               invalid_json: "Format មិនត្រឹមត្រូវ"
+        spree_cm_commissioner/tenant:
+          attributes:
+            host:
+              format: "មិនអនុញ្ញាតឱ្យបញ្ចូលឈ្មោះដែលភ្ជាប់ជាមួយ (http:// ឬ https://)"
 
   mail:
     order_mailer:
@@ -469,64 +473,64 @@ km:
 
   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 %': "ភាគរយនៃបំលាស់ប្តូរ"
+      "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

@@ -163,6 +163,10 @@ Spree::Core::Engine.add_routes do
         collection do
           post :update_positions
         end
+
+        member do
+          delete :remove_banner
+        end
       end
 
       resources :product_places do
@@ -546,6 +550,18 @@ Spree::Core::Engine.add_routes do
         resources :guest_card_classes
         resources :tickets, only: :index
 
+        resources :trip_places, only: :index
+        resources :trip_search, only: [:index]
+        resources :trips, only: %i[show]
+
+        namespace :intercity_taxi do
+          resources :draft_orders, only: [:create] do
+            collection do
+              patch :update
+            end
+          end
+        end
+
         resource :reset_passwords, only: [:update]
         resource :change_passwords, only: [:update]
         resource :user_contacts, only: [:update]
@@ -685,7 +701,11 @@ Spree::Core::Engine.add_routes do
           resources :draft_orders, only: %i[create]
         end
         namespace :intercity_taxi do
-          resources :draft_orders, only: %i[create update]
+          resources :draft_orders, only: [:create] do
+            collection do
+              patch :update
+            end
+          end
         end
       end
 

data/db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb

@@ -0,0 +1,7 @@
+class AddTenantIdToCmVendorPlaces < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_vendor_places, :tenant_id, :integer, if_not_exists: true
+    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/test_helper/factories/product_completion_step_banner_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_product_completion_step_banner, class: SpreeCmCommissioner::ProductCompletionStepBanner do
+    viewable_type { 'SpreeCmCommissioner::ProductCompletionStep' }
+    viewable_id { nil }
+    attachment { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'icon_256x256.png'), 'image/*') }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2025-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1013,6 +1013,7 @@ files:
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
+- app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
@@ -1025,6 +1026,9 @@ files:
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/tickets_controller.rb
+- app/controllers/spree/api/v2/tenant/trip_places_controller.rb
+- app/controllers/spree/api/v2/tenant/trip_search_controller.rb
+- app/controllers/spree/api/v2/tenant/trips_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_contacts_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
@@ -1484,6 +1488,7 @@ files:
 - app/models/spree_cm_commissioner/place.rb
 - app/models/spree_cm_commissioner/price_decorator.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
 - app/models/spree_cm_commissioner/product_completion_steps/social_entry_url.rb
 - app/models/spree_cm_commissioner/product_decorator.rb
@@ -1748,6 +1753,8 @@ files:
 - app/queries/spree_cm_commissioner/users_by_event_fetcher_query.rb
 - app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/application_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/intercity_taxi_draft_order_schema.rb
+- 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/seat_layout_schema.rb
@@ -2101,6 +2108,7 @@ files:
 - app/views/spree/admin/orders/notifications.html.erb
 - app/views/spree/admin/product_commissions/index.html.erb
 - app/views/spree/admin/product_completion_steps/_form.html.erb
+- app/views/spree/admin/product_completion_steps/_supported_fields.html.erb
 - app/views/spree/admin/product_completion_steps/edit.html.erb
 - app/views/spree/admin/product_completion_steps/index.html.erb
 - app/views/spree/admin/product_completion_steps/new.html.erb
@@ -2850,6 +2858,7 @@ files:
 - db/migrate/20251009073040_add_lock_version_to_cm_routes.rb
 - db/migrate/20251009073929_add_lock_version_to_cm_vendor_routes.rb
 - db/migrate/20251113081853_add_index_to_spree_orders_updated_at.rb
+- db/migrate/20251119093000_add_tenant_id_to_cm_vendor_places.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -2922,6 +2931,7 @@ 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/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
 - lib/spree_cm_commissioner/test_helper/factories/products_taxons_factory.rb
@@ -3013,9 +3023,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1