spree_cm_commissioner 2.9.2 → 2.9.4

data/app/services/spree_cm_commissioner/voting_contestants/assigner.rb

@@ -29,12 +29,30 @@ module SpreeCmCommissioner
               )
             end
 
-            @voting_session.voting_contestants.find_or_create_by!(show_contestant: show_contestant) do |voting_contestant|
-              voting_contestant.show_id = @voting_session.show_id
+            voting_contestant = @voting_session.voting_contestants.find_or_create_by!(show_contestant: show_contestant) do |vc|
+              vc.show_id = @voting_session.show_id
             end
+
+            link_pending_episode_advance!(show_contestant, voting_contestant)
           end
         end
       end
+
+      # A contestant advanced "By Episode" (BulkUpdater#advanced_to_attrs with a ShowEpisode
+      # target) only has advanced_to_episode_id set, no specific session yet. Once they're
+      # manually placed into a session of that episode here, resolve the pointer on both sides
+      # so Advancer's reversion/unwind logic (which walks advanced_to_type/id and matches via
+      # advanced_from) works the same as it would for a normal session-to-session mirror.
+      def link_pending_episode_advance!(show_contestant, voting_contestant)
+        source = SpreeCmCommissioner::VotingContestant
+                 .where(show_contestant_id: show_contestant.id, advanced_to_episode_id: @episode.id, advanced_to_id: nil)
+                 .order(id: :desc)
+                 .first
+        return unless source
+
+        source.update!(advanced_to_type: 'SpreeCmCommissioner::VotingSession', advanced_to_id: @voting_session.id)
+        voting_contestant.update!(advanced_from: source.voting_session) if voting_contestant.advanced_from.blank?
+      end
     end
   end
 end

data/app/services/spree_cm_commissioner/voting_contestants/bulk_updater.rb

@@ -85,24 +85,30 @@ module SpreeCmCommissioner
         out
       end
 
-      # Parses "ClassName:id" format into { advanced_to_type:, advanced_to_id: }.
-      # Returns :invalid if the type is not in ALLOWED_ADVANCED_TO_TYPES.
-      # Returns {} (no-op) when the value doesn't include a colon separator.
+      # Parses "ClassName:id:episode_id" into advanced_to_type/id/episode_id attrs.
+      # ShowEpisode targets only mark eligibility (advanced_to_episode_id) rather
+      # than a real session pointer, so type/id are left nil for those.
       def advanced_to_attrs(value)
-        return { advanced_to_type: nil, advanced_to_id: nil } if value.blank?
+        return { advanced_to_type: nil, advanced_to_id: nil, advanced_to_episode_id: nil } if value.blank?
 
         parts = value.to_s.split(':')
-        return {} if parts.size < 2
+        return {} if parts.size < 3
 
+        advanced_to_episode_id = parts.pop.to_i
         advanced_to_id = parts.pop.to_i
         advanced_to_type = parts.join(':')
 
         return :invalid unless ALLOWED_ADVANCED_TO_TYPES.include?(advanced_to_type)
 
-        {
-          advanced_to_id: advanced_to_id,
-          advanced_to_type: advanced_to_type
-        }
+        if advanced_to_type == 'SpreeCmCommissioner::ShowEpisode'
+          { advanced_to_type: nil, advanced_to_id: nil, advanced_to_episode_id: advanced_to_episode_id }
+        else
+          {
+            advanced_to_id: advanced_to_id,
+            advanced_to_type: advanced_to_type,
+            advanced_to_episode_id: advanced_to_episode_id
+          }
+        end
       end
     end
   end

data/app/views/spree/admin/variants/fixture.html.erb

@@ -27,7 +27,7 @@
 
     <p class="text-muted">
       Save this as <code><%= filename %></code> in
-      <code>load_testing/config/fixture/platform/booking_ticket_flow/</code>
+      <code>load_testing/config/fixture/<%= @fixture_workflow %>/<%= @fixture_flow %>/</code>
       (git-ignored).
     </p>
 

