spree_admin 5.4.2 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9e9301b1be27a3349cfc4eaef27ca076dff3e8131a8a88fc926abba84b40a1
-  data.tar.gz: 49e0257fda4a3ffb5a6b8da0ea1623b2e3c323c07d2c47eafc986fd0b1485ce2
+  metadata.gz: 9a5af2b78a13b13f570093bfe92c6d6c6b3ade67ec72e294fbf0f1ffd9c121d6
+  data.tar.gz: 6dfa405d89717625d66b270fe16f7343bb8ec532f8ba673ee856361eb3682e92
 SHA512:
-  metadata.gz: e38c5fcb1d9c9205f67203ecfbc7dd0c862fc80bae7152d918f0ebec47af68f78f0ab7141d03219e4547c3ff1633bdc05355353ef74bdbc55a7e82f10ddba5b1
-  data.tar.gz: 46fa0bd908105098e55528c5691e38ea7d275bacd780f14f09f17062c81f15d8d91ddeb2fbd2bdaa3c18ef1dcabed2f60fea28242d763e1b4402ade26c6be53d
+  metadata.gz: 9172a34304882f931b1bf56502ffd09121ca3497d8e3b24b5520dc03cf6cebf5a70c6e284615098dc4c70462f153aa204899911f152902e75317b5130760222d
+  data.tar.gz: 91f7065af97ecddea447d6add3cd60ab8d36ceb6590ced8ca3e74bbe65a26eeded78625209b38e5b5ad9f26e43605bdc05fb594664f0d1aad1fbe51af22f17b9

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

@@ -29,6 +29,10 @@ module Spree
         table = Spree.admin.tables.get(table_key)
         table.find_bulk_action(key.to_sym)
       end
+
+      def authorize_admin
+        params[:kind] == 'set_active' ? authorize!(:bulk_activate, Spree::Product) : super
+      end
     end
   end
 end

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

@@ -63,8 +63,7 @@ module Spree
           redirect_to spree.new_admin_admin_user_path(token: @invitation.token), status: :see_other
         end
       rescue ActiveRecord::RecordNotFound
-        redirect_to spree.root_path, alert: Spree.t('invalid_or_expired_invitation')
-        nil
+        render :expired, status: :not_found
       end
 
       # PUT /admin/invitations/:id/accept

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

@@ -279,8 +279,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
     params[:q][:s] ||= collection_default_sort if collection_default_sort.present?
 
-    date_range_params = %i[created_at_gt created_at_lt updated_at_gt updated_at_lt]
-    date_range_params.each do |param|
+    %i[created_at_gt updated_at_gt].each do |param|
       if params[:q][param].present?
         params[:q][param] = begin
           params[:q][param].to_date&.in_time_zone(current_timezone)&.beginning_of_day
@@ -290,6 +289,16 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
       end
     end
 
+    %i[created_at_lt updated_at_lt].each do |param|
+      if params[:q][param].present?
+        params[:q][param] = begin
+          params[:q][param].to_date&.in_time_zone(current_timezone)&.end_of_day
+        rescue StandardError
+          ''
+        end
+      end
+    end
+
     params[:q]
   end
 

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

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    class StatesController < ResourceController
+      belongs_to 'spree/country', find_by: :id
+
+      def select_options
+        states = @country.states.accessible_by(current_ability).order(:name)
+
+        render json: states.to_tom_select_json
+      end
+    end
+  end
+end

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

@@ -23,7 +23,6 @@ module Spree
           current_store.default_country
         end
         @countries = Country.order(:name)
-        @states = @selected_country&.states&.order(:name) || Spree::State.none
         @zones = Zone.order(:name)
       end
 

data/app/javascript/spree/admin/application.js

@@ -92,6 +92,7 @@ import TooltipController from 'spree/admin/controllers/tooltip_controller'
 import TurboSubmitButtonController from 'spree/admin/controllers/turbo_submit_button_controller'
 import UnitSystemController from 'spree/admin/controllers/unit_system_controller'
 import VariantsFormController from 'spree/admin/controllers/variants_form_controller'
+import ZoneStateSelectController from 'spree/admin/controllers/zone_state_select_controller'
 import BulkEditorController from 'spree/admin/controllers/bulk_editor_controller'
 import AddressAutocompleteController from 'spree/core/controllers/address_autocomplete_controller'
 import AddressFormController from 'spree/core/controllers/address_form_controller'
