spree_cm_commissioner 2.5.4 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d93944d0194c1c575eca6f946b9b616ba4772fba61151fbc9b605464d87cb46
-  data.tar.gz: a0f1f687982be229cf5958a5f0ba0077eac693166dde8587c9a69df8bbf6caae
+  metadata.gz: d077884a4c72aea34ebabce75fcc9ad8c032d20eb6ee2cad7c753bb544d28b1c
+  data.tar.gz: d89d2c942374c0342b6fc5447220eee3d72773c0578afc0b45a08b390b51a624
 SHA512:
-  metadata.gz: 978c11238f4ba63ff0e9e41444ca8d67046eab18d924996ad03dd4c64fe725285f225db7a9f8345220e60cb91b4147f915b8096eefc40c15453f2a090e115000
-  data.tar.gz: 9256c928528ebd0911aa5c4083ce477821d5117cfa379d205f8667fcbca17bd5e5f2052839d67079bf5627a4a56747f0e45d4ccb236c97831c6de6bdf45fec81
+  metadata.gz: 41dbb774e8f9d97dee38db2e23ed4741f2888b73a41660c77c968bedb7c26d9de747587cc8779a3ac93e16ef88a11e0f1ce276bc562252776218218423d47538
+  data.tar.gz: e95ac81f757dcdabafd539957ad2945dda624348a72e06f2490e24fabfdc8bc5b53fdee24a62b66dd807349996152a2dad334ecea387cfe37c73c58707b58237

data/.env.example

@@ -31,3 +31,12 @@ ORGANIZER_URL=http://127.0.0.1:4000/organizer
 # Use to sign & verify Distance object:
 # spree_cm_commissioner/distance.rb
 DISTANCE_SIGNING_KEY=hei********************VY
+
+# Cache durations (in seconds) for different content types
+# See: app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
+CACHE_CDN_MAX_AGE=86400 # CDN/server-side cache duration for all responses
+CACHE_STATIC_MAX_AGE=86400 # Static content (countries, provinces, seat layouts, CMS pages) - 1 day
+CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage backgrounds, routes) - 1 hour
+CACHE_MODERATE_MAX_AGE=1800 # Moderate freshness (products, events, vendors) - 30 minutes
+CACHE_REALTIME_MAX_AGE=300 # High freshness (trips, trip search) - 5 minutes
+CACHE_DEFAULT_MAX_AGE=300 # Default for unlisted controllers - 5 minutes

data/Gemfile.lock

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

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

@@ -3,22 +3,22 @@ module Spree
     class InventoryItemsController < StockManagementsController
       before_action :load_parent
 
-      # GET /products/:slug/inventory_items/prices?inventory_ids=1,2,3
+      # GET /products/:slug/inventory_items/prices?inventory_item_ids=1,2,3
       def prices
-        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
-        @inventory_items = @product.inventory_items.where(id: inventory_ids)
+        inventory_item_ids = params[:inventory_item_ids]
+        @inventory_items = @product.inventory_items.where(id: inventory_item_ids)
       end
 
-      # GET /products/:slug/inventory_items/stocks?inventory_ids=1,2,3
+      # GET /products/:slug/inventory_items/stocks?inventory_item_ids=1,2,3
       def stocks
-        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
-        @inventory_items = @product.inventory_items.where(id: inventory_ids)
+        inventory_item_ids = params[:inventory_item_ids]
+        @inventory_items = @product.inventory_items.where(id: inventory_item_ids)
       end
 
       # PATCH /products/:slug/inventory_items/bulk_update_prices
       def bulk_update_prices # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
-        inventory_items = @product.inventory_items.where(id: inventory_ids)
+        inventory_item_ids = params[:inventory_item_ids]
+        inventory_items = @product.inventory_items.where(id: inventory_item_ids)
 
         inventory_items.each do |inventory_item|
           params[:prices]&.values&.each do |price_params|
@@ -38,8 +38,8 @@ module Spree
 
       # PATCH /products/:slug/inventory_items/bulk_update_stocks
       def bulk_update_stocks
-        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
-        inventory_items = @product.inventory_items.where(id: inventory_ids)
+        inventory_item_ids = params[:inventory_item_ids]
+        inventory_items = @product.inventory_items.where(id: inventory_item_ids)
         target_quantity = params[:quantity].to_i
 
         if target_quantity.zero?
@@ -58,6 +58,26 @@ module Spree
         flash[:success] = "Successfully updated stocks for #{inventory_items.count} items"
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
+
+      # PATCH /products/:slug/inventory_items/bulk_reset?inventory_item_ids=1,2,3
+      def bulk_reset
+        inventory_item_ids = params[:inventory_item_ids]
+        inventory_items = @product.inventory_items.where(id: inventory_item_ids)
+
+        errors = []
+        inventory_items.each do |inventory_item|
+          result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
+          errors << result.message unless result.success?
+        end
+
+        if errors.empty?
+          flash[:success] = "Successfully reset inventory items (#{inventory_items.count})"
+        else
+          flash[:error] = errors.join(', ')
+        end
+
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
     end
   end
 end

data/app/views/spree/admin/inventory_items/prices.html.erb

@@ -11,9 +11,7 @@
       <p class="mb-0 text-white position-relative"><%= @inventory_items.count %> items selected</p>
     </div>
 
