spree_cm_commissioner 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8d11251736536036263c451dde5cb82e34a6d54b12fe116866a338346d8097
-  data.tar.gz: f1cec56cfe9db369b4bf70a40c8545e09fd2b89a9d0fd1e2d0547cf4818a04eb
+  metadata.gz: ca304c9bd308649d477548d5a5930737a651dc8fa9f1dc55eaff6d60c5b91ba0
+  data.tar.gz: e3fc4442166c3a178f759ec32ddc1feb39d7240505623be3d8437a55bffc963d
 SHA512:
-  metadata.gz: b0d1ef1dca4921e6493b8455b31c31b9289444aa64b3d5378dc6d87c0676c081ee2c0148dfd3a46fb8572d30fb8fb86d6c53a24249768b3b9001fbb3f2f6a4fa
-  data.tar.gz: a3dfc479c74f38e3889e84ab72246fc01e31134a630563f4f3bf2b3713e3e13d2df1389a0bdf1aae4337e56d891cb6a6dc29e21570d28b84d9d75a5b1d1cd152
+  metadata.gz: f469ec325a78e226309906f0ccf6a1b9d66d3354505919cca451c16dd70c8dec2229c9c44fbe6cf17a8d0109d1a4805c1cd38fb1787ccf0f8d3d0ed174164f64
+  data.tar.gz: 78d7c13c8c6107ff36203f79e290f44b3543a2db9fa994772ed08a049da97dac9368102855b0726e1b3417f17a22ec7feb4be0778627dd7dd7057d81f2f54d98

data/Gemfile.lock

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

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

@@ -9,6 +9,7 @@ module Spree
         q['s'] ||= 'created_at desc'
         q['created_at_gt'] = parse_time_or_nil(q['created_at_gt'], :beginning_of_day) if q['created_at_gt'].present?
         q['created_at_lt'] = parse_time_or_nil(q['created_at_lt'], :end_of_day) if q['created_at_lt'].present?
+        normalize_enum_filters!(q)
 
         @search = scope.ransack(q)
         result_scope = @search.result(distinct: true)
@@ -18,7 +19,11 @@ module Spree
                  .page(params[:page])
                  .per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
 
-        @status_counts = result_scope.reorder(nil).group(:status).count
+        # Status tab counts must reflect every other filter but NOT the status filter, so
+        # each tab shows how many holds it would return (otherwise selecting one status
+        # zeroes out all the other tabs).
+        @status_counts = scope.ransack(q.except('status_eq')).result(distinct: true)
+                              .reorder(nil).group(:status).count
       end
 
       def release
@@ -44,6 +49,20 @@ module Spree
 
       private
 
+      # `status` and `release_reason` are integer-backed enums. Ransack casts a string
+      # value for an integer column with String#to_i, so "payment_locked" becomes 0
+      # (== :pending) and every label silently filters to the wrong status. Translate
+      # enum labels to their stored integer before searching.
+      def normalize_enum_filters!(query)
+        {
+          'status_eq' => SpreeCmCommissioner::InventoryHold.statuses,
+          'release_reason_eq' => SpreeCmCommissioner::InventoryHold.release_reasons
+        }.each do |key, mapping|
+          value = query[key]
+          query[key] = mapping[value.to_s] if value.present? && mapping.key?(value.to_s)
+        end
+      end
+
       def back_params
         raw_params = params[:back_params].presence || params
         ActionController::Parameters.new(raw_params).permit(:page, :per_page, q: {})

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

@@ -30,13 +30,18 @@ module Spree
           private
 
           def collection
+            # WARNING: Do NOT remove .order(id: :desc).
+            # Mobile relies on this ordering for paginated order_histories.
+            # Removing it will cause mobile to paginate by oldest records first (last 10 oldest),
+            # breaking the "most recent orders" display on the order history screen.
+            # It related to user cancel or complete order flow, which relies on the most recent orders being returned first.
             if spree_current_user.present?
-              spree_current_user.orders.not_archived
+              spree_current_user.orders.not_archived.order(id: :desc)
             else
               order_tokens = Array(params[:order_tokens])
               return Spree::Order.none if order_tokens.empty?
 
-              Spree::Order.not_archived.without_user.where(token: order_tokens)
+              Spree::Order.not_archived.without_user.where(token: order_tokens).order(id: :desc)
             end
           end
 

data/app/controllers/spree/api/v2/tenant/order_histories_controller.rb

@@ -37,13 +37,18 @@ module Spree
           end
 
           def collection
+            # WARNING: Do NOT remove .order(id: :desc).
+            # Mobile relies on this ordering for paginated order_histories.
+            # Removing it will cause mobile to paginate by oldest records first (last 10 oldest),
+            # breaking the "most recent orders" display on the order history screen.
+            # It related to user cancel or complete order flow, which relies on the most recent orders being returned first.
             if spree_current_user.present?
-              spree_current_user.orders.not_archived
+              spree_current_user.orders.not_archived.order(id: :desc)
             else
               order_tokens = Array(params[:order_tokens])
               return Spree::Order.none if order_tokens.empty?
 
-              Spree::Order.not_archived.without_user.where(token: order_tokens)
+              Spree::Order.not_archived.without_user.where(token: order_tokens).order(id: :desc)
             end
           end
 

data/app/interactors/spree_cm_commissioner/waiting_guests_caller.rb

@@ -13,25 +13,31 @@ module SpreeCmCommissioner
     FIRESTORE_BATCH_SIZE = (ENV['WAITING_ROOM_FIRESTORE_BATCH_SIZE'] || 500).to_i
 
     def call
+      started_at = Time.zone.now
       available_slots = fetch_available_slots
-      return unless available_slots.positive?
 
-      long_waiting_guests = fetch_long_waiting_guests(available_slots)
-      calling_all(long_waiting_guests)
+      # Always run through to mark_as — even with no slots — so the lobby keeps a fresh heartbeat
+      # (logs.waiting_guests_caller_job) during peak/full periods instead of going stale
+      # and looking like a dead cron.
+      long_waiting_guests = available_slots.positive? ? fetch_long_waiting_guests(available_slots) : []
+      calling_all(long_waiting_guests) if long_waiting_guests.any?
 
       mark_as(
         full: long_waiting_guests.size >= available_slots,
         available_slots: available_slots - long_waiting_guests.size,
         avg_wait_to_enter_seconds: compute_avg_wait_to_enter_seconds(long_waiting_guests),
         avg_queue_to_enter_seconds: compute_avg_queue_to_enter_seconds(long_waiting_guests),
-        slots_per_call: available_slots
+        recent_slots_per_call: available_slots.positive? ? available_slots : nil,
+        active_sessions: @active_sessions,
+        max_sessions: @max_sessions,
+        logs: call_logs(started_at: started_at, called_count: long_waiting_guests.size)
       )
     end
 
     def fetch_available_slots
-      max_sessions = fetch_max_sessions
-      active_sessions = SpreeCmCommissioner::WaitingRoomSession.active.count
-      max_sessions - active_sessions
+      @max_sessions = fetch_max_sessions
+      @active_sessions = SpreeCmCommissioner::WaitingRoomSession.active.count
+      @max_sessions - @active_sessions
     end
 
     # This query requires an index; create it in Firebase beforehand.
@@ -100,21 +106,44 @@ module SpreeCmCommissioner
     end
 
     # merge: true so we preserve the published `waiting_guests_records_path` on the lobby doc.
-    def mark_as(
+    # App-facing fields plus live capacity state (full / available_slots / active_sessions /
+    # max_sessions / ETAs) stay top-level; this run's observability snapshot is namespaced under
+    # `logs.waiting_guests_caller_job` (see #call_logs). merge: true deep-merges nested maps, so
+    # each job owns its own key under `logs` without clobbering the others.
+    def mark_as( # rubocop:disable Metrics/ParameterLists
       full:,
       available_slots:,
       avg_wait_to_enter_seconds: nil,
       avg_queue_to_enter_seconds: nil,
-      slots_per_call: nil
+      recent_slots_per_call: nil,
+      active_sessions: nil,
+      max_sessions: nil,
+      logs: nil
     )
       data = { full: full, available_slots: available_slots }
       data[:avg_wait_to_enter_seconds] = avg_wait_to_enter_seconds if avg_wait_to_enter_seconds
       data[:avg_queue_to_enter_seconds] = avg_queue_to_enter_seconds if avg_queue_to_enter_seconds
-      data[:slots_per_call] = slots_per_call if slots_per_call
+      data[:recent_slots_per_call] = recent_slots_per_call if recent_slots_per_call
+      data[:active_sessions] = active_sessions unless active_sessions.nil?
+      data[:max_sessions] = max_sessions unless max_sessions.nil?
+      data[:logs] = { waiting_guests_caller_job: logs } if logs
 
       lobby_document.set(data, merge: true)
     end
 
+    # Point-in-time snapshot (overwritten each run, never cumulative) of this caller run: last-run
+    # timing (heartbeat) and how many guests were called. Capacity state (active/max sessions,
+    # available_slots) lives top-level, not here.
+    def call_logs(started_at:, called_count:)
+      finished_at = Time.zone.now
+      {
+        called_count: called_count,
+        last_started_at: started_at,
+        last_finished_at: finished_at,
+        last_duration_ms: ((finished_at - started_at) * 1000).round
+      }
+    end
+
     # Average total wait (queued_at → allow_to_enter_room_at) for just-called guests.
     # Used for the Waiting Room step ETA: how long until I get in from when I joined.
     def compute_avg_wait_to_enter_seconds(guests)

data/app/mailers/spree/order_mailer_decorator.rb

@@ -33,6 +33,7 @@ module Spree
         @brand_color = @order.tenant.preferred_brand_primary_color
       end
       @product_type = @order.products.first&.product_type || 'accommodation'
+      @is_email = true
 
       subject = build_subject(resend)
 
@@ -86,6 +87,7 @@ module Spree
 
       @current_store = @order.store
       @product_type = @line_item.product_type
+      @is_email = true
 
       subject = "#{@current_store&.name} Booking Confirmation ##{@order.number}"
 

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

@@ -271,7 +271,18 @@ module SpreeCmCommissioner
 
     def send_order_request_telegram_confirmation_alert_to_vendor; end
 
+    # Telegram order alerts are sent unless EVERY purchased product opts out.
+    # Default is true (see product_decorator), so existing orders are unaffected.
+    # Checked at enqueue time so disabled products create no telegram jobs at all.
+    def telegram_alert_enabled?
+      return @telegram_alert_enabled if defined?(@telegram_alert_enabled)
+
+      @telegram_alert_enabled = line_items.any?(&:enable_telegram_alert?)
+    end
+
     def send_order_complete_telegram_alert_to_vendors
+      return unless telegram_alert_enabled?
+
       vendor_list.each do |vendor|
         title = '🎫 --- [NEW ORDER FROM BOOKME+] ---'
         chat_id = vendor.preferred_telegram_chat_id
@@ -287,6 +298,8 @@ module SpreeCmCommissioner
     end
 
     def notify_order_complete_telegram_notification_to_user
+      return unless telegram_alert_enabled?
+
       SpreeCmCommissioner::OrderCompleteTelegramSenderJob.perform_later(order_id: id) if user_id.present?
     end
 
@@ -303,6 +316,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_requested_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '🔔 --- [NEW REQUESTED BY USER] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -310,6 +325,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_accepted_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '✅ --- [ORDER ACCEPTED BY VENDOR] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -317,6 +334,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_rejected_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '❌ --- [ORDER REJECTED BY VENDOR] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -325,6 +344,7 @@ module SpreeCmCommissioner
 
     def run_order_complete_alerts
       return unless ENV['ORDER_INTEGRITY_TELEGRAM_ALERT_ENABLED'] == 'yes'
+      return unless telegram_alert_enabled?
 
       # Allow async payment processors time to settle before checking for alerts
       SpreeCmCommissioner::TelegramAlerts::OrderIntegrityCheckJob
@@ -333,6 +353,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_complete_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '🎫 --- [NEW ORDER] ---'
       chat_id = store.preferred_telegram_order_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)

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

@@ -11,6 +11,8 @@ module SpreeCmCommissioner
                :allow_self_check_in?,
                :required_self_check_in_location,
                :required_self_check_in_location?,
+               :enable_telegram_alert,
+               :enable_telegram_alert?,
                to: :product
     end
   end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -85,6 +85,7 @@ module SpreeCmCommissioner
 
       base.store_public_metadata :open_dated_validity_days, :integer, default: 90
       base.store_public_metadata :enable_inventory_hold, :boolean, default: false
+      base.store_public_metadata :enable_telegram_alert, :boolean, default: true
 
       base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
       base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?

