spree_cm_commissioner 2.12.5 → 2.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0228f6ca7b7b92d005af33e616b862a1ca576c9320b70510c7f235fbb058848
-  data.tar.gz: 66e3e4f595da2175c3fd0b06ca0c5712bb340b3fb8b9e1e1f71cd1495559dda9
+  metadata.gz: ed84dcf2382e8d3720366acd62551189adfa4edba9533d8ca5e94b0704942836
+  data.tar.gz: aa37bf6b43593f7f7ff91d71d1839b1ceeeb8c9271d5db371451f94958399366
 SHA512:
-  metadata.gz: 3a21bc63b5229c2ab198fa5d1d342b8375ed069d9a4cbee964243310a840a99acf9ab63b426defeca77b8f1f5511fcfa4fa8e5703c72fe580c06d53834452961
-  data.tar.gz: 71f6bd10a265ab1dd8c6ed0b30972105f3d2cfa332a2da3b6dfa347c8899eb1e97bb9962a6ff1c831b5cc3c6e3209409c435154e6cdc4f92a162191990bd2263
+  metadata.gz: a5b89052a82aedeed1144cf9a5892e3d8ec2428c3a4cd26cc5806010c1bbcc3ad353a768e6854c3fdaf69a2ae2fdb5f6f049616b7cac1b2a9d3cd532344708d3
+  data.tar.gz: 7842ce22211f5e072e308efda5f4f5a0b95625729d18388ec6c3c22406fd76b4e5577daca6d5a9f717fd28990639d3897b3a0d58c1d18bebd2c1959f152b7b80

data/Gemfile.lock

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

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

@@ -20,8 +20,6 @@ module Spree
         # Off `collection`, which ResourceController already scoped with accessible_by(current_ability)
         # — going through model_class directly would discard that.
         @private_sales = collection.order(created_at: :desc).page(params[:page]).per(25)
-
-        load_audience_names
       end
 
       # PATCH /admin/private_sales/:id/revoke
@@ -38,19 +36,6 @@ module Spree
 
       private
 
-      # Names for every product, user and role named by the sales ON THIS PAGE, in three queries.
-      # The ids live in jsonb rather than join tables, so there is no association for `includes` to
-      # preload — asking each row for its own would be 3 queries per row.
-      def load_audience_names
-        sales = @private_sales.to_a
-
-        @product_names = Spree::Product.where(id: sales.flat_map(&:product_ids)).pluck(:id, :name).to_h
-        @user_emails = Spree::User.where(id: sales.flat_map(&:user_ids)).pluck(:id, :email).to_h
-        @role_names = Spree::Role.where(id: sales.flat_map(&:role_ids))
-                                 .pluck(:id, :presentation, :name)
-                                 .to_h { |id, presentation, name| [id, presentation.presence || name] }
-      end
-
       # Straight to edit rather than back to the list: a sale is not usable until stock is withheld
       # for it, and edit is where that happens. Landing on the index would hide the next step.
       # non_vendor: a private sale grants access across the store, and this repo's roles include

data/app/helpers/spree_cm_commissioner/admin/inventory_locks_helper.rb

@@ -15,7 +15,13 @@ module SpreeCmCommissioner
         capacity = inventory_item.max_capacity.to_i
         return nil if capacity.zero?
 
-        (inventory_item.quantity_available.to_f / capacity * 100).round
+        percentage = inventory_item.quantity_available.to_f / capacity * 100
+        return percentage.round if percentage <= 0 || percentage >= 1
+
+        # A few seats left out of a large capacity is a fraction of a percent but is NOT sold out;
+        # rounding it whole would print 0% and read as exactly that. Two decimals, floored at 0.01 so
+        # capacities past 10k still show something non-zero.
+        [percentage.round(2), 0.01].max
       end
 
       # High/medium/low as risk of running out of public stock, not as a grade — a bare number in a

data/app/services/spree_cm_commissioner/events/publish_stock_statuses_to_firestore.rb

@@ -123,11 +123,20 @@ module SpreeCmCommissioner
       # table-unqualified `available_on`/`discontinue_on` strings below become ambiguous between
       # `spree_products` and `spree_variants` and the whole query raises `PG::AmbiguousColumn`. A
       # plain status check needs no join at all, so it can't collide with these.
+      #
+      # `event_id` alone isn't enough to tell "belongs to this event" from "organizer unlisted it
+      # from its section but hasn't moved it off the event" — those look identical on the product
+      # row. `children_classifications` (Classification rows for the event's section children,
+      # taxon_decorator.rb) carries the actual unlist toggle: `visible: false` is how an organizer
+      # hides a product from a section without touching `event_id`, same flag
+      # `Products::FindDecorator` already checks for storefront listings, so an unlisted product
+      # is excluded here too rather than still getting a live stock-status entry in Firestore.
       def active_products(taxon)
         now = Time.zone.now
         taxon.event_products.ecommerce.where(status: 'active')
              .where('available_on IS NULL OR available_on <= ?', now)
              .where('discontinue_on IS NULL OR discontinue_on > ?', now)
+             .where(id: taxon.children_classifications.where(visible: true).select(:product_id))
       end
 
       # Sums, per product id, of the live Redis-sourced quantities for every active inventory item

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

@@ -92,23 +92,38 @@ module SpreeCmCommissioner
       end
 
       # Live count of guests no longer waiting: granted entry (allow_to_enter_room_at set) or left
-      # 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.
+      # 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.
       def exited_count(path)
-        allowed_count(path) + left_count(path)
+        allowed_count(path) + left_without_entry_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_count(path)
-        firestore.col(path).where('left_at', '!=', nil).aggregate_query.add_count.get.first.get.to_i
+      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
       end
 
       # merge: true so total_exited_queue coexists with the fields WaitingGuestsCaller publishes to

data/app/views/spree/admin/private_sales/_stock.html.erb

@@ -31,6 +31,7 @@
           <th><%= Spree.t(:variant) %></th>
           <th class="text-center"><%= t('.max_capacity') %></th>
           <th class="text-center"><%= t('.quantity_available') %></th>
+          <th class="text-center"><%= t('.quantity_on_hold') %></th>
           <th class="text-center"><%= t('.quantity_locked') %></th>
           <th class="text-center"><%= t('.quantity_locked_on_hold') %></th>
           <th class="text-center"><%= t('.lock_release') %></th>
@@ -43,7 +44,7 @@
           <% next if product.nil? %>
 
           <tr class="bg-light">
-            <td colspan="6"><strong><%= product.name %></strong></td>
+            <td colspan="7"><strong><%= product.name %></strong></td>
             <td class="text-right">
               <%# Own column so these line up under the same x-position for every product, rather than
                   sharing space with the name — icon-only, matching the with-tip pattern used for row
@@ -69,12 +70,13 @@
               <% if item.nil? %>
                 <%# No undated row means this product's stock is per date — hundreds of rows a single
                     input cannot express. Those are managed on the product's own screen. %>
-                <td colspan="6" class="text-center text-muted">
+                <td colspan="7" class="text-center text-muted">
                   <%= link_to t('.per_date_stock'), admin_product_inventory_locks_path(product) %>
                 </td>
               <% else %>
                 <td class="text-center text-muted"><%= item.max_capacity %></td>
                 <td class="text-center"><%= render partial: 'spree/admin/shared/availability_percentage', locals: { inventory_item: item } %></td>
+                <td class="text-center"><%= item.quantity_on_hold %></td>
                 <td class="text-center"><strong><%= item.quantity_locked %></strong></td>
                 <td class="text-center"><%= item.quantity_locked_on_hold %></td>
                 <td class="text-center">
@@ -84,7 +86,7 @@
                       <div class="input-group input-group-sm">
                         <%= number_field_tag :quantity, nil, class: 'form-control text-center p-0', id: nil %>
                         <div class="input-group-append">
-                          <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
+                          <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1', data: { confirm: t('.lock_release_confirm') }) do %>
                             <%= svg_icon(name: 'arrow-left-right.svg', classes: 'icon', width: 14, height: 14) %>
                           <% end %>
                         </div>

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

@@ -14,10 +14,10 @@
       <thead class="text-muted">
         <tr>
           <th><%= Spree.t(:name) %></th>
-          <th><%= t('.products') %></th>
-          <th><%= t('.audience') %></th>
           <th><%= t('.expires_at') %></th>
           <th><%= Spree.t(:status) %></th>
+          <th><%= Spree.t(:created_at) %></th>
+          <th><%= t('.updated_at') %></th>
           <th class="text-right"></th>
         </tr>
       </thead>
@@ -27,18 +27,6 @@
               answer, and a vanished row cannot give it. %>
           <tr class="<%= 'text-muted' unless private_sale.usable? %>">
             <td><%= private_sale.name %></td>
-            <%# Names come from the page-wide lookups built in the controller — asking each row for
-                its own products/users/roles is 3 queries per row. %>
-            <td><%= private_sale.product_ids.filter_map { |id| @product_names[id] }.join(', ').presence || '—' %></td>
-            <td>
-              <% if private_sale.open_to_anyone? %>
-                <%= t('.anyone') %>
-              <% else %>
-                <%= [private_sale.user_ids.filter_map { |id| @user_emails[id] }.presence&.join(', '),
-                     private_sale.role_ids.filter_map { |id| @role_names[id] }.presence&.join(', ')]
-                      .compact.join(' · ') %>
-              <% end %>
-            </td>
             <td><%= private_sale.expires_at.to_date %></td>
             <td>
               <% if private_sale.revoked? %>
@@ -51,6 +39,8 @@
                 <span class="badge badge-success"><%= t('.active') %></span>
               <% end %>
             </td>
+            <td><%= l(private_sale.created_at) %></td>
+            <td><%= l(private_sale.updated_at) %></td>
             <td class="text-right">
               <% if private_sale.usable? %>
                 <div class="d-inline-block align-middle" style="width: 280px;">

data/config/locales/en.yml

@@ -559,10 +559,8 @@ en:
         index:
           title: "Private Sales"
           new: "New Private Sale"
-          products: "Products"
-          audience: "Who can buy"
           expires_at: "Expires"
-          anyone: "Anyone with the link"
+          updated_at: "Updated"
           active: "Active"
           revoked: "Revoked"
           expired: "Expired"
@@ -593,9 +591,11 @@ en:
           no_products: "Pick at least one product above and save, then set how much to hold back."
           max_capacity: "Max capacity"
           quantity_available: "Quantity available"
+          quantity_on_hold: "Quantity on hold"
           quantity_locked: "Quantity locked"
           quantity_locked_on_hold: "Quantity locked on hold"
           lock_release: "Lock (+) / Release (−)"
+          lock_release_confirm: "Apply this change to locked stock? This takes effect immediately."
           manage_product_stock: "Product stock"
           lock_history: "Lock history"
           per_date_stock: "This product's stock is per date — manage it on the product"

data/lib/spree_cm_commissioner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.12.6
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-01 00:00:00.000000000 Z
+date: 2026-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree