spree_admin 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6302dd5efd335e12ad7c600d7c4682b0c0a1d90dd995f808aac76f9c2333375c
-  data.tar.gz: a65828be9dbb4cb21ca11d23b7c6afbc67301a183381c651d1141e08cbf4308d
+  metadata.gz: 26df0b31a098e6532b1f1ce9a0d9c93e5775eabfdb0aae25d97ddc2cad9817f7
+  data.tar.gz: d9a8d58ad5854ae05313f113ad57530aaa1a7b70d75bb4d19c20f7fc0904a71b
 SHA512:
-  metadata.gz: fe7c73af6692b538d6e7b6d3e1e7c02deed3a5805950b15a92da91984ba08f9a339f67c9cb110d11e0197f5e9576538f8993da98757b894c219d25a4bedc28a3
-  data.tar.gz: 8aebe6353ab1e7176f9ee61b156fb4da712a41eb4b36f906870f8ddb3689ac65805de795ac97aebc3fa70c1f19f6eb6a7a5a63ba122bd0846b6e25aebe706357
+  metadata.gz: 142a56b2d97a37fd72ec7230a0d35bc83a3ea1e56b31c36c536a1e33a5714c1148c4e69d6e779348fa10cef3f8157e0e14909641a9472419c95bd09da52bd48d
+  data.tar.gz: f29b088464374c13ae4bbc77a549f15524cd6661fedc3ac6e3d3f484c3dba47b91bd1e0d643031ddf953c156949f7fdf54ed889cc026096ca701df6b9e6db0e3

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

@@ -88,6 +88,24 @@ module Spree
         @current_timezone ||= current_store.preferred_timezone
       end
 
+      # datetime-local inputs submit values without timezone information. Interpret
+      # them in the store's timezone so they match what the admin sees in the form.
+      def parse_datetime_in_store_timezone(attrs, *fields)
+        zone = ActiveSupport::TimeZone[current_timezone] || Time.zone
+
+        fields.each do |field|
+          value = attrs[field]
+          next if value.blank?
+
+          parsed_value = begin
+            zone.parse(value.to_s)
+          rescue ArgumentError
+            nil
+          end
+          attrs[field] = parsed_value if parsed_value.present?
+        end
+      end
+
       def current_currency
         @current_currency ||= if params[:currency].present? && supported_currency?(params[:currency])
                                 params[:currency]

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

@@ -304,11 +304,15 @@ module Spree
       end
 
       def permitted_resource_params
-        @permitted_resource_params ||= if cannot?(:activate, @product) && @new_status&.to_sym == :active
-                                         params.require(:product).permit(permitted_product_attributes).except(:status, :make_active_at)
-                                       else
-                                         params.require(:product).permit(permitted_product_attributes)
-                                       end
+        @permitted_resource_params ||= begin
+          attrs = if cannot?(:activate, @product) && @new_status&.to_sym == :active
+                    params.require(:product).permit(permitted_product_attributes).except(:status, :make_active_at)
+                  else
+                    params.require(:product).permit(permitted_product_attributes)
+                  end
+          parse_datetime_in_store_timezone(attrs, :available_on, :discontinue_on, :make_active_at)
+          attrs
+        end
       end
     end
   end

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

@@ -48,7 +48,9 @@ module Spree
       end
 
       def permitted_resource_params
-        params.require(:promotion).permit(permitted_promotion_attributes)
+        attrs = params.require(:promotion).permit(permitted_promotion_attributes)
+        parse_datetime_in_store_timezone(attrs, :starts_at, :expires_at)
+        attrs
       end
     end
   end

data/app/views/spree/admin/products/form/_status.html.erb

@@ -1,3 +1,13 @@
+<%# datetime-local inputs have no timezone; render values in the store's timezone so admins see and submit values in the store's local time. %>
+<%
+  store_timezone       = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
+  to_store_local       = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  make_active_at_local = to_store_local.call(@product.make_active_at)
+  available_on_local   = to_store_local.call(@product.available_on)
+  discontinue_on_local = to_store_local.call(@product.discontinue_on)
+  tz_help              = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+%>
+
 <div class="card mb-6">
   <div class="card-body">
     <div class="grid grid-cols-12 gap-6 mb-6">
@@ -14,21 +24,27 @@
       <div class="col-span-6 <%= 'hidden' if @product.active? %>" data-product-form-target="makeActiveAt">
         <% if can?(:activate, @product) %>
           <%= f.spree_datetime_field :make_active_at,
+                                     value: make_active_at_local,
+                                     help: tz_help,
                                      help_bubble: Spree.t('admin.products.status_form.make_active_at'),