@@ -166,6 +167,7 @@ application.register('turbo-submit-button', TurboSubmitButtonController)
 application.register('textarea-autogrow', TextareaAutogrow)
 application.register('unit-system', UnitSystemController)
 application.register('variants-form', VariantsFormController)
+application.register('zone-state-select', ZoneStateSelectController)
 application.register('bulk-editor', BulkEditorController)
 
 LocalTime.start()

data/app/javascript/spree/admin/controllers/zone_state_select_controller.js

@@ -0,0 +1,31 @@
+import { Controller } from "@hotwired/stimulus"
+import { get } from '@rails/request.js'
+
+export default class extends Controller {
+  static values = {
+    url: String
+  }
+
+  static targets = ["statesSelect"]
+
+  async countryChanged(event) {
+    const countryId = event.target.value
+    const statesInput = this.statesSelectTarget.querySelector('select')
+    if (!statesInput || !statesInput.tomselect) return
+
+    const tomSelect = statesInput.tomselect
+    tomSelect.clear()
+    tomSelect.clearOptions()
+
+    if (!countryId) return
+
+    const url = this.urlValue.replace(':country_id', countryId)
+    const response = await get(url, { contentType: 'application/json' })
+
+    if (response.ok) {
+      const states = await response.json
+      states.forEach(state => tomSelect.addOption(state))
+      tomSelect.refreshOptions(false)
+    }
+  }
+}

data/app/views/spree/admin/gift_cards/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="card mb-6">
   <div class="card-body">
     <% unless f.object.persisted? %>
-      <%= f.spree_text_field :code, required: true, help_bubble: Spree.t('admin.gift_cards.code_help_text'), autofocus: true %>
+      <%= f.spree_text_field :code, help_bubble: Spree.t('admin.gift_cards.code_help_text'), autofocus: true %>
     <% end %>
 
     <%= f.spree_money_field :amount, currency: f.object.currency, required: true %>

data/app/views/spree/admin/invitations/expired.html.erb

@@ -0,0 +1,4 @@
+<div class="text-center">
+  <h1 class="text-2xl font-semibold mb-2"><%= Spree.t('invitation_expired.heading') %></h1>
+  <p class="text-gray-500"><%= Spree.t('invitation_expired.body') %></p>
+</div>

data/app/views/spree/admin/orders/_line_item.html.erb

@@ -30,12 +30,12 @@
           <%= dropdown_menu do %>
             <%= link_to_with_icon "edit",
               Spree.t(:edit),
-              spree.edit_admin_order_line_item_path(@order, line_item),
+              spree.edit_admin_order_line_item_path(line_item.order, line_item),
               class: "dropdown-item" %>
             <% if line_item.digital_links.any? %>
               <%= link_to_with_icon "refresh",
               Spree.t("admin.reset_digital_link_download_limits"),
-              spree.reset_digital_links_limit_admin_order_line_item_path(@order, line_item),
+              spree.reset_digital_links_limit_admin_order_line_item_path(line_item.order, line_item),
               data: {
                 turbo_method: :post,
                 turbo_confirm: Spree.t(:are_you_sure),
@@ -46,7 +46,7 @@
 
             <% if can?(:destroy, line_item) %>
               <div class="dropdown-divider"></div>
-              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %>
+              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(line_item.order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %>
             <% end %>
           <% end %>
         <% end %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -87,7 +87,7 @@
     <% if can_ship?(shipment) %>
       <div class="card-footer flex justify-end border-t bg-gray-25">
         <% if shipment.tracked? %>
-          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure)} %>
+          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top'} %>
         <% elsif !shipment.digital? %>
           <span class="ship ml-auto btn btn-primary disabled mb-0" data-controller="tooltip" data-tooltip-placement-value="left">
             <%= icon 'send' %>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -1,4 +1,4 @@
-<div id="state_members">
+<div id="state_members" data-controller="zone-state-select" data-zone-state-select-url-value="<%= spree.select_options_admin_country_states_path(':country_id') %>">
   <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
@@ -9,12 +9,22 @@
     <div class="card-body">
       <div class="form-group">
         <%= label_tag :states_country_id, Spree.t(:country) %>
-        <%= tom_select_tag :states_country_id, class: 'w-full', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>
+        <%= tom_select_tag :states_country_id,
+          class: 'w-full',
+          options: Spree::Country.joins(:states).distinct.to_tom_select_json,
+          active_option: @selected_country&.id,
+          select_data: {action: "change->zone-state-select#countryChanged"}
+        %>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" data-zone-state-select-target="statesSelect">
         <%= zone_form.label :state_ids, Spree.t(:states) %>
-        <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-full', options: @states.to_tom_select_json, active_option: @zone.state_ids %>
+        <%= tom_select_tag 'zone[state_ids]',
+          multiple: true,
+          class: 'w-full',
+          url: @selected_country ? spree.select_options_admin_country_states_path(@selected_country) : nil,
+          active_option: @zone.state_ids
+        %>
       </div>
     </div>
   </div>

data/config/initializers/spree_admin_tables.rb

@@ -135,7 +135,7 @@ Rails.application.config.after_initialize do
                                                     action_path: ->(view_context) { view_context.spree.bulk_status_update_admin_products_path(status: 'active') },
                                                     body: 'admin.bulk_ops.products.body.set_active',
                                                     position: 10,
-                                                    condition: -> { can?(:activate, Spree::Product) }
+                                                    condition: -> { can?(:bulk_activate, Spree::Product) }
 
   Spree.admin.tables.products.add_bulk_action :set_draft,
                                                     label: 'admin.bulk_ops.products.title.set_draft',
@@ -462,7 +462,7 @@ Rails.application.config.after_initialize do
                                      position: 30,
                                      ransack_attribute: 'addresses_country_name',
                                      operators: %i[eq],
-                                     search_url: ->(view_context) { view_context.spree.admin_countries_select_options_path(format: :json) },
+                                     search_url: ->(view_context) { view_context.spree.select_options_admin_countries_path(format: :json) },
                                      partial: 'spree/admin/tables/columns/user_location'
 
   # Number of orders

data/config/routes.rb

@@ -62,9 +62,18 @@ Spree::Core::Engine.add_routes do
     end
     get '/taxons/select_options' => 'taxons#select_options', as: :taxons_select_options, defaults: { format: :json }
     get '/tags/select_options' => 'tags#select_options', as: :tags_select_options, defaults: { format: :json }
-    get '/countries/select_options' => 'countries#select_options', as: :countries_select_options, defaults: { format: :json }
     get '/users/select_options' => 'users#select_options', as: :users_select_options, defaults: { format: :json }
     get '/stock_locations/select_options' => 'stock_locations#select_options', as: :stock_locations_select_options, defaults: { format: :json }
+    resources :countries, only: [] do
+      collection do
+        get :select_options, defaults: { format: :json }
+      end
+      resources :states, only: [] do
+        collection do
+          get :select_options, defaults: { format: :json }
+        end
+      end
+    end
 
     # media library
     resources :assets, only: [:create, :edit, :update, :destroy] do

data/lib/spree/admin/tailwind_helper.rb

@@ -43,7 +43,7 @@ module Spree
 
         def spree_engines
           Rails::Engine.subclasses.select do |engine|
-            engine.name&.start_with?("Spree::")
+            engine.name&.start_with?("Spree")
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.4.3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-19 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.2
+        version: 5.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.2
+        version: 5.4.3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +364,7 @@ files:
 - app/controllers/spree/admin/shipments_controller.rb
 - app/controllers/spree/admin/shipping_categories_controller.rb
 - app/controllers/spree/admin/shipping_methods_controller.rb
+- app/controllers/spree/admin/states_controller.rb
 - app/controllers/spree/admin/stock_items_controller.rb
 - app/controllers/spree/admin/stock_locations_controller.rb
 - app/controllers/spree/admin/stock_movements_controller.rb
@@ -479,6 +480,7 @@ files:
 - app/javascript/spree/admin/controllers/turbo_submit_button_controller.js
 - app/javascript/spree/admin/controllers/unit_system_controller.js
 - app/javascript/spree/admin/controllers/variants_form_controller.js
+- app/javascript/spree/admin/controllers/zone_state_select_controller.js
 - app/javascript/spree/admin/helpers/index.js
 - app/javascript/spree/admin/helpers/tinymce.js
 - app/javascript/spree/admin/helpers/trix/video_embed.js
@@ -621,6 +623,7 @@ files:
 - app/views/spree/admin/integrations/new.html.erb
 - app/views/spree/admin/invitations/_invitation.html.erb
 - app/views/spree/admin/invitations/create.turbo_stream.erb
+- app/views/spree/admin/invitations/expired.html.erb
 - app/views/spree/admin/invitations/index.html.erb
 - app/views/spree/admin/invitations/new.html.erb
 - app/views/spree/admin/invitations/show.html.erb
@@ -1161,9 +1164,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.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.3
 post_install_message:
 rdoc_options: []
 require_paths: