spree_cm_commissioner 2.8.6 → 2.8.7

data/app/services/spree_cm_commissioner/imports/orders/create.rb

@@ -99,6 +99,7 @@ module SpreeCmCommissioner
             return nil
           end
 
+          SpreeCmCommissioner::ImportedOrder.create!(order: order, import_order: import_order)
           order
         end
 

data/app/services/spree_cm_commissioner/telegram_alerts/checks/order_complete_payment_not_paid.rb

@@ -0,0 +1,21 @@
+module SpreeCmCommissioner
+  module TelegramAlerts
+    module Checks
+      class OrderCompletePaymentNotPaid < OrderIntegrityAlert
+        private
+
+        def anomaly?(order)
+          order.complete? && order.payment_state != 'paid'
+        end
+
+        def emoji
+          '🚨'
+        end
+
+        def title
+          'Order Complete With Unresolved Payment State'
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/telegram_alerts/checks/payment_paid_order_not_complete.rb

@@ -0,0 +1,21 @@
+module SpreeCmCommissioner
+  module TelegramAlerts
+    module Checks
+      class PaymentPaidOrderNotComplete < OrderIntegrityAlert
+        private
+
+        def anomaly?(order)
+          order.payments.completed.exists? && !order.complete?
+        end
+
+        def emoji
+          '⚠️'
+        end
+
+        def title
+          'Payment Paid But Order Not Complete'
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/telegram_alerts/order_integrity_alert.rb

@@ -0,0 +1,112 @@
+module SpreeCmCommissioner
+  module TelegramAlerts
+    # Abstract base class for order anomaly checks. Subclasses implement
+    # `anomaly?`, `emoji` and `title` to define what they detect and how
+    # the alert is presented; this class handles chat resolution, message
+    # building and delivery.
+    class OrderIntegrityAlert
+      prepend ::Spree::ServiceModule::Base
+
+      def call(order:)
+        return success(message: 'No anomaly detected') unless anomaly?(order)
+
+        chat_id = alert_chat_id
+        return failure(nil, 'Order anomaly alert chat ID not configured') if chat_id.blank?
+
+        TelegramNotificationSenderJob.perform_later(
+          chat_id: chat_id,
+          message: build_message(order),
+          parse_mode: 'HTML'
+        )
+
+        success(message: 'Order alert sent successfully')
+      rescue StandardError => e
+        failure(nil, "Failed to send order alert: #{e.message}")
+      end
+
+      private
+
+      def anomaly?(_order)
+        raise NotImplementedError, "#{self.class} must implement #anomaly?"
+      end
+
+      def emoji
+        raise NotImplementedError, "#{self.class} must implement #emoji"
+      end
+
+      def title
+        raise NotImplementedError, "#{self.class} must implement #title"
+      end
+
+      def alert_chat_id
+        Spree::Store.default&.preferred_telegram_order_anomaly_alert_chat_id.presence ||
+          ENV.fetch('EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID', nil)
+      end
+
+      def build_message(order)
+        line_items = order.line_items.includes(:product, :vendor)
+        has_payment = order.payments.any?
+
+        lines = header_lines +
+          order_lines(order, has_payment) +
+          [''] +
+          product_lines(line_items) +
+          [''] +
+          customer_lines(order) +
+          footer_lines(order)
+
+        lines.compact.join("\n")
+      end
+
+      def header_lines
+        [
+          "#{emoji} <b>ATTENTION — #{title}</b>",
+          "🕐 <code>#{Time.current.strftime('%Y-%m-%d %H:%M')}</code>",
+          ''
+        ]
+      end
+
+      def order_lines(order, has_payment)
+        lines = [
+          '📋 <b>Order</b>',
+          "<b>Number:</b> <code>#{order.number}</code>",
+          "<b>State:</b> #{order.state}"
+        ]
+        lines << "<b>Payment State:</b> #{order.payment_state}" if has_payment
+        lines
+      end
+
+      def product_lines(line_items)
+        items = line_items.map do |li|
+          vendor_name = li.vendor&.name
+          entry = "· #{ERB::Util.html_escape(li.product.name)} (x#{li.quantity})"
+          entry += " — #{ERB::Util.html_escape(vendor_name)}" if vendor_name.present?
+          entry
+        end
+
+        ['🎫 <b>Products</b>', *items]
+      end
+
+      def customer_lines(order)
+        [
+          '👤 <b>Customer</b>',
+          "<b>Name:</b> #{ERB::Util.html_escape(order.name.to_s)}",
+          ("<b>Email:</b> #{order.email}" if order.email.present?),
+          ("<b>Phone:</b> #{order.phone_number}" if order.respond_to?(:phone_number) && order.phone_number.present?)
+        ]
+      end
+
+      def footer_lines(order)
+        ['', "🔗 #{order_url(order)}"]
+      end
+
+      def order_url(order)
+        Spree::Core::Engine.routes.url_helpers.edit_admin_order_url(
+          order,
+          host: Rails.application.routes.default_url_options[:host],
+          port: Rails.application.routes.default_url_options[:port]
+        )
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/telegram_alerts/order_integrity_checks_runner.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module TelegramAlerts
+    class OrderIntegrityChecksRunner
+      prepend ::Spree::ServiceModule::Base
+
+      CHECKS = [
+        'SpreeCmCommissioner::TelegramAlerts::Checks::OrderCompletePaymentNotPaid',
+        'SpreeCmCommissioner::TelegramAlerts::Checks::PaymentPaidOrderNotComplete'
+      ].freeze
+
+      def call(order:)
+        CHECKS.each do |check_class|
+          result = check_class.constantize.call(order: order)
+          log_failure(check_class, order, result.error.to_s) if result.failure?
+        rescue StandardError => e
+          log_failure(check_class, order, e.message)
+        end
+
+        success(message: 'Order integrity checks completed')
+      end
+
+      private
+
+      def log_failure(check_class, order, error)
+        CmAppLogger.error(
+          label: "#{check_class} failed",
+          data: { order_id: order.id, error: error }
+        )
+      end
+    end
+  end
+end

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

@@ -15,6 +15,20 @@ module SpreeCmCommissioner
       # Firestore bounds a batch update by payload size (10 MiB); this batch size leaves 500/commit far under that.
       FIRESTORE_BATCH_SIZE = (ENV['WAITING_ROOM_FIRESTORE_BATCH_SIZE'] || 500).to_i
 
+      # Above this we leave estimated_wait_seconds nil so the app hides the ETA rather than
+      # showing a discouraging "~2 hours". Deep guests just see the coarse "lots ahead" state.
+      MAX_WAIT_TO_DISPLAY_SECONDS = (ENV['WAITING_ROOM_MAX_WAIT_TO_DISPLAY_SECONDS'] || 3600).to_i
+
+      # How often the caller runs and releases one batch. See schedule.yml for WaitingGuestsCallerJob.
+      CALLER_INTERVAL_SECONDS = (ENV['WAITING_ROOM_CALLER_INTERVAL_SECONDS'] || 60).to_i
+
+      # Caps the batch size assumed when estimating the ETA (not a release limit). The lobby's
+      # slots_per_call is a single run's available_slots, which spikes on cold starts / lulls
+      # (active_sessions low → available_slots ≈ max_sessions). An uncapped spike collapses hundreds
+      # of positions into batch 1 and under-promises the wait, so we bound it to keep ETAs
+      # conservative. Tune to roughly the real per-minute release capacity.
+      MAX_ETA_BATCH_SIZE = (ENV['WAITING_ROOM_MAX_ETA_BATCH_SIZE'] || 50).to_i
+
       def call
         stamp_positions
         success(stamped: @stamped.to_i)
@@ -26,11 +40,12 @@ module SpreeCmCommissioner
 
       def stamp_positions
         paths = stamp_paths
-        avg_queue_to_enter = lobby_data[:avg_queue_to_enter_seconds].to_i
-        total = paths.sum { |p| waiting_count(p) }
+        total = paths.sum { |path| waiting_count(path) }
         return if total.zero?
 
-        stamped_at = Time.zone.now
+        @slots_per_call = lobby_data[:slots_per_call].to_i
+        @flat_wait = lobby_data[:avg_queue_to_enter_seconds].to_i
+        @stamped_at = Time.zone.now
         @stamped = 0
 
         paths.each do |path|
@@ -39,41 +54,68 @@ module SpreeCmCommissioner
 
           docs = waiting_query(path).order('queued_at').limit(remaining).get.to_a
 
-          # Stamp the docs in chunks: each_slice splits them into groups of at most
-          # FIRESTORE_BATCH_SIZE, and each group is written in one firestore.batch commit
-          # (so e.g. 1000 docs = 2 commits, not 1000 round-trips).
+          # Commit in FIRESTORE_BATCH_SIZE chunks (one firestore.batch per slice), so e.g.
+          # 1000 docs = 2 commits, not 1000 round-trips.
           docs.each_slice(FIRESTORE_BATCH_SIZE) do |slice|
-            firestore.batch do |b|
-              slice.each { |doc| stamp_doc(b, doc, avg_queue_to_enter, stamped_at) }
-            end
+            firestore.batch { |batch| slice.each { |doc| stamp_doc(batch, doc) } }
           end
         end
       end
 
-      def stamp_doc(batch, doc, avg_queue_to_enter, stamped_at)
+      def stamp_doc(batch, doc)
         @stamped += 1
 
-        # The app shows a progress bar via (queue_total - position + 1) / queue_total.
-        # `position` only ever counts down toward 1, so we keep `queue_total` from ever
-        # going down either (max of its old value and the current position) — it becomes
-        # the guest's starting depth. That keeps the bar moving only forward, reaching
-        # 100% at position 1, instead of jumping as the live waiting count shrinks.
-        #
-        # Example — a guest who started 8th, with the line draining from 8 to 4 people:
-        #   live total:  position 6 / total 8 = 38%, then position 4 / total 4 = 25% (drops!) ❌
-        #   this fix:    position 6 / total 8 = 38%, then position 4 / total 8 = 63% (climbs) ✅
-        #                ...continuing to position 1 / total 8 = 100% at the front.
         data = {
           position: @stamped,
-          queue_total: [doc.data[:queue_total].to_i, @stamped].max,
-          estimated_wait_seconds: avg_queue_to_enter,
-          status_updated_at: stamped_at
+          queue_total: queue_total_for(doc),
+          estimated_wait_seconds: estimated_wait_for(@stamped),
+          status_updated_at: @stamped_at
         }
+        # Set on the first stamp only — records when the guest first reached the front N.
+        data[:position_set_at] = @stamped_at unless doc.data[:position_set_at]
 
-        data[:position_set_at] = stamped_at unless doc.data[:position_set_at]
         batch.update(doc.ref, data)
       end
 
+      # The app's progress bar is (queue_total - position + 1) / queue_total. `position` only counts
+      # down toward 1, so we never let `queue_total` drop either — it freezes at the guest's starting
+      # depth (their deepest position). That keeps the bar moving forward to 100% at position 1
+      # instead of jumping as the live line shrinks. e.g. starting 8th, line draining 8 → 4:
+      #   live total:  6/8 = 38%, then 4/4 = 25% (drops!) ❌
+      #   frozen total: 6/8 = 38%, then 4/8 = 63% (climbs) ✅
+      def queue_total_for(doc)
+        [doc.data[:queue_total].to_i, @stamped].max
+      end
+
+      # ETA written every run (including nil, so a guest whose wait crosses the ceiling has any
+      # stale value cleared and the app stops rendering it). nil means "hide the ETA" — over 1 h
+      # we show the coarse "lots ahead" state instead of a discouraging number.
+      def estimated_wait_for(position)
+        seconds = batch_wait(position) || @flat_wait
+        return nil unless seconds.positive? && seconds <= MAX_WAIT_TO_DISPLAY_SECONDS
+
+        seconds
+      end
+
+      # Groups positions into batches that enter together, so everyone in a batch gets the same ETA.
+      # The batch size is slots_per_call, capped by MAX_ETA_BATCH_SIZE to keep a spiking release rate
+      # from under-promising. nil when slots_per_call is unknown (cold start) → falls back to the
+      # flat lobby average. e.g. batch size 50, 1 call/min:
+      #   flat estimate:  position 1 and position 50 both see ~20 min ❌
+      #   batch estimate: positions  1–50  → batch 1 → ~10 min
+      #                   positions 51–100 → batch 2 → ~20 min  ✅
+      def batch_wait(position)
+        return nil unless @slots_per_call.positive?
+
+        batch_size = [@slots_per_call, MAX_ETA_BATCH_SIZE].min
+        batch_number = ((position - 1) / batch_size) + 1
+        [batch_number * CALLER_INTERVAL_SECONDS, min_queue_floor].max
+      end
+
+      def min_queue_floor
+        SpreeCmCommissioner::WaitingGuestsCaller::MIN_QUEUE_TO_ENTER_SECONDS
+      end
+
       def stamp_paths
         [previous_records_path, records_path]
       end

data/app/views/spree/admin/import_new_orders/_cancel_modal.html.erb

@@ -0,0 +1,35 @@
+<% modal_id = "cancelImportModal#{import.id}" %>
+
+<div class="modal fade" id="<%= modal_id %>" tabindex="-1" role="dialog" aria-labelledby="<%= modal_id %>Label" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="<%= modal_id %>Label">Cancel orders from "<%= import.name %>"?</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <%= form_with url: spree.cancel_admin_import_new_order_path(import.id), method: :post, local: true do %>
+        <div class="modal-body">
+          <div class="alert alert-warning mb-3">
+            This will cancel <strong>all orders</strong> created by this import, restock inventory, and release seat holds. <strong>This cannot be undone.</strong>
+          </div>
+
+          <div class="form-group">
+            <label>Type the import name <code class="text-danger"><%= import.name %></code> to confirm</label>
+            <%= text_field_tag :confirm_name, nil, class: 'form-control', autocomplete: 'off', required: true %>
+          </div>
+
+          <div class="form-group mb-0">
+            <label>Reason</label>
+            <%= text_area_tag :cancellation_reason, nil, class: 'form-control', rows: 4 %>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">No, keep them</button>
+          <%= button_tag 'Yes, cancel orders', type: 'submit', class: 'btn btn-danger' %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -51,6 +51,10 @@
               <span class="badge badge-success"><%= import.status %></span>
             <% when 'failed' %>
               <span class="badge badge-danger"><%= import.status %></span>
+            <% when 'canceling' %>
+              <span class="badge badge-warning"><%= import.status %></span>
+            <% when 'canceled' %>
+              <span class="badge badge-dark"><%= import.status %></span>
             <% else %>
               <span class="badge badge-secondary"><%= import.status %></span>
             <% end %>

data/app/views/spree/admin/import_new_orders/show.html.erb

@@ -2,6 +2,16 @@
   <%= page_header_back_button spree.admin_import_new_orders_path %>
   <%= @import.name %>
 <% end %>
+
+<% if @import.cancellable? %>
+  <% content_for :page_actions do %>
+    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#cancelImportModal<%= @import.id %>">
+      <%= svg_icon name: "cancel.svg", width: '14', height: '14' %>
+      Cancel orders
+    </button>
+  <% end %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/import_order_tabs', locals: { current: :import_new_order } %>
 
 <div class="row w-75">
@@ -33,6 +43,10 @@
               <span class="badge badge-success"><%= @import.status %></span>
             <% when 'failed' %>
               <span class="badge badge-danger"><%= @import.status %></span>
+            <% when 'canceling' %>
+              <span class="badge badge-warning"><%= @import.status %></span>
+            <% when 'canceled' %>
+              <span class="badge badge-dark"><%= @import.status %></span>
             <% else %>
               <span class="badge badge-secondary"><%= @import.status %></span>
             <% end %>
@@ -48,8 +62,24 @@
               </div>
             <% end %>
           </dd>
+          <% if @import.canceled_at.present? %>
+            <dt class="col-sm-3">Canceled At:</dt>
+            <dd class="col-sm-9"><%= @import.canceled_at.strftime('%A, %d %B %Y %H:%M:%S') %></dd>
+            <dt class="col-sm-3">Canceled By:</dt>
+            <dd class="col-sm-9">
+              <%= [@import.canceled_by&.first_name, @import.canceled_by&.last_name].compact.join(' ').presence || @import.canceled_by&.email %>
+            </dd>
+            <% if @import.preferred_cancellation_reason.present? %>
+              <dt class="col-sm-3">Cancellation Reason:</dt>
+              <dd class="col-sm-9"><%= @import.preferred_cancellation_reason %></dd>
+            <% end %>
+          <% end %>
         </dl>
       </div>
     </div>
   </div>
 </div>
+
+<% if @import.cancellable? %>
+  <%= render partial: 'cancel_modal', locals: { import: @import } %>
+<% end %>

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

@@ -30,6 +30,8 @@
                               when 'progress' then 'badge badge-warning'
                               when 'done' then 'badge badge-success'
                               when 'failed' then 'badge badge-danger'
+                              when 'canceling' then 'badge badge-warning'
+                              when 'canceled' then 'badge badge-dark'
                               else 'badge badge-secondary'
                               end %>
               <span class="<%= badge_class %>"><%= import.status %></span>

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

@@ -14,12 +14,17 @@
 
 <%= render 'search' if @holds.any? || params[:q].present? %>
 
+<% current_status = params.dig(:q, :status_eq).presence %>
 <div class="flex-wrap mb-3 alert alert-info d-flex">
+  <%= link_to admin_inventory_holds_path(q: params.fetch(:q, {}).to_unsafe_h.except('status_eq')), class: 'mr-4' do %>
+    <span class="<%= 'font-weight-bold' if current_status.nil? %>">All:</span>
+    <span class="badge badge-dark"><%= @status_counts.values.sum %></span>
+  <% end %>
   <% SpreeCmCommissioner::InventoryHold.statuses.keys.each do |status| %>
-    <span class="mr-4">
-      <strong><%= status.humanize %>:</strong>
+    <%= link_to admin_inventory_holds_path(q: params.fetch(:q, {}).to_unsafe_h.merge('status_eq' => status)), class: 'mr-4' do %>
+      <span class="<%= 'font-weight-bold' if current_status == status %>"><%= status.humanize %>:</span>
       <span class="badge <%= status_badge_classes[status] || 'badge-light' %>"><%= @status_counts[status] || 0 %></span>
-    </span>
+    <% end %>
   <% end %>
 </div>
 

data/config/initializers/spree_permitted_attributes.rb

@@ -55,6 +55,7 @@ module Spree
       :preferred_telegram_order_request_alert_chat_id,
       :preferred_telegram_new_vendor_alert_chat_id,
       :preferred_telegram_new_event_alert_chat_id,
+      :preferred_telegram_order_anomaly_alert_chat_id,
       :preferred_assetlinks,
       :preferred_apple_app_site_association,
       { default_notification_image_attributes: {} },

data/config/locales/en.yml

@@ -649,11 +649,11 @@ en:
         title: "💸 Order Complete!"
         message: "Your Order numer is  %{order_number}"
       payment_incomplete_notification:
-        title: "Incomplete Payment"
-        message: "Unable to process payment %{order_number}"
+        title: "Complete Your Payment"
+        message: "We couldn't process your payment for order %{order_number}."
       release_inventory_item_notification:
-        title: "Order released"
-        message: "Order %{order_number} has been released."
+        title: "Ticket Reservation Expired"
+        message: "Your ticket reservation for order %{order_number} has expired and the reserved tickets have been released."
       order_accepted_notification:
         title: "Confirm!"
         message: "Your request has been confirmed; please check your upcoming trip."

data/config/locales/km.yml

@@ -474,11 +474,11 @@ km:
         title: "💸 ការបញ្ជាទិញទទួលបានជោគជ័យ!"
         message: "លេខបញ្ជាទិញរបស់អ្នកគឺ ​%{order_number}"
       payment_incomplete_notification:
-        title: "ការទូទាត់មិនជោគជ័យ"
-        message: "មិនអាចដំណើរការការទូទាត់បាន %{order_number}"
+        title: "សូមបញ្ចប់ការទូទាត់របស់អ្នក"
+        message: "យើងមិនអាចដំណើរការការទូទាត់សម្រាប់ការបញ្ជាទិញ %{order_number} របស់អ្នកបានទេ។"
       release_inventory_item_notification:
-        title: "ការកក់ត្រូវបានដោះលែង"
-        message: "ការបញ្ជាទិញ %{order_number} ត្រូវបានដោះលែងហើយ។"
+        title: "ការកក់សំបុត្រត្រូវបានផុតកំណត់"
+        message: "ការកក់សំបុត្រសម្រាប់ការបញ្ជាទិញ %{order_number} របស់អ្នកត្រូវបានផុតកំណត់ ហើយសំបុត្រដែលបានកក់ត្រូវបានដោះលែងវិញ។"
       order_accepted_notification:
         title: "បានយល់ព្រម!"
         message: "សំណើរបស់អ្នកត្រូវបានបញ្ជាក់; សូមពិនិត្យមើលការធ្វើដំណើរនាពេលខាងមុខរបស់អ្នក"

data/config/routes.rb

@@ -285,6 +285,7 @@ Spree::Core::Engine.add_routes do
         resources :import_new_orders do
           member do
             get :download
+            post :cancel
           end
         end
 

data/db/migrate/20260616000001_add_canceled_by_id_to_cm_imports.rb

@@ -0,0 +1,5 @@
+class AddCanceledByIdToCmImports < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_imports, :canceled_by_id, :bigint, if_not_exists: true
+  end
+end

data/db/migrate/20260617000002_create_cm_imported_orders.rb

@@ -0,0 +1,12 @@
+class CreateCmImportedOrders < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_imported_orders, if_not_exists: true do |t|
+      t.bigint :order_id, null: false
+      t.bigint :import_order_id, null: false
+      t.timestamps
+    end
+
+    add_index :cm_imported_orders, :order_id, unique: true, if_not_exists: true
+    add_index :cm_imported_orders, :import_order_id, if_not_exists: true
+  end
+end

data/db/migrate/20260619000001_create_cm_idempotency_keys.rb

@@ -0,0 +1,11 @@
+class CreateCmIdempotencyKeys < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_idempotency_keys, if_not_exists: true do |t|
+      t.string :key, null: false
+      t.timestamps
+    end
+
+    add_index :cm_idempotency_keys, :key, unique: true, if_not_exists: true
+    add_index :cm_idempotency_keys, :created_at, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.6'.freeze
+  VERSION = '2.8.7'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-18 00:00:00.000000000 Z
+date: 2026-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1164,6 +1164,7 @@ files:
 - app/finders/spree_cm_commissioner/events/find_matches.rb
 - app/finders/spree_cm_commissioner/inventory_items/recently_changed_finder.rb
 - app/finders/spree_cm_commissioner/orders/find.rb
+- app/finders/spree_cm_commissioner/orders/find_by_all_state.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
 - app/finders/spree_cm_commissioner/places/find_with_route.rb
@@ -1325,10 +1326,12 @@ files:
 - app/interactors/spree_cm_commissioner/webhook_subscriber_orders_sender.rb
 - app/jobs/application_job.rb
 - app/jobs/application_unique_job.rb
+- app/jobs/concerns/spree_cm_commissioner/idempotent_job.rb
 - app/jobs/spree_cm_commissioner/account_deletion_cron_job.rb
 - app/jobs/spree_cm_commissioner/application_job.rb
 - app/jobs/spree_cm_commissioner/application_job_decorator.rb
 - app/jobs/spree_cm_commissioner/application_unique_job.rb
+- app/jobs/spree_cm_commissioner/cancel_import_order_job.rb
 - app/jobs/spree_cm_commissioner/chatrace_order_creator_job.rb
 - app/jobs/spree_cm_commissioner/completion_steps/regenerate_for_line_items_job.rb
 - app/jobs/spree_cm_commissioner/customer_content_notification_creator_job.rb
@@ -1342,6 +1345,7 @@ files:
 - app/jobs/spree_cm_commissioner/export_job.rb
 - app/jobs/spree_cm_commissioner/firebase_email_fetcher_job.rb
 - app/jobs/spree_cm_commissioner/guests/preload_check_in_session_ids_job.rb
+- app/jobs/spree_cm_commissioner/idempotency_keys/prune_job.rb
 - app/jobs/spree_cm_commissioner/import_order_job.rb
 - app/jobs/spree_cm_commissioner/integrations/base_job.rb
 - app/jobs/spree_cm_commissioner/integrations/cleanup_sync_sessions_job.rb
@@ -1383,6 +1387,7 @@ files:
 - app/jobs/spree_cm_commissioner/state_job.rb
 - app/jobs/spree_cm_commissioner/subscription_order_executor_job.rb
 - app/jobs/spree_cm_commissioner/telegram_alerts/integration_sync_failure_job.rb
+- app/jobs/spree_cm_commissioner/telegram_alerts/order_integrity_check_job.rb
 - app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_gateway/pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_notification_sender_job.rb
@@ -1516,9 +1521,11 @@ files:
 - app/models/spree_cm_commissioner/hotel_google_wallet.rb
 - app/models/spree_cm_commissioner/icon_decorator.rb
 - app/models/spree_cm_commissioner/id_card.rb
+- app/models/spree_cm_commissioner/idempotency_key.rb
 - app/models/spree_cm_commissioner/image_decorator.rb
 - app/models/spree_cm_commissioner/image_methods_decorator.rb
 - app/models/spree_cm_commissioner/import.rb
+- app/models/spree_cm_commissioner/imported_order.rb
 - app/models/spree_cm_commissioner/imports/import_order.rb
 - app/models/spree_cm_commissioner/imports/import_payment_reference.rb
 - app/models/spree_cm_commissioner/integration.rb
@@ -2128,6 +2135,7 @@ files:
 - app/services/spree_cm_commissioner/homepage_data.rb
 - app/services/spree_cm_commissioner/homepage_data_loader.rb
 - app/services/spree_cm_commissioner/imports/orders/base.rb
+- app/services/spree_cm_commissioner/imports/orders/cancel.rb
 - app/services/spree_cm_commissioner/imports/orders/create.rb
 - app/services/spree_cm_commissioner/imports/orders/update.rb
 - app/services/spree_cm_commissioner/integrations/base/sync_manager.rb
@@ -2222,8 +2230,12 @@ files:
 - app/services/spree_cm_commissioner/signing/verify_signature.rb
 - app/services/spree_cm_commissioner/sprite_data_loader_service.rb
 - app/services/spree_cm_commissioner/sprite_import_service.rb
+- app/services/spree_cm_commissioner/telegram_alerts/checks/order_complete_payment_not_paid.rb
+- app/services/spree_cm_commissioner/telegram_alerts/checks/payment_paid_order_not_complete.rb
 - app/services/spree_cm_commissioner/telegram_alerts/event_creation.rb
 - app/services/spree_cm_commissioner/telegram_alerts/integration_sync_failure.rb
+- app/services/spree_cm_commissioner/telegram_alerts/order_integrity_alert.rb
+- app/services/spree_cm_commissioner/telegram_alerts/order_integrity_checks_runner.rb
 - app/services/spree_cm_commissioner/telegram_gateway/pin_code_sender.rb
 - app/services/spree_cm_commissioner/ticket_transfers/accept.rb
 - app/services/spree_cm_commissioner/ticket_transfers/cancel.rb
@@ -2360,6 +2372,7 @@ files:
 - app/views/spree/admin/import_existing_orders/index.html.erb
 - app/views/spree/admin/import_existing_orders/new.html.erb
 - app/views/spree/admin/import_existing_orders/show.html.erb
+- app/views/spree/admin/import_new_orders/_cancel_modal.html.erb
 - app/views/spree/admin/import_new_orders/_form.html.erb
 - app/views/spree/admin/import_new_orders/_import_new_order_instruction.html.erb
 - app/views/spree/admin/import_new_orders/index.html.erb
@@ -3254,6 +3267,9 @@ files:
 - db/migrate/20260610000001_drop_is_open_dated_from_cm_trips.rb
 - db/migrate/20260614000001_change_code_limit_in_cm_pin_codes.rb
 - db/migrate/20260615000002_add_index_to_code_on_cm_pin_codes.rb
+- db/migrate/20260616000001_add_canceled_by_id_to_cm_imports.rb
+- db/migrate/20260617000002_create_cm_imported_orders.rb
+- db/migrate/20260619000001_create_cm_idempotency_keys.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md
 - docs/option_types/attr_types.md