spree_cm_commissioner 2.9.4 → 2.9.6

data/app/views/spree/admin/tenants/_form.html.erb

@@ -34,7 +34,7 @@
       <% end %>
     <% end %>
   </div>
-  <div class="col-12">
+  <div class="col-6">
     <%= f.field_container :host do %>
       <%= f.label :host, raw(Spree.t(:host) + required_span_tag) %>
       <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'example.com' %>
@@ -43,6 +43,18 @@
       <% end %>
     <% end %>
   </div>
+  <div class="col-6">
+    <%= f.field_container :payment_host do %>
+      <%= f.label :payment_host, raw(Spree.t(:payment_host)) %>
+      <span class="text-muted" style="font-size: 0.875rem; font-weight: normal; margin-left: 8px;">(eg. server.example.com)</span>
+      <span title="When set, this tenant's payment URLs (ABA callback + iframe pages) point directly at this host instead of routing through the tenant's client domain."
+            style="cursor: help; margin-left: 4px;">&#9432;</span>
+      <%= f.text_field :payment_host, class: 'form-control', placeholder: 'server.example.com' %>
+      <% if f.object.errors[:payment_host].any? %>
+        <div class="error text-danger"><%= f.object.errors[:payment_host].join(', ') %></div>
+      <% end %>
+    <% end %>
+  </div>
   <div class="col-6">
     <%= f.field_container :state do %>
       <%= f.label :state, raw(Spree.t(:state)) %>

data/config/locales/en.yml

@@ -77,7 +77,11 @@ en:
     action_not_matched: "Action is not matched"
 
   turnstile:
+    token_missing: "Verification token is missing"
     verification_failed: "Human verification failed. Please try again."
+    token_expired: "Verification expired. Please try again."
+    invalid_token: "Verification token is invalid. Please try again."
+    service_unavailable: "Verification service is temporarily unavailable. Please try again shortly."
 
   taxon:
     icon: Icon (Square)
@@ -244,6 +248,7 @@ en:
     no_internal_note: "No note"
     save_internal_note: "Save Note"
     internal_note_updated: "Internal note updated"
+    payment_host: "Payment Host"
     voting_contestant_advancer:
       reversion_error: "Cannot eliminate here yet. This contestant appears in a later session."
     is_open_dated: "Is Open Dated Trip?"
@@ -538,6 +543,12 @@ en:
       already_checked_in: "Guest has already checked in for this session"
       check_in_session_required: "Check-in session required"
       check_in_session_is_not_allowed_or_invalid: "Check-in session is not allowed or invalid for this guest/ticket"
+      check_in_group_not_allowed: "This ticket is not in your check-in group"
+      order_canceled: "Cannot check in guest from a cancelled order"
+      guest_locked: "Guest is locked and cannot be checked in"
+      guest_transferred: "Guest has been transferred and cannot be checked in"
+    check_in_session:
+      end_time_after_start_time: "End time must be after start time"
     load_test:
       nav_label: "Load Testing"
       back_to_load_testing: "Back to Load Testing"
@@ -671,9 +682,7 @@ en:
             paid_votes_amount:
               less_than_used: "cannot be less than paid votes used (%{used})"
         spree_cm_commissioner/tenant:
-          attributes:
-            host:
-              format: "must not include protocol (http:// or https://)"
+          format: "must not include protocol (http:// or https://)"
 
   mail:
     order_mailer:
@@ -907,10 +916,6 @@ en:
         past_date: "Cannot redeem for a past date"
         return_before_outbound: "Return date must be after the outbound trip date"
         trip_not_available: "Trip is not available for redemption"
-  turnstile:
-    token_missing: "Verification token is missing"
-    verification_failed: "Human verification failed"
-    service_unavailable: "Verification service is temporarily unavailable"
   spree_cm_commissioner:
     draft_order:
       line_items_missing: "Line items are missing"

data/config/locales/km.yml

@@ -26,6 +26,10 @@ km:
     already_checked_in: "ភ្ញៀវបានចូលរួចហើយ"
     check_in_session_required: "ត្រូវតែមានវគ្គចុះឈ្មោះចូល"
     check_in_session_is_not_allowed_or_invalid: "វគ្គចុះឈ្មោះនេះមិនត្រឹមត្រូវ សម្រាប់ភ្ញៀវ ឬសំបុត្រនេះទេ"