-                                     max: @product.discontinue_on %>
+                                     max: discontinue_on_local %>
         <% end %>
       </div>
     </div>
     <div class="grid grid-cols-12 gap-6">
       <div data-product-form-target="availableOn" class="col-span-6">
         <%= f.spree_datetime_field :available_on,
+                                   value: available_on_local,
+                                   help: tz_help,
                                    help_bubble: Spree.t('admin.products.status_form.available_on'),
-                                   max: @product.discontinue_on %>
+                                   max: discontinue_on_local %>
       </div>
       <div data-product-form-target="discontinueOn" class="col-span-6">
         <%= f.spree_datetime_field :discontinue_on,
+                                   value: discontinue_on_local,
+                                   help: tz_help,
                                    help_bubble: Spree.t('admin.products.status_form.discontinue_on'),
-                                   min: @product.make_active_at %>
+                                   min: make_active_at_local %>
       </div>
     </div>
   </div>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -167,7 +167,7 @@
           <div class="variants-table__body" data-variants-form-target="variantsContainer" data-test-id="product-variants-table">
           </div>
           <div class="variants-table__footer text-sm rounded-b-2xl">
-            <%= Spree.t('admin.variants_form.total_inventory_html', stock_location: current_store.default_stock_location.name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%>
+            <%= Spree.t('admin.variants_form.total_inventory_html', stock_location: default_stock_location_for_product(@product).name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%>
           </div>
         </div>
       </div>

data/app/views/spree/admin/products/form/variants/_variant_template.html.erb

@@ -21,18 +21,18 @@
     <div class="variants-table__body__cell column-price mr-2">
       <% supported_currencies.each_with_index do |currency, i| %>
         <div class="input-group price-input-container <%= current_currency != currency ? 'hidden' : 'flex' %>" <%= !can_manage_prices ? 'readonly' : '' %>>
-          <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '',  class: 'border-0 focus:ring-0 focus:outline-none', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice blur->variants-form#formatPrice', currency: currency.to_s }, readonly: !can_manage_prices %>
+          <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '',  id: nil, class: 'border-0 focus:ring-0 focus:outline-none', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice blur->variants-form#formatPrice', currency: currency.to_s }, readonly: !can_manage_prices %>
           <span class="px-3"><%= currency_symbol(currency) %></span>
         </div>
-        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %>
-        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", data: {slot: "[prices_attributes][#{currency}][id]_input"} %>
+        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, id: nil, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %>
+        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", id: nil, data: {slot: "[prices_attributes][#{currency}][id]_input"} %>
       <% end %>
     </div>
     <div class="variants-table__body__cell column-quantity">
       <% available_stock_locations_for_product(@product).ids.each_with_index do |id, i|  %>
-        <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, class: class_names('form-input', default_stock_location.id == id ? 'block' : 'hidden'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>
-        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %>
-        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", data: { slot: "[stock_items_attributes][#{id}][id]_input" } %>
+        <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, id: nil, class: class_names('form-input', default_stock_location.id == id ? 'block' : 'hidden'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>
+        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, id: nil, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %>
+        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", id: nil, data: { slot: "[stock_items_attributes][#{id}][id]_input" } %>
       <% end %>
     </div>
     <% if can?(:manage, @product.default_variant) %>

data/app/views/spree/admin/promotions/form/_settings.html.erb

@@ -2,6 +2,17 @@
   <%= f.spree_number_field :usage_limit, min: 0, step: 1, help: 'Leave this field blank for unlimited usage.' %>
 <% end %>
 
-<%= f.spree_datetime_field :starts_at %>
+<%# datetime-local inputs have no timezone; render values in the store's timezone so admins see and submit values in the store's local time. %>
+<%
+  store_timezone   = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
+  to_store_local   = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  starts_at_local  = to_store_local.call(@promotion.starts_at)
+  expires_at_local = to_store_local.call(@promotion.expires_at)
+  tz_help          = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+%>
 
-<%= f.spree_datetime_field :expires_at, help: 'Leave this field blank for no expiration.' %>
+<%= f.spree_datetime_field :starts_at, value: starts_at_local, help: tz_help %>
+
+<%= f.spree_datetime_field :expires_at,
+      value: expires_at_local,
+      help: "Leave this field blank for no expiration. #{tz_help}" %>

data/config/locales/en.yml

@@ -100,6 +100,7 @@ en:
         top_products: Top products
         view_report: View report
         whats_happening_on_html: Here's what's happening on <strong>%{store_name}</strong> today.
+      datetime_field_timezone_help: 'Time zone: %{zone}'
       digital_shipment_fulfillment_note: This shipment will be marked as fulfilled once the user downloads the digital product
       display_on_options:
         back_end: Only on admin panel

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-04-14 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
+        version: 5.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.4.1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1175,9 +1175,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
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.1
 post_install_message:
 rdoc_options: []
 require_paths: