spree_cm_commissioner 2.12.6 → 2.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed84dcf2382e8d3720366acd62551189adfa4edba9533d8ca5e94b0704942836
-  data.tar.gz: aa37bf6b43593f7f7ff91d71d1839b1ceeeb8c9271d5db371451f94958399366
+  metadata.gz: 742162ce28f156432f76f071c6538e682fecfa8008758acc698d283cb2a3742c
+  data.tar.gz: bfafd91f275bc28a16234e3153ee8d83aa5b5040be06acca7850770b2573fe01
 SHA512:
-  metadata.gz: a5b89052a82aedeed1144cf9a5892e3d8ec2428c3a4cd26cc5806010c1bbcc3ad353a768e6854c3fdaf69a2ae2fdb5f6f049616b7cac1b2a9d3cd532344708d3
-  data.tar.gz: 7842ce22211f5e072e308efda5f4f5a0b95625729d18388ec6c3c22406fd76b4e5577daca6d5a9f717fd28990639d3897b3a0d58c1d18bebd2c1959f152b7b80
+  metadata.gz: f8c8857a35fe48099949496f9e69c0741ca32a18a05fbc05afafdc1cb5cd7feb3394b3b0158cbb27dea96f585e378f9a4a14c0d2fbac1b8cee6e54c8a51be443
+  data.tar.gz: d8e013c7a5172fabbfea21e83ac52d5231351ed380960e1308b458ad1e7b6cd960bb2ca7a6204b82448f3d494c17cb3eb3ebb9a5d704228b901c789dacef09f2

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.12.6)
+    spree_cm_commissioner (2.12.8)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/blazer/queries_controller_decorator.rb

@@ -1,7 +1,7 @@
 module Blazer
   module QueriesControllerDecorator
     def query_params
-      params.require(:query).permit(:name, :description, :statement, :data_source, :preset)
+      params.require(:query).permit(:name, :description, :statement, :data_source)
     end
   end
 end

data/app/controllers/spree/admin/blazer_queries_controller.rb

@@ -0,0 +1,43 @@
+module Spree
+  module Admin
+    class BlazerQueriesController < Spree::Admin::ResourceController
+      STATEMENT_PLACEHOLDER = '-- write your SQL for this query in Blazer'.freeze
+
+      def index
+        @search = model_class.ransack(params[:q])
+        @collection = @search.result
+                             .order(created_at: :desc)
+                             .page(params[:page])
+                             .per(25)
+      end
+
+      private
+
+      def model_class
+        Blazer::Query
+      end
+
+      def object_name
+        'blazer_query'
+      end
+
+      def collection_url
+        admin_blazer_queries_url
+      end
+
+      def location_after_save
+        return blazer.edit_query_path(@object) if action_name == 'create'
+
+        edit_admin_blazer_query_path(@object)
+      end
+
+      def build_resource
+        model_class.new(statement: STATEMENT_PLACEHOLDER, data_source: Blazer.data_sources.keys.first)
+      end
+
+      def permitted_resource_params
+        params.require(:blazer_query).permit(:name, :description, :data_source, :preset)
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/vendor_authorized_users_controller.rb

@@ -14,6 +14,8 @@ module Spree
       end
 
       def update_telegram_chat
+        @vendor.update(preferred_telegram_alert_channels: submitted_alert_channels_mask)
+
         context = ::SpreeCmCommissioner::TelegramChatsFinder.call(
           telegram_chat_name: params['vendor']['preferred_telegram_chat_name'],
           telegram_chat_type: params['vendor']['preferred_telegram_chat_type']
@@ -34,6 +36,19 @@ module Spree
         redirect_to collection_url(@vendor)
       end
 
+      # OR the bits, never sum them. Sum is not idempotent: if the same bit arrives twice
+      # (duplicated checkbox, double-submit, hand-crafted post) 1 + 1 = 2, which silently means
+      # google_form instead of spree. ["0","1","1","16"].sum => 18 => [google_form, offline_sell];
+      # the same input OR'd => 17 => [spree, offline_sell].
+      #
+      # Masking against the known bits also drops junk from a crafted post (999 => 7).
+      def submitted_alert_channels_mask
+        known = SpreeCmCommissioner::OrderChannelBitwise::CHANNEL_ALERT_BITS.values.reduce(:|)
+
+        Array(params.dig(:vendor, :telegram_alert_channels))
+          .reduce(0) { |acc, value| acc | value.to_i } & known
+      end
+
       # @overrided
       def model_class
         Spree::User

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -22,7 +22,7 @@
 # Delivery Address: #123, St. 456, Phnom Penh
 
 module SpreeCmCommissioner
-  class OrderTelegramMessageFactory < TelegramMessageFactory
+  class OrderTelegramMessageFactory < TelegramMessageFactory # rubocop:disable Metrics/ClassLength
     attr_reader :order, :vendor, :show_details_link
 
     def initialize(title:, order:, subtitle: nil, show_details_link: nil, vendor: nil)
@@ -57,10 +57,20 @@ module SpreeCmCommissioner
       text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
       text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
       text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+      text << seat_labels_text(line_item) if seat_labels_text(line_item).present?
 
       text.compact.join("\n")
     end
 
+    def seat_labels_text(line_item)
+      return nil unless line_item.required_seat_selection?
+
+      labels = line_item.guests_with_blocks.includes(:block).map { |guest| guest.block&.label }.compact
+      return nil if labels.empty?
+
+      "Seat: #{labels.join(', ')}"
+    end
+
     def pretty_date_for(line_item)
       return nil unless line_item.date_present?
 
@@ -150,11 +160,14 @@ module SpreeCmCommissioner
     def transit_line_item_content(line_item)
       text = []
       route_text = transit_route_text(line_item)
+      vehicle_text = transit_vehicle_text(line_item)
       departure_text = transit_departure_text(line_item)
       text << bold('🚗 Trip Details')
       text << "Route: #{route_text}" if route_text.present?
+      text << "Vehicle: #{vehicle_text}" if vehicle_text.present?
       text << "Passengers: #{line_item.passenger_count || line_item.quantity}"
       text << "Departure: #{departure_text}" if departure_text.present?
+      text << seat_labels_text(line_item) if seat_labels_text(line_item).present?
 
       text.compact.join("\n")
     end
@@ -165,10 +178,12 @@ module SpreeCmCommissioner
 
       origin = trip.origin_place&.name
       destination = trip.destination_place&.name
-      vehicle = trip.vehicle_type&.name
 
-      parts = [origin, destination].compact_blank.join(' → ')
-      vehicle.present? ? "#{parts} (#{vehicle})" : parts
+      [origin, destination].compact_blank.join(' → ')
+    end
+
+    def transit_vehicle_text(line_item)
+      trip_for(line_item)&.vehicle_type&.name
     end
 
     def transit_departure_text(line_item)

data/app/models/blazer/query_decorator.rb

@@ -0,0 +1,9 @@
+module Blazer
+  module QueryDecorator
+    def ransackable_attributes(auth_object = nil)
+      super & %w[name description data_source preset created_at updated_at]
+    end
+  end
+end
+
+Blazer::Query.singleton_class.prepend(Blazer::QueryDecorator) unless Blazer::Query.singleton_class.ancestors.include?(Blazer::QueryDecorator)

data/app/models/concerns/spree_cm_commissioner/order_channel_bitwise.rb

@@ -0,0 +1,70 @@
+# Owns everything about an order's `channel`: the allowed values, how a stored value
+# resolves back to one of them, and the bitmask vendors use to choose which channels
+# may alert their Telegram group.
+#
+# `channel` is validated by PREFIX, not equality, because the CSV importer stores
+# "google_form-<import_order_id>-<slug>". Always compare via #channel_key, never `==`.
+module SpreeCmCommissioner
+  module OrderChannelBitwise
+    extend ActiveSupport::Concern
+
+    SPREE_CHANNEL = 'spree'.freeze
+    GOOGLE_FORM_CHANNEL = 'google_form'.freeze
+    TELEGRAM_CHANNEL = 'telegram'.freeze
+    TICKET_TRANSFER_CHANNEL = 'ticket_transfer'.freeze
+    OFFLINE_SELL_CHANNEL = 'offline_sell'.freeze
+
+    ALLOWED_CHANNEL_PREFIXES = [
+      SPREE_CHANNEL, GOOGLE_FORM_CHANNEL, TELEGRAM_CHANNEL, TICKET_TRANSFER_CHANNEL, OFFLINE_SELL_CHANNEL
+    ].freeze
+
+    # Matched longest-first so a future 'spree_x' can never be swallowed by 'spree'.
+    SORTED_CHANNEL_PREFIXES = ALLOWED_CHANNEL_PREFIXES.sort_by { |prefix| -prefix.length }.freeze
+
+    # Bit values are PERSISTED in vendor preferences and are a permanent contract.
+    # Never renumber, reorder, or reuse a bit. To retire a channel, leave its bit
+    # burned and take the next free power of two.
+    #
+    # Deliberately literal, never derived from ALLOWED_CHANNEL_PREFIXES.index —
+    # reordering that array would silently remap every vendor's saved setting.
+    CHANNEL_ALERT_BITS = {
+      SPREE_CHANNEL => 1,            # 1 << 0
+      GOOGLE_FORM_CHANNEL => 2,      # 1 << 1
+      TELEGRAM_CHANNEL => 4,         # 1 << 2
+      TICKET_TRANSFER_CHANNEL => 8,  # 1 << 3
+      OFFLINE_SELL_CHANNEL => 16     # 1 << 4
+    }.freeze
+
+    # Every bit currently in use, for masking untrusted input down to known channels.
+    KNOWN_CHANNEL_ALERT_BITS = CHANNEL_ALERT_BITS.values.reduce(:|).freeze
+
+    # Only online orders alert by default. google_form & ticket_transfer set the state column
+    # directly instead of firing the state machine, so they have never sent an alert; this
+    # default therefore encodes today's real behaviour rather than changing it.
+    DEFAULT_TELEGRAM_ALERT_CHANNELS = CHANNEL_ALERT_BITS[SPREE_CHANNEL]
+
+    included do
+      validate :validate_channel_prefix, if: :channel_changed?
+    end
+
+    # The stored channel may carry a suffix — the importer writes
+    # "google_form-<import_order_id>-<slug>" — so the prefix, not the whole
+    # string, is the channel's identity. Returns nil for an unrecognized channel.
+    def channel_key
+      SORTED_CHANNEL_PREFIXES.find { |prefix| channel&.start_with?(prefix) }
+    end
+
+    # Order was created by an operator through the back-office Sell Ticket console.
+    def offline_sell?
+      channel_key == OFFLINE_SELL_CHANNEL
+    end
+
+    private
+
+    def validate_channel_prefix
+      return if channel_key.present?
+
+      errors.add(:channel, "must start with one of the following: #{ALLOWED_CHANNEL_PREFIXES.join(', ')}")
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -1,7 +1,7 @@
 # Make sure to put this concern below other concern or methods that generating additional order info like guests, seat number, etc.
 # This will ensure that when each notification is sent with neccessary data.
 module SpreeCmCommissioner
-  module OrderStateMachine
+  module OrderStateMachine # rubocop:disable Metrics/ModuleLength
     extend ActiveSupport::Concern
 
     included do # rubocop:disable Metrics/BlockLength
@@ -271,15 +271,30 @@ module SpreeCmCommissioner
       return unless telegram_alert_enabled?
 
       vendor_list.each do |vendor|
-        title = '🎫 --- [NEW ORDER FROM BOOKME+] ---'
+        # `next`, not `return`: the mask is per-vendor, so one opted-out vendor on a
+        # multi-vendor order must not suppress the others.
+        next unless vendor.alerts_telegram_for_channel?(channel_key)
+
         chat_id = vendor.preferred_telegram_chat_id
-        if chat_id.present?
-          factory = OrderTelegramMessageFactory.new(title: title, order: self, vendor: vendor)
-          TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
-        end
+        next if chat_id.blank?
+
+        factory = OrderTelegramMessageFactory.new(title: vendor_alert_title(vendor), order: self, vendor: vendor)
+        TelegramNotificationSenderJob.perform_later(chat_id: chat_id, message: factory.message, parse_mode: factory.parse_mode)
       end
     end
 
+    # White-label vendors announce their own brand; platform vendors stay BookMe+.
+    #
+    # vendor.name is operator-supplied data interpolated into an HTML parse_mode message
+    # (TelegramMessageFactory#header wraps the title in <b>), so it MUST be escaped —
+    # Telegram rejects unescaped &, < and > with "400 can't parse entities", and
+    # TelegramNotificationSender swallows that error, so the alert would vanish silently.
+    def vendor_alert_title(vendor)
+      return '🎫 --- [NEW ORDER FROM BOOKME+] ---' unless vendor.tenant_present?
+
+      "🎫 --- [NEW ORDER FROM #{CGI.escapeHTML(vendor.name.to_s)}] ---"
+    end
+
     def notify_order_complete_app_notification_to_user
       return if products.all?(&:vote_package?) # disable app push notification for vote package orders
 

data/app/models/concerns/spree_cm_commissioner/ticket_transferable.rb

@@ -5,11 +5,11 @@ module SpreeCmCommissioner
     included do
       has_one :ticket_transfer, class_name: 'SpreeCmCommissioner::TicketTransfer'
 
-      scope :not_ticket_transfer, -> { where.not(channel: SpreeCmCommissioner::OrderDecorator::TICKET_TRANSFER_CHANNEL) }
+      scope :not_ticket_transfer, -> { where.not(channel: SpreeCmCommissioner::OrderChannelBitwise::TICKET_TRANSFER_CHANNEL) }
     end
 
     def ticket_transfer?
-      channel == SpreeCmCommissioner::OrderDecorator::TICKET_TRANSFER_CHANNEL
+      channel == SpreeCmCommissioner::OrderChannelBitwise::TICKET_TRANSFER_CHANNEL
     end
 
     # Completes an accepted ticket transfer for this order. Called from

data/app/models/concerns/spree_cm_commissioner/vendor_preference.rb

@@ -8,6 +8,25 @@ module SpreeCmCommissioner
       preference :telegram_chat_id, :string
       preference :telegram_chat_name, :string
       preference :telegram_chat_type, :string
+      preference :telegram_alert_channels, :integer, default: 1
+    end
+
+    # Should this vendor's Telegram group be alerted for an order on this channel?
+    # An unmapped channel alerts — a stray message is a better failure than silence.
+    def alerts_telegram_for_channel?(channel_key)
+      bit = SpreeCmCommissioner::OrderChannelBitwise::CHANNEL_ALERT_BITS[channel_key]
+      return true if bit.nil?
+
+      telegram_alert_channels_mask.anybits?(bit)
+    end
+
+    # Spree's getter is `preferences.fetch(name) { default }`, which falls back only when the
+    # key is ABSENT. A key present with a nil value returns nil, and nil.to_i == 0 would mute
+    # EVERY channel silently. Fall back to the default instead; a deliberate 0 survives
+    # because 0 is truthy in Ruby.
+    def telegram_alert_channels_mask
+      (preferred_telegram_alert_channels ||
+        SpreeCmCommissioner::OrderChannelBitwise::DEFAULT_TELEGRAM_ALERT_CHANNELS).to_i
     end
   end
 end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -1,12 +1,7 @@
 module SpreeCmCommissioner
   module OrderDecorator
-    SPREE_CHANNEL = 'spree'.freeze
-    GOOGLE_FORM_CHANNEL = 'google_form'.freeze
-    TELEGRAM_CHANNEL = 'telegram'.freeze
-    TICKET_TRANSFER_CHANNEL = 'ticket_transfer'.freeze
-    ALLOWED_CHANNEL_PREFIXES = [SPREE_CHANNEL, GOOGLE_FORM_CHANNEL, TELEGRAM_CHANNEL, TICKET_TRANSFER_CHANNEL].freeze
-
     def self.prepended(base) # rubocop:disable Metrics/MethodLength
+      base.include SpreeCmCommissioner::OrderChannelBitwise
       base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
       base.include SpreeCmCommissioner::OrderIntegration
@@ -27,7 +22,6 @@ module SpreeCmCommissioner
       base.store_public_metadata :order_options, :array, default: []
 
       base.validates :promo_total, base::MONEY_VALIDATION
-      base.validate :validate_channel_prefix, if: :channel_changed?
       base.validates :phone_number, presence: true, if: :require_phone_number
 
       base.has_one :invoice, dependent: :destroy, class_name: 'SpreeCmCommissioner::Invoice'
@@ -363,12 +357,6 @@ module SpreeCmCommissioner
       self.ship_address ||= customer.ship_address.try(:clone)
     end
 
-    def validate_channel_prefix
-      return if ALLOWED_CHANNEL_PREFIXES.any? { |prefix| channel&.start_with?(prefix) }
-
-      errors.add(:channel, "must start with one of the following: #{ALLOWED_CHANNEL_PREFIXES.join(', ')}")
-    end
-
     def set_tenant_id
       self.tenant_id = MultiTenant.current_tenant_id
     end

data/app/overrides/spree/admin/shared/sub_menu/_configuration/blazer_queries_tab.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom "[data-hook='admin_configurations_sidebar_menu']" -->
+
+<%= tab :blazer_queries, match_path: '/blazer_queries', label: 'Blazer Queries' if can? :manage, Blazer::Query %>

data/app/services/spree_cm_commissioner/api_caches/invalidate.rb

@@ -70,7 +70,12 @@ module SpreeCmCommissioner
             '/api/v2/storefront/menus/:id*',
             '/api/v2/storefront/homepage_data*'
           ],
-          'Spree::Taxon' => ['/api/v2/storefront/taxons/:id*'],
+          'Spree::Taxon' => [
+            '/api/v2/tenant/taxons/:id*',
+            '/api/v2/tenant/taxons/:permalink*',
+            '/api/v2/storefront/taxons/:id*',
+            '/api/v2/storefront/taxons/:permalink*'
+          ],
           'Spree::Product' => [
             '/api/v2/tenant/products/:id*',
             '/api/v2/tenant/products/:slug*',

data/app/services/spree_cm_commissioner/intercity_taxi_order/create.rb

@@ -3,7 +3,9 @@ module SpreeCmCommissioner
     class Create
       prepend ::Spree::ServiceModule::Base
 
-      def call(trip_id:, from_date:, to_date:, user: nil, quantity: 1)
+      def call(trip_id:, from_date:, to_date:, user: nil, quantity: 1, created_by: nil, # rubocop:disable Metrics/ParameterLists
+               channel: SpreeCmCommissioner::OrderChannelBitwise::SPREE_CHANNEL
+      )
         validate!(trip_id: trip_id, from_date: from_date, to_date: to_date, quantity: quantity)
 
         quantity = quantity.to_i
@@ -13,7 +15,7 @@ module SpreeCmCommissioner
           variant = trip.product.variants.first
           raise ArgumentError, 'No variant found for trip' if variant.blank?
 
-          order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
+          order = Spree::Order.new(state: 'cart', use_billing: true, user: user, created_by: created_by, channel: channel)
 
           metadata = {
             trip_id: trip.id,

data/app/services/spree_cm_commissioner/show/clone.rb

@@ -0,0 +1,145 @@
+module SpreeCmCommissioner
+  class Show
+    class Clone
+      prepend ::Spree::ServiceModule::Base
+
+      def call(source_season:, vendor:, attributes: {})
+        raise ArgumentError, 'source_season must be a season' unless source_season.season?
+
+        ActiveRecord::Base.transaction do
+          new_show = clone_show(source_season.show, vendor, attributes)
+          new_season = clone_season(new_show, vendor, source_season, attributes)
+          clone_contestants(source_season, new_season)
+          clone_show_people_assignments(source_season, new_season)
+          clone_episodes(source_season, new_season, vendor)
+          clone_vote_packages(source_season, new_season)
+
+          success(show: new_show, season: new_season)
+        end
+      rescue StandardError => e
+        CmAppLogger.error(
+          label: 'SpreeCmCommissioner::Show::Clone#call',
+          data: { error_class: e.class.name, error_message: e.message }
+        )
+        failure(nil, e.message)
+      end
+
+      private
+
+      def clone_show(source_show, vendor, attributes)
+        new_show = SpreeCmCommissioner::Show.new(
+          name: attributes[:name].presence || "Copy of #{source_show.name}",
+          vendor: vendor,
+          show_type: source_show.show_type,
+          voting_config: source_show.voting_config,
+          fraud_config: source_show.fraud_config
+        )
+        new_show.save!
+        new_show.vendors << vendor
+        new_show
+      end
+
+      def clone_season(new_show, vendor, source_season, attributes)
+        new_season = new_show.build_next_season(
+          name: source_season.name,
+          season_number: source_season.season_number,
+          season_year: source_season.season_year
+        )
+        new_season.vendor = vendor
+        new_season.show_type = source_season.show_type
+        new_season.voting_config = source_season.voting_config
+        new_season.fraud_config = source_season.fraud_config
+        new_season.voting_credit_scope = attributes[:voting_credit_scope].presence || source_season.voting_credit_scope
+        new_season.save!
+        new_season.vendors << vendor
+        new_season
+      end
+
+      def clone_contestants(source_season, new_season)
+        source_season.show_contestants.ordered.each do |contestant|
+          cloned = contestant.dup
+          cloned.show_contestant_images = []
+          cloned.show_contestant_videos = []
+          cloned.show_id = new_season.id
+          cloned.status = :active
+          cloned.eliminated_at = nil
+          cloned.save!
+        end
+      end
+
+      def clone_show_people_assignments(source_season, new_season)
+        source_season.show_people_assignments.order(:position).each do |assignment|
+          cloned = assignment.dup
+          cloned.show_id = new_season.id
+          cloned.save!
+        end
+      end
+
+      def clone_episodes(source_season, new_season, vendor)
+        source_season.episodes.where(product_type: :show_episode).ordered_by_episode_number.each do |episode|
+          cloned = duplicate_episode(episode)
+          cloned.event_id = new_season.id
+          cloned.status = 'draft'
+          cloned.scheduled_at = nil
+          cloned.ends_at = 1.day.from_now
+          cloned.aired_at = nil
+          cloned.save!
+
+          clone_vote_variant(episode, cloned)
+          clone_voting_sessions(episode, cloned, new_season, vendor)
+        end
+      end
+
+      # Carries over only the session name, status, session_type and time window
+      # (opens_at/closes_at); everything else is left at defaults and a fresh session_key is
+      # generated by the model.
+      def clone_voting_sessions(source_episode, cloned_episode, new_season, vendor)
+        source_episode.voting_sessions.order(:position).each do |session|
+          SpreeCmCommissioner::VotingSession.create!(
+            episode: cloned_episode,
+            show_id: new_season.id,
+            vendor: vendor,
+            name: session.name,
+            status: session.status,
+            session_type: session.session_type,
+            opens_at: session.opens_at,
+            closes_at: session.closes_at
+          )
+        end
+      end
+
+      def clone_vote_packages(source_season, new_season)
+        source_season.vote_packages.each do |vote_package|
+          cloned = duplicate_episode(vote_package)
+          cloned.event_id = new_season.id
+          cloned.taxons = [new_season]
+          cloned.status = 'draft'
+          cloned.save!
+
+          clone_vote_variant(vote_package, cloned)
+        end
+      end
+
+      def duplicate_episode(original)
+        original.dup.tap do |cloned|
+          cloned.variants = []
+          cloned.stores = original.stores
+          cloned.price = original.price
+          cloned.compare_at_price = original.compare_at_price
+        end
+      end
+
+      def clone_vote_variant(original_episode, cloned_episode)
+        original_variant = original_episode.vote_variant
+        return unless original_variant
+
+        cloned_episode.variants.create!(
+          price: original_variant.price,
+          compare_at_price: original_variant.compare_at_price,
+          option_value_ids: original_variant.option_value_ids,
+          sku: ''
+        )
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/ticket_transfers/accept.rb

@@ -71,7 +71,7 @@ module SpreeCmCommissioner
         order = Spree::Order.create!(
           user_id: buyer.id,
           store_id: Spree::Store.default.id,
-          channel: SpreeCmCommissioner::OrderDecorator::TICKET_TRANSFER_CHANNEL,
+          channel: SpreeCmCommissioner::OrderChannelBitwise::TICKET_TRANSFER_CHANNEL,
           email: buyer.email,
           phone_number: buyer.phone_number,
           currency: ticket_transfer.currency,

data/app/services/spree_cm_commissioner/transit_order/create.rb

@@ -16,19 +16,25 @@ module SpreeCmCommissioner
     class Create
       prepend ::Spree::ServiceModule::Base
 
-      def call(outbound_date:, inbound_date:, outbound_legs:, inbound_legs: [], user: nil, include_return: false) # rubocop:disable Metrics/ParameterLists
+      def call(outbound_date:, inbound_date:, outbound_legs:, inbound_legs: [], user: nil, created_by: nil, # rubocop:disable Metrics/ParameterLists
+               include_return: false, channel: SpreeCmCommissioner::OrderChannelBitwise::SPREE_CHANNEL
+      )
         return failure(nil, 'Outbound legs are missing') if outbound_legs.blank?
 
         begin
-          order = create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user, include_return)
+          order = create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user, include_return,
+                                created_by: created_by, channel: channel
+          )
           success(order: order)
         rescue StandardError => e
           failure(nil, e.message)
         end
       end
 
-      def create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user, include_return) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/ParameterLists
-        order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
+      def create_order!(outbound_date, inbound_date, outbound_legs, inbound_legs, user, include_return, # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/ParameterLists
+                        created_by: nil, channel: SpreeCmCommissioner::OrderChannelBitwise::SPREE_CHANNEL
+      )
+        order = Spree::Order.new(state: 'cart', use_billing: true, user: user, created_by: created_by, channel: channel)
 
         all_legs = outbound_legs + inbound_legs
         preload_trips_and_stops!(all_legs)

data/app/services/spree_cm_commissioner/waiting_room/stamp_queue_positions.rb

@@ -92,38 +92,23 @@ module SpreeCmCommissioner
       end
 
       # Live count of guests no longer waiting: granted entry (allow_to_enter_room_at set) or left
-      # the queue without ever being granted (left_at set, allow_to_enter_room_at still nil). Both
-      # matter because #stamp_doc's position is permanent once assigned — e.g. if the highest
-      # stamped position is 4200 but this only counts 3714, every guest stamped after 3714 shows
-      # ~486 phantom people "ahead of them" that never resolve.
-      #
-      # allow_to_enter_room_at and left_at are not mutually exclusive: rejoinQueueAfterExpiry()
-      # sets left_at on a doc that was already granted (session renewal failed past the expiry
-      # ceiling after entry), so a doc can carry both fields non-nil at once. #allowed_count is
-      # unconditional on left_at so it always claims that doc; #left_without_entry_count excludes
-      # anything #allowed_count already claimed (allow_to_enter_room_at == nil) so the two counts
-      # partition every exited doc into exactly one bucket — summing plain `left_at != nil` here
-      # instead would double-count that doc, same as summing plain `allow_to_enter_room_at == nil`
-      # without excluding it here would drop the doc from both counts entirely.
-      #
-      # Two counts rather than one OR query so each stays index-light — #allowed_count needs no
-      # composite index, #left_without_entry_count needs only a two-field one (allow_to_enter_room_at
-      # ==, left_at !=) — and #waiting_query / WaitingGuestsCaller#eligible_guests_in never need to
-      # know about `left_at`. Recomputed fresh every run rather than incremented, so a crashed run
-      # can't leave it permanently understated.
+      # the queue (left_at set). Both matter because #stamp_doc's position is permanent once
+      # assigned — e.g. if the highest stamped position is 4200 but this only counts 3714, every
+      # guest stamped after 3714 shows ~486 phantom people "ahead of them" that never resolve.
+      # Summed as two single-field counts rather than one OR query so each stays index-free (no
+      # composite index needed), and #waiting_query / WaitingGuestsCaller#eligible_guests_in never
+      # need to know about `left_at`. Recomputed fresh every run rather than incremented, so a
+      # crashed run can't leave it permanently understated.
       def exited_count(path)
-        allowed_count(path) + left_without_entry_count(path)
+        allowed_count(path) + left_count(path)
       end
 
       def allowed_count(path)
         firestore.col(path).where('allow_to_enter_room_at', '!=', nil).aggregate_query.add_count.get.first.get.to_i
       end
 
-      def left_without_entry_count(path)
-        firestore.col(path)
-                 .where('allow_to_enter_room_at', '==', nil)
-                 .where('left_at', '!=', nil)
-                 .aggregate_query.add_count.get.first.get.to_i
+      def left_count(path)
+        firestore.col(path).where('left_at', '!=', nil).aggregate_query.add_count.get.first.get.to_i
       end
 
       # merge: true so total_exited_queue coexists with the fields WaitingGuestsCaller publishes to

data/app/views/blazer/queries/_content.html.erb

@@ -58,8 +58,6 @@
   <% end %>
 </div>
 
-<%= render partial: 'blazer/queries/preset' %>
-
 <% if flash[:success] %>
   <div class="alert alert-success">
     <%= flash[:success] %>

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

@@ -0,0 +1,37 @@
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
+
+<div class="card mb-4">
+  <div class="card-body">
+    <%= f.field_container :name do %>
+      <%= f.label :name, Spree.t(:name) %>
+      <%= f.text_field :name, class: 'form-control', required: true %>
+      <%= f.error_message_on :name %>
+    <% end %>
+
+    <%= f.field_container :description do %>
+      <%= f.label :description, Spree.t(:description) %>
+      <%= f.text_area :description, class: 'form-control', rows: 3 %>
+      <%= f.error_message_on :description %>
+    <% end %>
+
+    <%= f.field_container :data_source do %>
+      <%= f.label :data_source, 'Data source' %>
+      <%= f.select :data_source, Blazer.data_sources.keys, {}, class: 'fullwidth select2' %>
+      <%= f.error_message_on :data_source %>
+    <% end %>
+
+    <div class="form-check">
+      <%= f.check_box :preset, class: 'form-check-input' %>
+      <%= f.label :preset, Spree.t(:preset), class: 'form-check-label' %>
+      <small class="form-text text-muted d-block">
+        Preset reports are generated automatically for all new organizers and vendors once created.
+      </small>
+    </div>
+
+    <% if @object.persisted? %>
+      <div class="form-group mt-3">
+        <%= link_to 'View / edit SQL in Blazer', blazer.edit_query_path(@object), class: 'btn btn-outline-secondary' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/blazer_queries/edit.html.erb

@@ -0,0 +1,11 @@
+<%= content_for :page_title do %>
+  <%= link_to 'Blazer Queries', admin_blazer_queries_path %> / <%= @object.name %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'update' }, method: :patch, scope: 'blazer_query', local: true do |f| %>
+  <%= render 'form', f: f %>
+
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/blazer_queries/index.html.erb

@@ -0,0 +1,72 @@
+<% content_for :page_title do %>
+  <%= link_to 'Blazer Queries', spree.admin_blazer_queries_path %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to 'New Query', new_admin_blazer_query_path, class: "btn-outline-primary", icon: 'add.svg' %>
+<% end if can? :create, Blazer::Query %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_blazer_queries_index_search">
+    <%= search_form_for [:admin, @search], url: spree.admin_blazer_queries_path do |f| %>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_blazer_queries_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<% if @collection.any? %>
+  <div class="table-responsive border rounded bg-white mb-3">
+    <table class="table" id="listing_blazer_queries" data-hook>
+      <thead class="text-muted">
+        <tr data-hook="admin_blazer_queries_index_headers">
+          <th><%= Spree.t(:name) %></th>
+          <th>Data source</th>
+          <th><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+          <th><%= sort_link @search, :updated_at, Spree.t(:updated_at) %></th>
+          <th>Created by</th>
+          <th data-hook="admin_blazer_queries_index_header_actions" class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @collection.each do |blazer_query| %>
+          <tr id="<%= spree_dom_id blazer_query %>" data-hook="admin_blazer_queries_index_rows">
+            <td>
+              <% if can?(:edit, blazer_query) %>
+                <%= link_to blazer_query.name, edit_admin_blazer_query_path(blazer_query) %>
+              <% else %>
+                <%= blazer_query.name %>
+              <% end %>
+            </td>
+            <td><%= blazer_query.data_source %></td>
+            <td><%= l(blazer_query.created_at) %></td>
+            <td><%= l(blazer_query.updated_at) %></td>
+            <td><%= blazer_query.creator&.full_name || content_tag(:span, '—', class: 'text-muted') %></td>
+            <td data-hook="admin_blazer_queries_index_row_actions" class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_with_icon 'link.svg', 'View in Blazer', blazer.query_path(blazer_query), no_text: true, class: 'btn btn-outline-secondary' %>
+                <%= link_to_edit blazer_query, url: edit_admin_blazer_query_path(blazer_query), no_text: true if can?(:edit, blazer_query) %>
+                <%= link_to_delete blazer_query, url: admin_blazer_query_path(blazer_query), no_text: true if can?(:delete, blazer_query) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% else %>
+  <div class="alert alert-info alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Blazer::Query)) %>
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>

data/app/views/spree/admin/blazer_queries/new.html.erb

@@ -0,0 +1,11 @@
+<%= content_for :page_title do %>
+  <%= link_to 'Blazer Queries', admin_blazer_queries_path %> / <%= Spree.t(:new) %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'create' }, scope: 'blazer_query', local: true do |f| %>
+  <%= render 'form', f: f %>
+
+  <fieldset>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/vendor_authorized_users/index.html.erb

@@ -16,6 +16,21 @@
           <%= f.label :preferred_telegram_chat_id, Spree.t(:telegram_chat_id) %>
           <%= f.text_field :preferred_telegram_chat_id, class: 'form-control', disabled: true %>
         <% end %>
+        <%= f.field_container :preferred_telegram_alert_channels do %>
+          <%= f.label :preferred_telegram_alert_channels, Spree.t(:telegram_alert_channels) %>
+          <%# Without this, unticking every box submits no key at all and the mask would keep its old value. %>
+          <%= hidden_field_tag 'vendor[telegram_alert_channels][]', 0 %>
+          <% SpreeCmCommissioner::OrderChannelBitwise::CHANNEL_ALERT_BITS.each do |channel, bit| %>
+            <div class="form-check">
+              <%= check_box_tag 'vendor[telegram_alert_channels][]', bit,
+                                @vendor.telegram_alert_channels_mask.anybits?(bit),
+                                id: "telegram_alert_channel_#{channel}", class: 'form-check-input' %>
+              <%= label_tag "telegram_alert_channel_#{channel}",
+                            I18n.t("views.organizer.order.channel_values.#{channel}", default: channel.humanize),
+                            class: 'form-check-label' %>
+            </div>
+          <% end %>
+        <% end %>
         <small class="form-text text-muted">
           <ul>
             <% allow_extensions = SpreeCmCommissioner::VectorIcon::ACCEPTED_EXTENSIONS.to_sentence %>

data/config/locales/en.yml

@@ -287,9 +287,14 @@ en:
       reversion_error: "Cannot eliminate here yet. This contestant appears in a later session."
     is_open_dated: "Is Open Dated Trip?"
     description: "Description"
+    preset: "Preset"
     enable_telegram_alert: "Enable Telegram Alert"
     enable_send_receipt: "Enable Send Receipt"
     enable_social_sharing_email: "Enable Social Sharing Email"
+    telegram_alert_channels: "Telegram Alert Channels"
+    telegram_chat_name: "Telegram Chat Name"
+    telegram_chat_type: "Telegram Chat Type"
+    telegram_chat_id: "Telegram Chat ID"
     registered_by:
       system_registered: "System Registered"
       self_registered: "Self Registered"

data/config/routes.rb

@@ -394,6 +394,7 @@ Spree::Core::Engine.add_routes do
     end
     resources :event_blazer_queries
     resources :trip_blazer_queries
+    resources :blazer_queries, except: [:show]
 
     resources :menus do
       resource :sprite_import, controller: 'sprite_import', only: %i[show new create edit update destroy]

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.12.6'.freeze
+  VERSION = '2.12.8'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.12.6
+  version: 2.12.8
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-02 00:00:00.000000000 Z
+date: 2026-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -837,6 +837,7 @@ files:
 - app/controllers/spree/admin/account_deletions_controller.rb
 - app/controllers/spree/admin/base_controller_decorator.rb
 - app/controllers/spree/admin/base_import_orders_controller.rb
+- app/controllers/spree/admin/blazer_queries_controller.rb
 - app/controllers/spree/admin/calendars/base_controller.rb
 - app/controllers/spree/admin/calendars/orders_controller.rb
 - app/controllers/spree/admin/classifications_controller.rb
@@ -1472,6 +1473,7 @@ files:
 - app/mailers/spree_cm_commissioner/pin_code_mailer.rb
 - app/mailers/spree_cm_commissioner/team_invite_mailer.rb
 - app/models/.gitkeep
+- app/models/blazer/query_decorator.rb
 - app/models/concerns/spree_cm_commissioner/event_metadata.rb
 - app/models/concerns/spree_cm_commissioner/firestore_connection.rb
 - app/models/concerns/spree_cm_commissioner/guest_data_fill_stage_concern.rb
@@ -1490,6 +1492,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
+- app/models/concerns/spree_cm_commissioner/order_channel_bitwise.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
@@ -1898,6 +1901,7 @@ files:
 - app/overrides/spree/admin/shared/_product_tabs/video_on_demand.html.erb.deface
 - app/overrides/spree/admin/shared/_store_switcher/store_logo.html.erb.deface
 - app/overrides/spree/admin/shared/_version/deploy_tag_version_badge.html.erb.deface
+- app/overrides/spree/admin/shared/sub_menu/_configuration/blazer_queries_tab.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_configuration/locations_tab.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_configuration/menu_items.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_integrations/external_integrations.html.erb.deface
@@ -2386,6 +2390,7 @@ files:
 - app/services/spree_cm_commissioner/seats/unlock_blocks.rb
 - app/services/spree_cm_commissioner/seeds/roles_decorator.rb
 - app/services/spree_cm_commissioner/seeds/user_usernames.rb
+- app/services/spree_cm_commissioner/show/clone.rb
 - app/services/spree_cm_commissioner/show_contestants/normalize_video_highlights.rb
 - app/services/spree_cm_commissioner/show_persons/contestant_assigner.rb
 - app/services/spree_cm_commissioner/signing/sign_data.rb
@@ -2479,7 +2484,6 @@ files:
 - app/services/spree_cm_commissioner/webhooks/subscribers/queue_requests_decorator.rb
 - app/services/telegram_gateway_adapter/client.rb
 - app/views/blazer/queries/_content.html.erb
-- app/views/blazer/queries/_preset.html.erb
 - app/views/blazer/queries/embed/_content.html.erb
 - app/views/blazer/queries/embed/_download_button.html.erb
 - app/views/blazer/queries/show.html.erb
@@ -2492,6 +2496,10 @@ files:
 - app/views/shared/_product_type_field.erb
 - app/views/shared/calendar/_order_popover.html.erb
 - app/views/shared/calendar/_orders_sidebar.html.erb
+- app/views/spree/admin/blazer_queries/_form.html.erb
+- app/views/spree/admin/blazer_queries/edit.html.erb
+- app/views/spree/admin/blazer_queries/index.html.erb
+- app/views/spree/admin/blazer_queries/new.html.erb
 - app/views/spree/admin/calendars/orders/index.html.erb
 - app/views/spree/admin/classifications/edit.html.erb
 - app/views/spree/admin/classifications/index.html.erb

data/app/views/blazer/queries/_preset.html.erb

@@ -1,9 +0,0 @@
-<%= form_for @query do |f| %>
-  <div>
-    <%= f.check_box :preset, onchange: "this.form.submit()" %>
-    <%= f.label :preset, Spree.t(:preset) %>
-  </div>
-  <small style="margin-bottom: 6px; display: inline-block;">
-    Preset reports are generated automatically for all new organizers and vendors once created.
-  </small>
-<% end %>