+    check_in_group_not_allowed: "សំបុត្រនេះមិនស្ថិតក្នុងក្រុមចុះឈ្មោះចូលរបស់អ្នកទេ"
+    order_canceled: "មិនអាចចុះឈ្មោះចូលភ្ញៀវពីការបញ្ជាទិញដែលបានលុបចោលបានទេ"
+    guest_locked: "ភ្ញៀវត្រូវបានចាក់សោ មិនអាចចុះឈ្មោះចូលបានទេ"
+    guest_transferred: "ភ្ញៀវត្រូវបានផ្ទេរ មិនអាចចុះឈ្មោះចូលបានទេ"
 
   sms:
     to:
@@ -200,11 +204,14 @@ km:
     riel: "៛"
 
   spree:
+    check_in_session:
+      end_time_after_start_time: "កាលបរិច្ឆេទបញ្ចប់ត្រូវតែក្រោយកាលបរិច្ឆេទចាប់ផ្តើម"
     internal_note: "ចំណាំផ្ទៃក្នុង"
     add_internal_note: "បន្ថែមចំណាំ"
     no_internal_note: "គ្មានចំណាំ"
     save_internal_note: "រក្សាទុកចំណាំ"
     internal_note_updated: "បានរក្សាទុកចំណាំផ្ទៃក្នុង"
+    payment_host: "ម៉ាស៊ីនមេទូទាត់ប្រាក់"
     voting_contestant_advancer:
       reversion_error: "មិនអាចដកចេញនៅវគ្គនេះបានទេ។ បេក្ខជននេះមាននៅវគ្គបោះឆ្នោតក្រោយ។"
     registered_by:
@@ -441,9 +448,7 @@ km:
             paid_votes_amount:
               less_than_used: "មិនអាចតូចជាងចំនួនសំឡេងបង់ប្រាក់ដែលបានប្រើ (%{used})"
         spree_cm_commissioner/tenant:
-          attributes:
-            host:
-              format: "មិនអនុញ្ញាតឱ្យបញ្ចូលឈ្មោះដែលភ្ជាប់ជាមួយ (http:// ឬ https://)"
+          format: "មិនអនុញ្ញាតឱ្យបញ្ចូលឈ្មោះដែលភ្ជាប់ជាមួយ (http:// ឬ https://)"
 
   mail:
     order_mailer:
@@ -665,7 +670,10 @@ km:
 
   turnstile:
     token_missing: "សញ្ញាណផ្ទៀងផ្ទាត់គឺបាត់"
-    service_unavailable: "សេវាកម្មពេលនេះមិនមានការផ្ទៀងផ្ទាត់"
+    verification_failed: "ការផ្ទៀងផ្ទាត់មនុស្សបានបរាជ័យ។ សូមព្យាយាមម្តងទៀត។"
+    token_expired: "ការផ្ទៀងផ្ទាត់បានផុតកំណត់។ សូមព្យាយាមម្តងទៀត។"
+    invalid_token: "សញ្ញាណផ្ទៀងផ្ទាត់មិនត្រឹមត្រូវ។ សូមព្យាយាមម្តងទៀត។"
+    service_unavailable: "សេវាកម្មផ្ទៀងផ្ទាត់បច្ចុប្បន្នមិនអាចប្រើបានទេ។ សូមព្យាយាមម្តងទៀតក្នុងពេលឆាប់ៗនេះ។"
 
   spree_cm_commissioner:
     draft_order:

data/config/routes.rb

@@ -642,6 +642,7 @@ Spree::Core::Engine.add_routes do
           resources :voting_contestants, only: :index
           resources :voting_credits, only: :index
           resources :votes, only: %i[create index]
+          resource :my_votes, only: :show, controller: :my_votes
         end
 
         resources :voting_credit_transactions, only: :index

data/db/migrate/20260720000001_add_check_in_fields_to_spree_roles.rb