-    <%= form_with url: bulk_update_prices_admin_product_inventory_items_path(@product), method: :patch, local: true, html: { class: 'bulk-inventory-items-form' } do |form| %>
-      <%= form.hidden_field :inventory_ids, value: params[:inventory_ids] %>
-
+    <%= form_with url: bulk_update_prices_admin_product_inventory_items_path(@product, inventory_item_ids: params[:inventory_item_ids]), method: :patch, local: true, html: { class: 'bulk-inventory-items-form' } do |form| %>
       <table class="table">
         <tbody>
           <% supported_currencies_for_all_stores.each do |currency| %>

data/app/views/spree/admin/inventory_items/stocks.html.erb

@@ -11,9 +11,7 @@
       <p class="mb-0 text-white position-relative"><%= @inventory_items.count %> items selected</p>
     </div>
 
-    <%= form_with url: bulk_update_stocks_admin_product_inventory_items_path(@product), method: :patch, local: true, html: { class: 'bulk-inventory-items-form' } do |form| %>
-      <%= form.hidden_field :inventory_ids, value: params[:inventory_ids] %>
-
+    <%= form_with url: bulk_update_stocks_admin_product_inventory_items_path(@product, inventory_item_ids: params[:inventory_item_ids]), method: :patch, local: true, html: { class: 'bulk-inventory-items-form' } do |form| %>
       <div class="form-group">
         <%= form.label :quantity, "Available Quantity", class: 'form-label' %>
         <%= form.number_field :quantity,

data/app/views/spree/admin/stock_managements/calendar.html.erb

@@ -2,22 +2,22 @@
   <div class="flex-wrap gap-3 mt-4 d-flex align-items-center justify-content-between">
     <%= form_with url: admin_product_stock_managements_path, method: :get, class: "d-flex flex-wrap align-items-center gap-2" do |f| %>
       <%= select_year(params[:year]&.to_i || @year, { start_year: 2025, end_year: @year + 3 }, { class: 'form-control', style: "width: auto;", name: "year", onchange: "this.form.submit()" }) %>
-      <%= f.select :selected_variant_id, 
+      <%= f.select :selected_variant_id,
         options_for_select([["All Variants", ""]] + @variants.map { |v| [v.options_text.presence || "N/A", v.id] }, params[:selected_variant_id]), {},
         { class: "form-control", style: "width: auto;", onchange: "this.form.submit()" } %>
     <% end %>
 
     <div id="bulkActionsBar" class="flex-wrap gap-2 align-items-center" style="display:none;">
-      <button class="btn btn-primary" 
+      <button class="btn btn-primary"
               onclick="setModalUrl('prices')"
-              data-toggle="modal" 
+              data-toggle="modal"
               data-target="#inventoryItemModal">
         <%= svg_icon name: "money.svg", width: '18', height: '18' %>
         <span class="ml-1">Bulk Update Prices</span>
       </button>
-      <button class="btn btn-success" 
+      <button class="btn btn-success"
               onclick="setModalUrl('stocks')"
-              data-toggle="modal" 
+              data-toggle="modal"
               data-target="#inventoryItemModal">
         <%= svg_icon name: "box-seam.svg", width: '18', height: '18' %>
         <span class="ml-1">Bulk Update Stocks</span>
@@ -32,11 +32,11 @@
     .gap-2 {
       gap: 0.5rem;
     }
-    
+
     .gap-3 {
       gap: 1rem;
     }
-    
+
     .day-selected {
       background-color: #e3f2fd !important;
       border: 2px solid #2196F3 !important;
@@ -137,10 +137,15 @@
     }
 
     function setModalUrl(type) {
-      const ids = Array.from(selectedInventoryIds).join(',');
-      const url = type === 'prices' 
-        ? '<%= prices_admin_product_inventory_items_path(@product) %>?inventory_ids=' + ids
-        : '<%= stocks_admin_product_inventory_items_path(@product) %>?inventory_ids=' + ids;
+      const params = new URLSearchParams();
+      Array.from(selectedInventoryIds).forEach(id =>
+        params.append('inventory_item_ids[]', id)
+      );
+
+      const url = type === 'prices'
+        ? `<%= prices_admin_product_inventory_items_path(@product) %>?${params.toString()}`
+        : `<%= stocks_admin_product_inventory_items_path(@product) %>?${params.toString()}`;
+
       let frame = document.getElementById('inventory_item');
       frame.innerHTML = `<div class="mt-2 spinner-border" role="status"></div>`;
       frame.setAttribute('src', url);

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

@@ -37,19 +37,6 @@
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
 
-            <% if defined?(@reserved_stocks) %>
-              <div>
-                <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_inventory_items_path(@product.slug, variant_id: variant.id),
-                  method: :post,
-                  remote: false,
-                  class: 'icon_link btn btn-sm btn-outline-primary ml-2',
-                  no_text: true
-                ) unless @inventory_items[variant.id].present? %>
-              </div>
-            <% end %>
-
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
@@ -78,7 +65,7 @@
                     <% end %>
                   </span>
 
-                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_inventory_item_path(@product.slug, inventory_item.id),
+                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", bulk_reset_admin_product_inventory_items_path(@product, inventory_item_ids: [inventory_item.id]),
                     method: :patch,
                     remote: false,
                     class: 'icon_link btn btn-sm outline text-dark',

data/config/routes.rb

@@ -155,6 +155,7 @@ Spree::Core::Engine.add_routes do
           get :stocks
           patch :bulk_update_prices
           patch :bulk_update_stocks
+          patch :bulk_reset
         end
       end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.4'.freeze
+  VERSION = '2.5.6'.freeze
 
   module_function
 

metadata

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