data/app/overrides/spree/admin/orders/_search/payment_number_search_field.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_after ".date-range-filter" -->
+
+<div class="col-12 col-lg-4">
+  <div class="form-group">
+    <%= label_tag :q_payments_number_cont, 'Payment Number' %>
+    <%= f.text_field :payments_number_cont, class: 'form-control' %>
+  </div>
+</div>

data/app/overrides/spree/admin/products/_form/enable_telegram_alert.html.erb.deface

@@ -0,0 +1,14 @@
+<!-- insert_after "[data-hook='admin_product_form_promotionable']" -->
+
+<div>
+  <%= f.field_container :enable_telegram_alert do %>
+    <%= f.label :enable_telegram_alert do %>
+      <%= f.check_box :enable_telegram_alert %>
+      <%= Spree.t(:enable_telegram_alert) %>
+    <% end %>
+    <small class="form-text text-muted">
+      When enabled, Telegram order alerts are sent for this product. Turn off for
+      high-volume products to avoid flooding Telegram with order notifications.
+    </small>
+  <% end %>
+</div>

data/app/services/spree_cm_commissioner/cart/add_guest.rb

@@ -13,9 +13,23 @@ module SpreeCmCommissioner
           create_blank_guest(line_item)
           increase_quantity(line_item) if should_increase_quantity?(line_item)
           recalculate_cart(order, line_item)
-
-          success(order: order, line_item: line_item)
         end
+
+        success(order: order, line_item: line_item)
+      rescue ActiveRecord::RecordInvalid => e
+        # Convert ONLY the out-of-stock failure into a failure result. The stock validator
+        # tags its error with the type :selected_quantity_not_available (see
+        # Spree::Stock::AvailabilityValidator), so we match on that type rather than on any
+        # RecordInvalid. The raise rolls back the lock transaction (so the blank guest is
+        # not persisted); returning it as a failure lets the caller render the overridden
+        # availability message instead of a 500.
+        #
+        # Anything else a different line item validation, or an invalid order/shipment
+        # raised by recalculate_cart is re-raised so genuine backend errors are not
+        # masked behind an empty quantity error.
+        raise unless e.record == line_item && e.record.errors.of_kind?(:quantity, :selected_quantity_not_available)
+
+        failure(e.record)
       end
 
       private

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

@@ -17,8 +17,17 @@ module SpreeCmCommissioner
       extend SpreeCmCommissioner::ServiceModuleThrowable
 
       def call
-        # merge: true so we never clobber the lobby's `full` / `available_slots` fields.
-        lobby_document.set({ waiting_guests_records_path: records_path }, merge: true)
+        # merge: true so we never clobber the lobby's `full` / `available_slots` fields, and it
+        # deep-merges the nested `logs` map so each job keeps its own namespaced key.
+        # logs.publish_lobby_path_job.last_published_at is a point-in-time heartbeat: it confirms
+        # the 5-min publisher cron is alive and (with the path above) shows the date partition.
+        lobby_document.set(
+          {
+            waiting_guests_records_path: records_path,
+            logs: { publish_lobby_path_job: { last_published_at: Time.zone.now } }
+          },
+          merge: true
+        )
 
         success(records_path: records_path)
       rescue StandardError => e

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

@@ -23,7 +23,7 @@ module SpreeCmCommissioner
       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
+      # recent_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.
@@ -39,11 +39,11 @@ module SpreeCmCommissioner
       private
 
       def stamp_positions
+        started_at = Time.zone.now
         paths = stamp_paths
         total = paths.sum { |path| waiting_count(path) }
-        return if total.zero?
 
-        @slots_per_call = lobby_data[:slots_per_call].to_i
+        @recent_slots_per_call = lobby_data[:recent_slots_per_call].to_i
         @flat_wait = lobby_data[:avg_queue_to_enter_seconds].to_i
         @stamped_at = Time.zone.now
         @stamped = 0
@@ -60,6 +60,31 @@ module SpreeCmCommissioner
             firestore.batch { |batch| slice.each { |doc| stamp_doc(batch, doc) } }
           end
         end
+
+        publish_logs(started_at: started_at, waiting_total: total)
+      end
+
+      # Point-in-time heartbeat for the position-stamper cron, mirroring the caller/publisher writers.
+      # Written every run (even when nobody is waiting) so a stale timestamp signals a dead cron rather
+      # than an empty queue. merge: true deep-merges into the shared lobby `logs` map, so this job's
+      # key sits alongside the caller's and publisher's without clobbering them.
+      def publish_logs(started_at:, waiting_total:)
+        finished_at = Time.zone.now
+        lobby_document.set(
+          {
+            logs: {
+              stamp_queue_positions_job: {
+                stamped_count: @stamped,
+                waiting_total: waiting_total,
+                stamp_limit_reached: waiting_total > STAMP_LIMIT,
+                last_started_at: started_at,
+                last_finished_at: finished_at,
+                last_duration_ms: ((finished_at - started_at) * 1000).round
+              }
+            }
+          },
+          merge: true
+        )
       end
 
       def stamp_doc(batch, doc)
@@ -98,16 +123,16 @@ module SpreeCmCommissioner
       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
+      # The batch size is recent_slots_per_call, capped by MAX_ETA_BATCH_SIZE to keep a spiking release rate
+      # from under-promising. nil when recent_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?
+        return nil unless @recent_slots_per_call.positive?
 
-        batch_size = [@slots_per_call, MAX_ETA_BATCH_SIZE].min
+        batch_size = [@recent_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
@@ -141,7 +166,11 @@ module SpreeCmCommissioner
       end
 
       def lobby_data
-        @lobby_data ||= firestore.col('waiting_rooms').doc('lobby').get.data || {}
+        @lobby_data ||= lobby_document.get.data || {}
+      end
+
+      def lobby_document
+        @lobby_document ||= firestore.col('waiting_rooms').doc('lobby')
       end
 
       def firestore

data/app/views/spree_cm_commissioner/order_mailer/purchased_items/_items.html.erb

@@ -61,15 +61,18 @@
               <% end %>
             </td>
           </tr>
-          <tr>
-            <td></td>
-            <td align="left" style="padding-top:6px;">
-              <%= link_to(
-                raw('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; vertical-align: middle; margin-right: 8px;"><rect width="5" height="5" x="3" y="3" rx="1"/><rect width="5" height="5" x="16" y="3" rx="1"/><rect width="5" height="5" x="3" y="16" rx="1"/><path d="M21 16h-3a2 2 0 0 0-2 2v3"/><path d="M21 21v.01"/><path d="M12 7v3a2 2 0 0 1-2 2H7"/><path d="M3 12h.01"/><path d="M12 3h.01"/><path d="M12 16v.01"/><path d="M16 12h1"/><path d="M21 12v.01"/><path d="M12 21v-1"/></svg> View Your Digital Ticket'),
-                custom_product_line_item_url(line_item), class: "btn-primary", target: :_blank
-              ) %>
-            </td>
-          </tr>
+          <%# In the email only, hide the ticket link for app-only products. %>
+          <% unless @is_email && line_item&.product&.purchasable_on_app? %>
+            <tr>
+              <td></td>
+              <td align="left" style="padding-top:6px;">
+                <%= link_to(
+                  raw('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; vertical-align: middle; margin-right: 8px;"><rect width="5" height="5" x="3" y="3" rx="1"/><rect width="5" height="5" x="16" y="3" rx="1"/><rect width="5" height="5" x="3" y="16" rx="1"/><path d="M21 16h-3a2 2 0 0 0-2 2v3"/><path d="M21 21v.01"/><path d="M12 7v3a2 2 0 0 1-2 2H7"/><path d="M3 12h.01"/><path d="M12 3h.01"/><path d="M12 16v.01"/><path d="M16 12h1"/><path d="M21 12v.01"/><path d="M12 21v-1"/></svg> View Your Digital Ticket'),
+                  custom_product_line_item_url(line_item), class: "btn-primary", target: :_blank
+                ) %>
+              </td>
+            </tr>
+          <% end %>
         </table>
       </td>
     </tr>

data/config/initializers/spree_permitted_attributes.rb

@@ -6,6 +6,9 @@ module Spree
     @@vendor_attributes << :logo
     @@vendor_attributes << :service_origin_id
 
+    # store_accessor key (public_metadata), not a DB column, so it must be permitted explicitly
+    @@product_attributes << :enable_telegram_alert unless @@product_attributes.include?(:enable_telegram_alert)
+
     # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
     # of spree add_item service, if we want to only permit some guest attributes,
     # we need to override most part of add_item service.

data/config/locales/en.yml

@@ -217,6 +217,7 @@ en:
 
   spree:
     description: Description
+    enable_telegram_alert: Enable Telegram Alert
     registered_by:
       system_registered: "System Registered"
       self_registered: "Self Registered"
@@ -414,6 +415,9 @@ en:
       zero: "Rooms are not available on %{date}"
       one: "Only 1 room available on %{date}"
       other: "Only %{count} rooms available on %{date}"
+    # Overrides Spree core's "selected of %{item} is not available." Must stay under
+    # `spree:` -- Spree::Stock::AvailabilityValidator looks it up as Spree.t(:selected_quantity_not_available).
+    selected_quantity_not_available: "Not enough %{item} are available for the quantity you selected. Please try again."
     auto_apply: "Auto apply"
     auto_apply_info: "Path & code will be removed"
     transit:
@@ -715,7 +719,7 @@ en:
   inventory_hold:
     acquire:
       success: "Item reserved for %{minutes} minutes"
-      insufficient_stock: "Sorry, this item is no longer available."
+      insufficient_stock: "Some items in your cart are currently held by another customer or no longer available. Please update your cart or try again shortly."
       limit_exceeded: "You have too many pending reservations. Please complete or cancel a reservation before trying another."
       system_error: "We encountered an issue reserving this item. Please try again."
       lock_timeout: "Another reservation is in progress for this order. Please wait and try again."

data/config/locales/km.yml

@@ -357,6 +357,7 @@ km:
         unknown: "មិនស្គាល់"
     upsupported_payment: "មិនស្គាល់ការបង់ប្រាក់"
     selected_item_not_available_on_date: "Selected item not available on %{date}"
+    selected_quantity_not_available: "%{item} នៅសល់តិចជាងការអ្នកស្នើសុំរបស់អ្នក ឬអស់ពីស្តុក សូមព្យាយាមម្ដងទៀត។"
     auto_apply: "ដាក់ប្រើដោយស្វ័យប្រវត្តិ"
     auto_apply_info: "Path & code will be removed"
     device_tokens: "Device Tokens"
@@ -518,7 +519,7 @@ km:
   inventory_hold:
     acquire:
       success: "ទំនិញត្រូវបានកក់រយៈពេល %{minutes} នាទី"
-      insufficient_stock: "សុំទោស! ទំនិញមិនមានស្តុកគ្រប់គ្រាន់សម្រាប់ការកក់របស់អ្នកទេ។"
+      insufficient_stock: "ទំនិញមួយចំនួននៅក្នុងកន្ត្រករបស់អ្នកកំពុងត្រូវបានកក់ដោយអតិថិជនផ្សេងទៀត ឬលែងមានស្តុក។ សូមកែប្រែកន្ត្រករបស់អ្នក ឬព្យាយាមម្តងទៀតក្នុងពេលបន្តិចទៀត។"
       limit_exceeded: "អ្នកមានការកក់ដែលរង់ចាំច្រើនពេក។ សូមបញ្ចប់ ឬលុបការកក់មួយមុនពេលព្យាយាមវិញ។"
       system_error: "មានបញ្ហាក្នុងការកក់ទំនិញនេះ។ សូមព្យាយាមម្តងទៀត។"
       lock_timeout: "កំពុងកក់សម្រាប់ការបញ្ជាទិញនេះ។ សូមរង់ចាំ ហើយព្យាយាមម្តងទៀត។"

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.8
 platform: ruby
 authors:
 - You
@@ -1734,6 +1734,7 @@ files:
 - app/overrides/spree/admin/orders/_search/intel_phone_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/line_item_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/payment_method_search_field.html.erb.deface
+- app/overrides/spree/admin/orders/_search/payment_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/vendor_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/customer_details/_form/phone_number_field.html.erb.deface
 - app/overrides/spree/admin/payment_methods/_form/display_on_field.html.erb.deface
@@ -1746,6 +1747,7 @@ files:
 - app/overrides/spree/admin/products/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/enable_inventory_hold.html.erb.deface
+- app/overrides/spree/admin/products/_form/enable_telegram_alert.html.erb.deface
 - app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/need_confirmation_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/option_types.html.erb.deface