data/config/initializers/spree_permitted_attributes.rb

@@ -3,6 +3,9 @@ module Spree
     ATTRIBUTES << :route_attributes unless ATTRIBUTES.include?(:route_attributes)
     mattr_reader :route_attributes
 
+    ATTRIBUTES << :saved_guest_attributes unless ATTRIBUTES.include?(:saved_guest_attributes)
+    mattr_reader :saved_guest_attributes
+
     @@vendor_attributes << :logo
     @@vendor_attributes << :service_origin_id
     @@vendor_attributes << :term_of_use
@@ -144,6 +147,22 @@ module Spree
       terms_and_conditions
     ]
 
+    @@saved_guest_attributes = %i[
+      first_name
+      last_name
+      dob
+      age
+      gender
+      email
+      country_code
+      phone_number
+      intel_phone_number
+      nationality_id
+      occupation_id
+      nationality_group
+      age_group
+    ]
+
     @@product_attributes += %i[
       preview
     ]

data/config/load_test_flows/tenant.yml

@@ -17,6 +17,19 @@ voting_flow:
     note: Resolves show_slug and voting_session_id straight off the voting session you picked.
   doc: tests/tenant/voting_flow/doc.md
 
+topup_vote_flow:
+  description: >-
+    Top-up Vote screen — the organizer picker's "Fixture" button for this generates both the
+    Cash On and ABA (PayWay v2) fixtures at once (see aba_topup_vote_flow / cash_on_topup_vote_flow
+    below for their individual destinations).
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Shows → Season → Episode → Voting Sessions table → row "⋮" menu →
+      Fixture → pick "Topup vote flow"
+    note: One click generates both payment methods' JSON on the same page.
+  doc: tests/tenant/aba_topup_vote_flow/doc.md
+
 aba_topup_vote_flow:
   description: Top-up Vote screen paid via ABA (PayWay v2 sandbox).
   destination: config/fixture/tenant/aba_topup_vote_flow/<env>.json
@@ -44,3 +57,37 @@ cash_on_topup_vote_flow:
       Resolves show_slug, voting_session_id, and payment_method_id off the tenant's active
       Cash On payment method — flags an issue if none is configured yet.
   doc: tests/tenant/cash_on_topup_vote_flow/doc.md
+
+cash_on_booking_ticket_flow:
+  description: >-
+    Homepage → browse tickets → cart → checkout → cash payment → ticket pass (QR). The
+    organizer's "Fixture" button on a ticket variant generates this flow's JSON alongside
+    aba_booking_ticket_flow's on the same page in one click (each has its own destination file).
+  destination: config/fixture/tenant/cash_on_booking_ticket_flow/<env>.json
+  example: config/fixture/tenant/cash_on_booking_ticket_flow/example.json
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Events → pick the event → Tickets → pick the ticket → Variants → the variant's
+      row → "⋮" menu → Fixture
+    note: >-
+      Runs a purchasable readiness check and resolves event_permalink, product_slug, product_id,
+      variant_id, and payment_method_id off the tenant's active Cash On payment method — flags an
+      issue if none is configured yet. Same as the platform flow, tenant ticket products here are
+      organized under an event taxon, so event_permalink is required.
+  doc: tests/tenant/cash_on_booking_ticket_flow/doc.md
+
+aba_booking_ticket_flow:
+  description: Same booking flow as cash_on_booking_ticket_flow, paid via ABA (PayWay v2 sandbox) instead of cash.
+  destination: config/fixture/tenant/aba_booking_ticket_flow/<env>.json
+  example: config/fixture/tenant/aba_booking_ticket_flow/example.json
+  data_button:
+    label: Fixture
+    where: >-
+      Organizer → Events → pick the event → Tickets → pick the ticket → Variants → the variant's
+      row → "⋮" menu → Fixture
+    note: >-
+      Runs a purchasable readiness check and resolves event_permalink, product_slug, product_id,
+      variant_id, payment_method_id, and the payway config off the tenant's active ABA/PayWay
+      payment method — flags an issue if none is configured yet.
+  doc: tests/tenant/aba_booking_ticket_flow/doc.md

data/config/locales/en.yml

@@ -99,11 +99,6 @@ en:
   guest_card_classes:
     empty_info: "No guest card classes information available."
     background_image: "Background Image"
-  guest_dynamic_field:
-    errors:
-      pre_registration_required: "is required before ticket issuance"
-      post_registration_required: "must be completed after purchase"
-      during_check_in_required: "is required during check-in"
   google_wallet:
     note: "Click <b>Create</b> or <b> Update</b> to connect to Google Wallet after filled all information "
     google_wallet_class_created: "Google Wallet class created successfully."
@@ -667,6 +662,8 @@ en:
               advanced_from_session: 'was advanced from a previous session and cannot be removed directly. Clear the advancement in the source session instead.'
               pre_vote_session: 'cannot be removed from a pre-vote session.'
               has_advanced_to_session: 'has been assigned to advance to another session. Clear the advancement first before removing this contestant.'
+            advanced_to_id:
+              same_as_advanced_from: 'cannot be the same as the contestant it was advanced from'
         spree_cm_commissioner/voting_credit:
           attributes:
             free_votes_amount:

data/config/locales/km.yml

@@ -432,6 +432,8 @@ km:
               advanced_from_session: 'ត្រូវបានដំឡើងពី session មុន ហើយមិនអាចដកចេញដោយផ្ទាល់បានទេ។ សូមលុបការដំឡើងនៅក្នុង session ប្រភពជំនួសវិញ។'
               pre_vote_session: 'មិនអាចដកចេញពី pre-vote session បានទេ។'
               has_advanced_to_session: 'ត្រូវបានកំណត់ឱ្យដំឡើងទៅ session មួយទៀត។ សូមលុបការដំឡើងជាមុនសិន មុននឹងដកអ្នកចូលប្រកួតនេះចេញ។'
+            advanced_to_id:
+              same_as_advanced_from: 'មិនអាចដូចនឹងអ្នកចូលប្រកួតដែលវាត្រូវបានដំឡើងចេញពីនោះទេ'
         spree_cm_commissioner/voting_credit:
           attributes:
             free_votes_amount:

data/config/routes.rb

@@ -552,6 +552,7 @@ Spree::Core::Engine.add_routes do
         resource :account_recovers, only: [:update]
         namespace :account do
           resources :orders, controller: :orders, only: %i[index show]
+          resources :saved_guests
         end
 
         resource :cart, controller: :cart, only: %i[show create destroy] do
@@ -712,9 +713,10 @@ Spree::Core::Engine.add_routes do
           resources :guests, only: [] do
             patch 'dynamic_fields/:phase', to: 'guest_dynamic_fields#update_dynamic_field', as: :update_dynamic_fields
           end
+
+          resources :saved_guests
         end
 
-        resources :saved_guests
         resource :s3_signed_urls
         resources :google_wallet_object_tokens
         resources :provinces, only: %i[index]

data/db/migrate/20260713022227_add_advanced_to_episode_id_to_cm_voting_contestants.rb

@@ -0,0 +1,8 @@
+class AddAdvancedToEpisodeIdToCmVotingContestants < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_voting_contestants, :advanced_to_episode,
+                  foreign_key: { to_table: :spree_products },
+                  index: true,
+                  if_not_exists: true
+  end
+end

data/db/migrate/20260714002626_rename_data_fill_stage_phase_on_cm_guests.rb

@@ -0,0 +1,5 @@
+class RenameDataFillStagePhaseOnCmGuests < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :cm_guests, :data_fill_stage_phase, :data_fill_stage
+  end
+end

data/lib/spree_cm_commissioner/version.rb

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

data/lib/tasks/recompute_guest_data_fill_stage.rake

@@ -0,0 +1,19 @@
+# One-off remediation: fixes Guest#data_fill_stage staleness that accumulated before
+# ProductDynamicField/DynamicField config changes had any recompute trigger. Not intended to run
+# on a schedule. Enqueues small batches instead of looping over every guest inline, so this stays
+# safe to run even on a small server or if the invoking process gets interrupted partway through —
+# already-enqueued batches keep processing independently, and re-running is a harmless no-op for
+# guests already corrected.
+namespace :spree_cm_commissioner do
+  desc 'Recompute data_fill_stage for all guests (silent, no notifications).'
+  task recompute_guest_data_fill_stage: :environment do
+    batch_size = ENV.fetch('RECOMPUTE_GUEST_DATA_FILL_STAGE_BATCH_SIZE', '300').to_i
+
+    SpreeCmCommissioner::Guest.in_batches(of: batch_size) do |batch|
+      SpreeCmCommissioner::MaintenanceTasks::GuestDataFillStageBatchJob.perform_later(
+        guest_ids: batch.pluck(:id),
+        notify: false
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-15 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -828,6 +828,7 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/exception_notificable.rb
 - app/controllers/concerns/spree_cm_commissioner/load_test_account_management.rb
 - app/controllers/concerns/spree_cm_commissioner/load_test_account_scope.rb
+- app/controllers/concerns/spree_cm_commissioner/load_test_bypassable.rb
 - app/controllers/concerns/spree_cm_commissioner/load_test_login_token_generation.rb
 - app/controllers/concerns/spree_cm_commissioner/order_concern.rb
 - app/controllers/concerns/spree_cm_commissioner/turnstile_protectable.rb
@@ -964,6 +965,7 @@ files:
 - app/controllers/spree/api/v2/storefront/account/preferred_payment_method_controller.rb
 - app/controllers/spree/api/v2/storefront/account/qr_data_controller.rb
 - app/controllers/spree/api/v2/storefront/account/recipients_controller.rb
+- app/controllers/spree/api/v2/storefront/account/saved_guests_controller.rb
 - app/controllers/spree/api/v2/storefront/account_checker_controller.rb
 - app/controllers/spree/api/v2/storefront/account_deletions_controller.rb
 - app/controllers/spree/api/v2/storefront/account_recovers_controller.rb
@@ -1019,7 +1021,6 @@ files:
 - 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/saved_guests_controller.rb
 - app/controllers/spree/api/v2/storefront/seat_layouts_controller.rb
 - app/controllers/spree/api/v2/storefront/self_check_in_controller.rb
 - app/controllers/spree/api/v2/storefront/taxons_controller_decorator.rb
@@ -1047,6 +1048,7 @@ files:
 - app/controllers/spree/api/v2/storefront/wishlists_controller_decorator.rb
 - app/controllers/spree/api/v2/tenant/access_tokens_controller.rb
 - app/controllers/spree/api/v2/tenant/account/orders_controller.rb
+- app/controllers/spree/api/v2/tenant/account/saved_guests_controller.rb
 - app/controllers/spree/api/v2/tenant/account_checker_controller.rb
 - app/controllers/spree/api/v2/tenant/account_controller.rb
 - app/controllers/spree/api/v2/tenant/account_deletions_controller.rb
@@ -1258,8 +1260,6 @@ files:
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
 - app/interactors/spree_cm_commissioner/google_routes_distance_calculator.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/host_matcher.rb
 - app/interactors/spree_cm_commissioner/id_card_image_updater.rb
@@ -1397,6 +1397,7 @@ files:
 - app/jobs/spree_cm_commissioner/inventory_items/generate_inventory_items_job.rb
 - app/jobs/spree_cm_commissioner/invite_guests/bulk_create_job.rb
 - app/jobs/spree_cm_commissioner/line_items/sync_event_date_job.rb
+- app/jobs/spree_cm_commissioner/maintenance_tasks/guest_data_fill_stage_batch_job.rb
 - app/jobs/spree_cm_commissioner/maintenance_tasks/orchestrate_job.rb
 - app/jobs/spree_cm_commissioner/maintenance_tasks/process_job.rb
 - app/jobs/spree_cm_commissioner/maintenance_tasks/refinalize_guests_batch_job.rb
@@ -1453,6 +1454,7 @@ files:
 - app/mailers/spree_cm_commissioner/team_invite_mailer.rb
 - app/models/.gitkeep
 - app/models/concerns/spree_cm_commissioner/event_metadata.rb
+- app/models/concerns/spree_cm_commissioner/guest_data_fill_stage_concern.rb
 - app/models/concerns/spree_cm_commissioner/homepage_section_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/homepage_section_relatable_concern.rb
 - app/models/concerns/spree_cm_commissioner/integrations/integration_mappable.rb
@@ -1590,6 +1592,7 @@ files:
 - app/models/spree_cm_commissioner/maintenance_task.rb
 - app/models/spree_cm_commissioner/maintenance_tasks/cache_invalidation.rb
 - app/models/spree_cm_commissioner/maintenance_tasks/event.rb
+- app/models/spree_cm_commissioner/maintenance_tasks/guest_data_fill_stage.rb
 - app/models/spree_cm_commissioner/maintenance_tasks/voting_session.rb
 - app/models/spree_cm_commissioner/menu_decorator.rb
 - app/models/spree_cm_commissioner/menu_item_decorator.rb
@@ -1663,6 +1666,7 @@ files:
 - app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb
 - app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb
 - app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/request_guard.rb
 - app/models/spree_cm_commissioner/reserved_block.rb
 - app/models/spree_cm_commissioner/role_decorator.rb
 - app/models/spree_cm_commissioner/role_permission.rb
@@ -2000,7 +2004,6 @@ files:
 - app/serializers/spree/v2/storefront/notification_serializer.rb
 - app/serializers/spree/v2/storefront/option_type_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/option_value_serializer_decorator.rb
-- app/serializers/spree/v2/storefront/order_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/place_serializer.rb
 - app/serializers/spree/v2/storefront/product_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/role_serializer.rb
@@ -2050,6 +2053,7 @@ files:
 - app/serializers/spree/v2/tenant/reset_password_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb
 - app/serializers/spree/v2/tenant/s3_signed_url_serializer.rb
+- app/serializers/spree/v2/tenant/saved_guest_serializer.rb
 - app/serializers/spree/v2/tenant/show_contestant_serializer.rb
 - app/serializers/spree/v2/tenant/show_episode_serializer.rb
 - app/serializers/spree/v2/tenant/show_parent_serializer.rb
@@ -2123,7 +2127,6 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/google_wallet_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/guest_card_class_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb
-- app/serializers/spree_cm_commissioner/v2/storefront/guest_minimal_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/guest_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_background_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_banner_serializer.rb
@@ -2132,7 +2135,6 @@ files:
 - 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/line_item_minimal_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/menu_item_serializer_decorator.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/menu_serializer_decorator.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/payment_method_group_serializer.rb
@@ -2158,7 +2160,6 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/self_check_in_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/stock_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/taxon_include_product_serializer.rb
-- app/serializers/spree_cm_commissioner/v2/storefront/ticket_transfer_minimal_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/ticket_transfer_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/transit_line_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/trip_place_serializer.rb
@@ -2188,7 +2189,6 @@ files:
 - app/services/spree_cm_commissioner/calculate_distance.rb
 - app/services/spree_cm_commissioner/cart/add_guest.rb
 - app/services/spree_cm_commissioner/cart/add_item_decorator.rb
-- app/services/spree_cm_commissioner/cart/create_guest.rb
 - app/services/spree_cm_commissioner/cart/destroy_decorator.rb
 - app/services/spree_cm_commissioner/cart/empty_decorator.rb
 - app/services/spree_cm_commissioner/cart/recalculate_decorator.rb
@@ -2225,8 +2225,12 @@ files:
 - app/services/spree_cm_commissioner/google_wallets/hotel_class_updater.rb
 - app/services/spree_cm_commissioner/google_wallets/hotel_object_builder.rb
 - app/services/spree_cm_commissioner/guests/claim_invite_guest_service.rb
+- app/services/spree_cm_commissioner/guests/create.rb
 - app/services/spree_cm_commissioner/guests/finalize.rb
 - app/services/spree_cm_commissioner/guests/preload_check_in_session_ids.rb
+- app/services/spree_cm_commissioner/guests/refresh_data_fill_stage.rb
+- app/services/spree_cm_commissioner/guests/send_dynamic_field_notification.rb
+- app/services/spree_cm_commissioner/guests/update.rb
 - app/services/spree_cm_commissioner/guests/update_seat.rb
 - app/services/spree_cm_commissioner/homepage_data.rb
 - app/services/spree_cm_commissioner/homepage_data_loader.rb
@@ -2365,12 +2369,10 @@ files:
 - app/services/spree_cm_commissioner/trips/service_calendars/create_or_update.rb
 - app/services/spree_cm_commissioner/trips/update_single_leg.rb
 - app/services/spree_cm_commissioner/trips/variants/create.rb
-- app/services/spree_cm_commissioner/update_guest_service.rb
 - app/services/spree_cm_commissioner/url_embed/youtube_embed.rb
 - app/services/spree_cm_commissioner/user_authenticator.rb
 - app/services/spree_cm_commissioner/user_counters_service.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/users/qr_data/extract_login.rb
 - app/services/spree_cm_commissioner/users/qr_data/generate.rb
 - app/services/spree_cm_commissioner/users/qr_data/invalidate.rb
@@ -3446,6 +3448,8 @@ files:
 - db/migrate/20260701000001_add_device_info_to_cm_waiting_room_sessions.rb
 - db/migrate/20260703065239_add_position_to_cm_voting_contestants.rb
 - 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
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md
@@ -3626,6 +3630,7 @@ files:
 - lib/tasks/kh_location_option_values.rake
 - lib/tasks/kh_provinces.rake
 - lib/tasks/migrate_and_rebuild_place_hierarchy.rake
+- lib/tasks/recompute_guest_data_fill_stage.rake
 - lib/tasks/remove_duplicate_device_tokens.rake
 - lib/tasks/subscriptions_order_creator.rake
 - lib/tasks/update_gateway_status.rake

data/app/controllers/spree/api/v2/storefront/saved_guests_controller.rb

@@ -1,77 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        class SavedGuestsController < ::Spree::Api::V2::ResourceController
-          before_action :require_spree_current_user
-          before_action :load_saved_guest, only: %i[show update destroy]
-
-          def collection
-            spree_current_user.saved_guests.order(created_at: :desc)
-                              .page(params[:page])
-                              .per(params[:per_page])
-          end
-
-          def create
-            saved_guest = spree_current_user.saved_guests.new(saved_guest_params)
-
-            if saved_guest.save
-              render_serialized_payload(201) { serialize_resource(saved_guest) }
-            else
-              render_error_payload(saved_guest.errors.full_messages.to_sentence, 422)
-            end
-          end
-
-          def update
-            if @saved_guest.update(saved_guest_params)
-              render_serialized_payload { serialize_resource(@saved_guest) }
-            else
-              render_error_payload(@saved_guest.errors.full_messages.to_sentence, 400)
-            end
-          end
-
-          def destroy
-            @saved_guest.destroy
-            head :no_content
-          end
-
-          private
-
-          def model_class
-            SpreeCmCommissioner::SavedGuest
-          end
-
-          def collection_serializer
-            resource_serializer
-          end
-
-          def resource_serializer
-            SpreeCmCommissioner::V2::Storefront::SavedGuestSerializer
-          end
-
-          def load_saved_guest
-            @saved_guest = spree_current_user.saved_guests.find(params[:id])
-          end
-
-          def saved_guest_params
-            params.require(:saved_guest).permit(
-              :first_name,
-              :last_name,
-              :dob,
-              :age,
-              :gender,
-              :email,
-              :country_code,
-              :phone_number,
-              :intel_phone_number,
-              :nationality_id,
-              :occupation_id,
-              :nationality_group,
-              :age_group
-            )
-          end
-        end
-      end
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/guest_dynamic_field_notification_sender.rb

@@ -1,11 +0,0 @@
-module SpreeCmCommissioner
-  class GuestDynamicFieldNotificationSender < BaseInteractor
-    def call
-      notification = SpreeCmCommissioner::GuestDynamicFieldNotification.with(
-        guest: context.guest
-      ).deliver_later(context.guest.user)
-
-      context.notification = notification
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb

@@ -1,33 +0,0 @@
-module SpreeCmCommissioner
-  class GuestDynamicFieldsManager < BaseInteractor
-    delegate :resource, :dynamic_fields_attributes, to: :context
-
-    def call
-      return if dynamic_fields_attributes.blank?
-
-      dynamic_fields_attributes.each { |attr| upsert_or_destroy_field(attr) }
-    end
-
-    private
-
-    def upsert_or_destroy_field(attr)
-      if attr[:_destroy] == '1' && attr[:id].present?
-        resource.guest_dynamic_fields.find_by(id: attr[:id])&.destroy!
-        return
-      end
-
-      return if attr[:dynamic_field_id].blank?
-
-      field = attr[:id].present? ? resource.guest_dynamic_fields.find(attr[:id]) : resource.guest_dynamic_fields.build
-      field.assign_attributes(attr.except(:id, :_destroy))
-      associate_dynamic_field_option(field)
-      field.save!
-    end
-
-    def associate_dynamic_field_option(field)
-      return unless field.value.to_s.match?(/\A\d+\z/)
-
-      field.dynamic_field_option = field.dynamic_field.dynamic_field_options.find_by(id: field.value.to_i)
-    end
-  end
-end

data/app/serializers/spree/v2/storefront/order_serializer_decorator.rb

@@ -1,63 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      module OrderSerializerDecorator
-        def self.prepended(base)
-          base.attribute :has_incomplete_guest_info do |order|
-            order.user&.public_metadata&.[]('has_incomplete_guest_info') || false
-          end
-
-          base.attribute :guest_info_status do |order|
-            {
-              incomplete: order_has_incomplete_guests?(order),
-              can_mark_complete: can_mark_complete?(order)
-            }
-          end
-        end
-
-        def self.order_has_incomplete_guests?(order)
-          order.line_items.any? do |line_item|
-            line_item.guests.any? do |guest|
-              guest_incomplete?(guest)
-            end
-          end
-        end
-
-        def self.guest_incomplete?(guest)
-          (guest.pre_registration_fields? && !guest.pre_registration_completed?) ||
-            (guest.post_registration_fields? && !guest.post_registration_completed?) ||
-            (guest.during_check_in_fields? && !guest.check_in_completed?)
-        end
-
-        def self.can_mark_complete?(order)
-          event_ended?(order) || all_guest_info_complete?(order)
-        end
-
-        def self.event_ended?(order)
-          order.line_items.any? { |line_item| event_ended_for_line_item?(line_item) }
-        end
-
-        def self.event_ended_for_line_item?(line_item)
-          event = line_item.event
-          event&.to_date.present? && event.to_date < Time.zone.today
-        end
-
-        def self.all_guest_info_complete?(order)
-          order.line_items.all? { |line_item| line_item_guests_complete?(line_item) }
-        end
-
-        def self.line_item_guests_complete?(line_item)
-          line_item.guests.all? { |guest| guest_complete?(guest) }
-        end
-
-        def self.guest_complete?(guest)
-          guest.pre_registration_completed? &&
-            (!guest.post_registration_fields? || guest.post_registration_completed?) &&
-            (!guest.during_check_in_fields? || guest.check_in_completed?)
-        end
-      end
-    end
-  end
-end
-
-Spree::V2::Storefront::OrderSerializer.prepend(Spree::V2::Storefront::OrderSerializerDecorator)