@@ -0,0 +1,11 @@
+class AddCheckInFieldsToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    # A check-in group is a Spree::Role (role_type :check_in) scoped to one event via event_id.
+    add_column :spree_roles, :event_id, :bigint, if_not_exists: true
+    add_index :spree_roles, :event_id, if_not_exists: true
+
+    # 0 = all (check in every ticket, the default), 1 = include (only the group's listed tickets),
+    # 2 = exclude (all except them).
+    add_column :spree_roles, :check_in_mode, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

data/db/migrate/20260723000000_add_payment_host_to_cm_tenants.rb

@@ -0,0 +1,6 @@
+class AddPaymentHostToCmTenants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_tenants, :payment_host, :string, if_not_exists: true
+    add_index :cm_tenants, :payment_host, if_not_exists: true
+  end
+end

data/db/migrate/20260723000001_add_metadata_to_spree_roles.rb

@@ -0,0 +1,11 @@
+class AddMetadataToSpreeRoles < ActiveRecord::Migration[7.0]
+  def up
+    add_column :spree_roles, :public_metadata, :jsonb, default: '{}', if_not_exists: true
+    add_column :spree_roles, :private_metadata, :jsonb, default: '{}', if_not_exists: true
+  end
+
+  def down
+    remove_column :spree_roles, :public_metadata, if_exists: true
+    remove_column :spree_roles, :private_metadata, if_exists: true
+  end
+end

data/db/migrate/20260728074153_add_role_to_cm_exports.rb

@@ -0,0 +1,5 @@
+class AddRoleToCmExports < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_exports, :role, foreign_key: { to_table: :spree_roles }, index: true, if_not_exists: true
+  end
+end

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

@@ -3,7 +3,7 @@ FactoryBot.define do
     sequence(:name) { |n| "vehicle_#{n}" }
     sequence(:license_plate) { |n| "2KH-#{'%04d' % (n % 10000)}" }
     kind { :air_bus }
-    association :vendor, factory: :vendor
+    vendor { |v| v.association(:cm_vendor) }
     association :vehicle_type, factory: :cm_vehicle_type
   end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.9.4'.freeze
+  VERSION = '2.9.6'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.6
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-22 00:00:00.000000000 Z
+date: 2026-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1071,6 +1071,7 @@ files:
 - app/controllers/spree/api/v2/tenant/intercity_taxi/distance_calculator_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/my_votes_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
@@ -1472,6 +1473,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/order_holdable.rb
 - app/models/concerns/spree_cm_commissioner/order_integration.rb
+- app/models/concerns/spree_cm_commissioner/order_qr_codeable.rb
 - app/models/concerns/spree_cm_commissioner/order_scopes.rb
 - app/models/concerns/spree_cm_commissioner/order_state_machine.rb
 - app/models/concerns/spree_cm_commissioner/parameterize_name.rb
@@ -1958,6 +1960,7 @@ files:
 - app/queries/spree_cm_commissioner/tickets_searcher_query.rb
 - app/queries/spree_cm_commissioner/trip_query.rb
 - app/queries/spree_cm_commissioner/trip_seat_layout_query.rb
+- app/queries/spree_cm_commissioner/user_votes_per_contestant_query.rb
 - 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
@@ -2040,6 +2043,7 @@ files:
 - 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/my_vote_serializer.rb
 - app/serializers/spree/v2/tenant/notification_serializer.rb
 - app/serializers/spree/v2/tenant/option_type_serializer.rb
 - app/serializers/spree/v2/tenant/option_value_serializer.rb
@@ -3450,6 +3454,10 @@ files:
 - db/migrate/20260708150000_add_name_and_short_name_to_cm_trips.rb
 - db/migrate/20260713022227_add_advanced_to_episode_id_to_cm_voting_contestants.rb
 - db/migrate/20260714002626_rename_data_fill_stage_phase_on_cm_guests.rb
+- db/migrate/20260720000001_add_check_in_fields_to_spree_roles.rb
+- db/migrate/20260723000000_add_payment_host_to_cm_tenants.rb
+- db/migrate/20260723000001_add_metadata_to_spree_roles.rb
+- db/migrate/20260728074153_add_role_to_cm_exports.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md