spree_admin 5.4.0.beta2 → 5.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f57b463a1f1a46360341017872bff19562f612a9f2fd6a040a5a340e8ad04b9
-  data.tar.gz: ab57b308e0087992c563e520a5d3312b1f49f8eaf0d07445700cd374f150f4f6
+  metadata.gz: 6e25435ab28276f0ca9a78db5d61f4b5485be27fb668ee9c1c381db48812445e
+  data.tar.gz: cc103dc8524c6a0575e367a427e88037647cc22caa9dd5117a0091715df480d6
 SHA512:
-  metadata.gz: 38b26c705f3a4445a0fe84f122a04ee8e1f209437573b6e1fad9a7f60cbf943a3cdc6130fbd12dc5af5b0b80cf80c90b7fa9d5b544f518b59a648ff8f91ec89e
-  data.tar.gz: 751ee61e2e785860e87f0677e3d2b3693f5c0c88586f38cd2fbeb38caafb779d0ea2c33129b46315109017da12acc59c39bdca974189e064a282d3610dcbf7cc
+  metadata.gz: 1b5b4a0bd4ee889940ca9826c9f6e2db5337bf1215588e543343be9fab77454ad3e9254f5b903eefcc485f6ef30673d38171fec315f3b3d5a16b463d68a42559
+  data.tar.gz: 5f67328def69057604315c1c79a3bcaae424ce369d98741b7521b1fe98f91f552aff41883534b5df81914d73d6a3d5985430551c8a6392e8caa537411778b44e

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

@@ -10,6 +10,20 @@ module Spree
 
       def load_data
         @countries = current_store.countries_with_shipping_coverage
+
+        # Exclude countries already assigned to other markets in the store
+        if @object&.persisted?
+          taken_country_ids = Spree::MarketCountry.joins(:market)
+                                .where(spree_markets: { store_id: current_store.id, deleted_at: nil })
+                                .where.not(market_id: @object.id)
+                                .pluck(:country_id)
+        else
+          taken_country_ids = Spree::MarketCountry.joins(:market)
+                                .where(spree_markets: { store_id: current_store.id, deleted_at: nil })
+                                .pluck(:country_id)
+        end
+
+        @countries = @countries.where.not(id: taken_country_ids) if taken_country_ids.any?
       end
 
       def permitted_resource_params

data/app/helpers/spree/admin/products_helper.rb

@@ -90,9 +90,9 @@ module Spree
       end
 
       def product_filter_stock_dropdown_value
-        if params.dig(:q, :in_stock_items) == '1'
+        if params.dig(:q, :in_stock) == '1'
           Spree.t('admin.products.in_stock')
-        elsif params.dig(:q, :out_of_stock_items) == '1'
+        elsif params.dig(:q, :out_of_stock) == '1'
           Spree.t('admin.products.out_of_stock')
         else
           Spree.t('admin.products.any_stock')

data/app/subscribers/spree/admin/import_row_subscriber.rb

@@ -21,7 +21,7 @@ module Spree
         import_row_id = event.payload['id']
         return unless import_row_id
 
-        import_row = Spree::ImportRow.find_by(id: import_row_id)
+        import_row = Spree::ImportRow.find_by_prefix_id(import_row_id)
         return unless import_row
 
         add_row_to_import_view(import_row)

data/app/subscribers/spree/admin/import_subscriber.rb

@@ -19,7 +19,7 @@ module Spree
         import_id = event.payload['id']
         return unless import_id
 
-        import = Spree::Import.find_by(id: import_id)
+        import = Spree::Import.find_by_prefix_id(import_id)
         return unless import
         return unless import.respond_to?(:broadcast_update_to)
 

data/app/views/spree/admin/products/_table_filter_dropdown.html.erb

@@ -16,7 +16,7 @@
   <%= dropdown_menu do %>
     <h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6>
 
-    <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>
+    <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
     <%= link_to Spree.t('admin.products.active'),
       params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :active}}),
       class: "dropdown-item #{'active' if params[:q][:status_eq] == 'active'}" %>
@@ -31,12 +31,12 @@
 
     <h6 class="dropdown-header"><%= Spree.t('admin.products.by_stock') %>:</h6>
 
-    <%= active_link_to Spree.t('admin.products.any_stock'), params.to_unsafe_h.deep_merge({page: nil, q: {in_stock_items: nil, out_of_stock_items: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>
+    <%= active_link_to Spree.t('admin.products.any_stock'), params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: nil, out_of_stock: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock out_of_stock] ).all?(&:blank?) %>
     <%= link_to Spree.t('admin.products.in_stock'),
-        params.to_unsafe_h.deep_merge({page: nil, q: {in_stock_items: '1', out_of_stock_items: nil}}),
-        class: "dropdown-item #{'active' if params[:q][:in_stock_items] == '1'}" %>
+        params.to_unsafe_h.deep_merge({page: nil, q: {in_stock: '1', out_of_stock: nil}}),
+        class: "dropdown-item #{'active' if params[:q][:in_stock] == '1'}" %>
       <%= link_to Spree.t('admin.products.out_of_stock'),
-        params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock_items: '1', in_stock_items: nil}}),
-        class: "dropdown-item #{'active' if params[:q][:out_of_stock_items] == '1'}" %>
+        params.to_unsafe_h.deep_merge({page: nil, q: {out_of_stock: '1', in_stock: nil}}),
+        class: "dropdown-item #{'active' if params[:q][:out_of_stock] == '1'}" %>
   <% end %>
 <% end %>

data/config/initializers/spree_admin_tables.rb

@@ -98,7 +98,7 @@ Rails.application.config.after_initialize do
                                         displayable: false,
                                         default: false,
                                         position: 70,
-                                        ransack_attribute: 'in_stock_items'
+                                        ransack_attribute: 'in_stock'
 
   # Taxons - displayed as comma-separated list, filtered via autocomplete
   Spree.admin.tables.products.add :taxons,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.0.beta2
+  version: 5.4.0.beta3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-28 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta2
+        version: 5.4.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.beta2
+        version: 5.4.0.beta3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1242,9 +1242,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.0.beta3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta2
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.0.beta3
 post_install_message:
 rdoc_options: []
 require_paths: