spree_admin 5.1.0 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11ae8c30724208b7082248ce95459e064dc46464cf0f984f8890f6f6fb3d5c6
-  data.tar.gz: 0ae40837806e61a1c1b871cf07be224b2027fc35511afb150a015bb32330d551
+  metadata.gz: 38049374f6d7f79407c48dfcf500d7fdc68d33066be7a19aa9ed6d43097f0251
+  data.tar.gz: 3b6da7a55d29b372f6e1ea85550eb83834a85220b3386f3168ecd551a892b2b7
 SHA512:
-  metadata.gz: 846341ef938847490b94ab25fc12028e6feeb7ef108976eb290a28ff5f3a6abc90d1fc4720b04cbe0b5bce8b7f6331d79957b333c10d4b49feeb4e7403e90d46
-  data.tar.gz: af23c0940838885d2225a883992e1761acbd17a910e9a90dd5627a2d638a1b377ef72ab87e1bfeaf488deca193d60aab74d0a86c28a2a77aa5d2ea1d2e089fae
+  metadata.gz: 5f7a0c8b6512c468a00bcbbe83d674191984292b00349a2cdafd1fc2f4ab1213f839a9a2bc2e3901811f4bc3ff880f338892e7a6d0e02ae772bad0cf27a36cd9
+  data.tar.gz: 1177771475c2b570e542146d1e2e860bf11fe6960cd4ee5e46f2d8022abba0c52f8036b95a393d004183d9f68a30ef849a8c0f50d505f83dcf2aa631790dbc87

data/app/assets/stylesheets/spree/admin/components/_buttons.scss

@@ -131,7 +131,7 @@ button[disabled]        .show-when-enabled { display: none; }
 
   &:hover {
     opacity: 0.8 !important;
-    background-color: $gray-100 !important;
+    background-color: $gray-50 !important;
   }
 }
 

data/app/assets/stylesheets/spree/admin/components/_main.scss

@@ -25,6 +25,37 @@
   font-size: 1.25rem;
 }
 
+#page-tabs {
+  border-bottom: 1px solid $border-color;
+  margin-bottom: 1rem;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  margin-top: -1rem;
+
+  .nav {
+    gap: 1rem;
+    display: flex;
+    flex-wrap: nowrap;
+    overflow-x: auto;
+    padding-left: 0;
+    margin-bottom: -1px;
+
+    .nav-link {
+      border-radius: 0;
+      padding-bottom: 1rem;
+      padding-top: 1rem;
+      padding-left: 0rem;
+      padding-right: 0rem;
+  
+      &.active {
+        background-color: transparent;
+        color: theme-color('primary');
+        font-weight: 600;
+      }
+    }
+  }
+}
+
 .store-dropdown {
   display: flex;
   align-items: center;
@@ -245,6 +276,21 @@
   }
 }
 
+#updater-notice {
+  background-color: $white;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 0.5rem 0.5rem;
+  border: 1px solid $border-color;
+  border-radius: $border-radius-lg;
+  box-shadow: $box-shadow-xs;
+}
+
+
 .documentation-link-container {
   font-size: $font-size-sm;
   text-align: center;

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

@@ -64,6 +64,12 @@ module Spree
         redirect_back(fallback_location: spree.admin_dashboard_path)
       end
 
+      # PATCH /admin/dashboard/dismiss_updater_notice
+      def dismiss_updater_notice
+        session[:spree_updater_notice_dismissed] = { value: true, expires_at: 7.days.from_now }
+        redirect_back(fallback_location: spree.admin_dashboard_path)
+      end
+
       private
 
       def load_vendor

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

@@ -46,6 +46,7 @@ module Spree
       end
 
       def add_breadcrumbs
+        add_breadcrumb @product.name, spree.edit_admin_product_path(@product)
         add_breadcrumb Spree.t(:digital_assets), spree.admin_product_digital_assets_path(@product)
       end
     end

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

@@ -31,7 +31,10 @@ module Spree
       end
 
       def build_resource
-        model_class.new(store: current_store, date_from: params[:date_from], date_to: params[:date_to], currency: params[:currency])
+        model_class.new(store: current_store,
+                        date_from: parse_date_param(params[:date_from]),
+                        date_to: parse_date_param(params[:date_to])&.end_of_day,
+                        currency: params[:currency])
       end
 
       def model_class
@@ -55,7 +58,16 @@ module Spree
       end
 
       def permitted_resource_params
-        params.require(:report).permit(permitted_report_attributes)
+        attributes = params.require(:report).permit(permitted_report_attributes)
+        attributes[:date_from] = parse_date_param(attributes[:date_from]) if attributes[:date_from].present?
+        attributes[:date_to] = parse_date_param(attributes[:date_to])&.end_of_day if attributes[:date_to].present?
+        attributes
+      end
+
+      def parse_date_param(date_string)
+        return if date_string.blank?
+
+        date_string.to_date&.in_time_zone(current_timezone)
       end
     end
   end

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

@@ -29,7 +29,7 @@ module Spree
           :meta_description, :meta_title, :meta_keywords, :seo_robots,
           :facebook, :twitter, :instagram, :linkedin, :youtube, :tiktok, :pinterest,
           :storefront_custom_code_head, :storefront_custom_code_body_start,
-          :storefront_custom_code_body_end, :storefront_password
+          :storefront_custom_code_body_end, :storefront_password, :spotify, :discord
         )
       end
 

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

@@ -13,6 +13,7 @@ module Spree
         defined?(SpreeEnterprise)
       end
 
+      # @return [Spree::Admin::Updater] the spree updater
       def spree_updater
         @spree_updater ||= Spree::Admin::Updater
       end
@@ -21,6 +22,15 @@ module Spree
         @spree_update_available ||= !Rails.env.test? && spree_updater.update_available?
       end
 
+      def updater_notice_dismissed?
+        dismissal_data = session[:spree_updater_notice_dismissed]
+        dismissal_data.is_a?(Hash) && dismissal_data['expires_at'].to_time > Time.current
+      end
+
+      def show_spree_updater_notice?
+        Spree::Admin::RuntimeConfig.admin_updater_enabled && can?(:manage, current_store) && spree_update_available? && !updater_notice_dismissed?
+      end
+
       # check if the current controller is a settings controller
       # this is used to display different sidebar navigation for settings pages
       # @return [Boolean]
@@ -233,10 +243,6 @@ module Spree
         end
       end
 
-      def spree_dom_id(record)
-        dom_id(record, 'spree')
-      end
-
       # renders a red dot with a * to indicate that a field is required
       # @return [String] the required span tag
       def required_span_tag

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

@@ -14,7 +14,8 @@ module Spree
 
         if search_params[:created_at_gt].present?
           search_params[:created_at_gt] = begin
-                                            Time.zone.parse(search_params[:created_at_gt]).beginning_of_day
+                                            # Firstly we parse to date to avoid issues with timezones because frontend sends time in local timezone
+                                            search_params[:created_at_gt].to_date&.in_time_zone(current_timezone)
                                           rescue StandardError
                                             ''
                                           end
@@ -22,7 +23,7 @@ module Spree
 
         if search_params[:created_at_lt].present?
           search_params[:created_at_lt] = begin
-                                            Time.zone.parse(search_params[:created_at_lt]).end_of_day
+                                            search_params[:created_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
                                           rescue StandardError
                                             ''
                                           end
@@ -30,7 +31,7 @@ module Spree
 
         if search_params[:completed_at_gt].present?
           search_params[:completed_at_gt] = begin
-                                            Time.zone.parse(search_params[:completed_at_gt]).beginning_of_day
+                                            search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)
                                           rescue StandardError
                                             ''
                                           end
@@ -38,7 +39,7 @@ module Spree
 
         if search_params[:completed_at_lt].present?
           search_params[:completed_at_lt] = begin
-                                            Time.zone.parse(search_params[:completed_at_lt]).end_of_day
+                                            search_params[:completed_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
                                           rescue StandardError
                                             ''
                                           end

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

@@ -124,7 +124,7 @@ module Spree
       end
 
       def sorted_product_properties(product)
-        product.product_properties.includes(:property).sort_by { |product_property| product_property.property.position }
+        product.product_properties.sort_by { |product_property| product_property.property.position }
       end
     end
   end

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

@@ -28,6 +28,7 @@ export default class extends Controller {
         'This Month', 'Last Month'],
         position: 'left'
       },
+      lang: Spree.locale
     })
 
     this.picker.on('render', () => {

data/app/models/spree/admin/updater.rb

@@ -5,7 +5,7 @@ require 'uri'
 module Spree
   module Admin
     class Updater
-      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'
+      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'.freeze
 
       @updates = nil
 
@@ -13,14 +13,18 @@ module Spree
         fetch_updates.any?
       end
 
-      def self.latest_version
-        @latest_version ||= fetch_updates.first&.dig('version')
+      def self.latest_release
+        @latest_release ||= fetch_updates.first
+      end
+
+      def self.current_release
+        @current_release ||= Spree.version
       end
 
       def self.fetch_updates
-        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{Spree.version}", expires_in: 1.day) do
+        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{current_release}", expires_in: 1.day) do
           uri = URI(SPREE_CLOUD_UPDATES_URL)
-          params = { version: Spree.version, environment: Rails.env, url: Spree::Store.current.url_or_custom_domain }
+          params = { version: current_release, environment: Rails.env, url: Spree::Store.current.url_or_custom_domain }
           uri.query = URI.encode_www_form(params)
 
           http = Net::HTTP.new(uri.host, uri.port)

data/app/views/spree/admin/admin_users/show.html.erb

@@ -13,7 +13,7 @@
       <div class="card-header">
         <h5 class="card-title">
           <%= icon 'history', class: 'mr-1' %>
-          <%= Spree.t(:audit_log) %>
+          <%= Spree.t('admin.audit_log') %>
         </h5>
       </div>
       <div class="card-body">

data/app/views/spree/admin/dashboard/_updater.html.erb

@@ -1,9 +1,19 @@
-<% if Spree::Admin::RuntimeConfig.admin_updater_enabled && can?(:manage, current_store) && spree_update_available? %>
-  <div class="alert alert-info">
-    <div>
-      <p class="mb-1">There's a newer version of Spree available.</p>
+<% if show_spree_updater_notice? %>
+  <div id="updater-notice" class="mb-3">
+    <%= image_tag 'favicon_256x256.png', alt: 'Spree', width: 32, height: 32 %>
+    <div class="d-flex flex-column">
+      <p class="mb-1">
+        <strong>Spree <%= spree_updater.latest_release['name'] %></strong> is available.
+        <br />Your current version is <strong>Spree <%= spree_updater.current_release %></strong>. 
+      </p>
 
-      <%= link_to_with_icon 'settings-up', 'Update now', 'https://spreecommerce.org/docs/developer/upgrades', target: '_blank', class: 'btn btn-light btn-sm' %>
+      <% if spree_updater.latest_release['url'] %>
+        <div>
+          <%= external_link_to "View release notes", spree_updater.latest_release['url'], target: '_blank', class: 'btn btn-sm btn-link' %>
+        </div>
+      <% end %>
     </div>
+
+    <%= link_to '', spree.admin_dismiss_updater_notice_path, data: { turbo_method: :patch }, class: 'btn-close ml-auto' %>
   </div>
 <% end %>

data/app/views/spree/admin/dashboard/getting_started.html.erb

@@ -1,5 +1,5 @@
 <div class="row pt-3">
-  <div class="col-lg-8 mb-4">
+  <div class="col-lg-8 offset-lg-2 mb-4">
     <h2 class="page-header-title">
       <%= Spree.t('admin.getting_started') %>
     </h2>
@@ -17,6 +17,4 @@
       <% end %>
     <% end %>
   </div>
-  <div class="col-lg-4">
-  </div>
 </div>

data/app/views/spree/admin/dashboard/show.html.erb

@@ -15,8 +15,8 @@
       <%= form_tag spree.admin_dashboard_analytics_path, method: :get, data: { turbo_frame: :analytics } do %>
         <%= hidden_field_tag :vendor_id, @vendor.id if @vendor.present? %>
         <%= render 'spree/admin/shared/calendar_range_picker',
-          date_from_value: params[:date_from] || 1.month.ago.beginning_of_month,
-          date_to_value: params[:date_to] || 1.month.ago.end_of_month,
+          date_from_value: params[:date_from] || 1.month.ago.end_of_day,
+          date_to_value: params[:date_to] || Time.zone.now.beginning_of_day,
           css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
       <% end %>
     </div>

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

@@ -2,22 +2,22 @@
   <%= Spree.t(:integrations) %>
 <% end %>
 
-<%= content_for(:page_alerts) do %>
-  <div class="alert alert-info">
-    <%= Spree.t('admin.integrations.page_subtitle') %>
-  </div>
-<% end %>
-
-<div class="container px-lg-0 mt-2">
-  <% grouped_available_store_integrations.each do |group, integrations| %>
-    <% if group.present? %>
-      <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
-    <% end %>
+<div class="row">
+  <div class="col-lg-8 offset-lg-2">
+    <div class="alert alert-info mb-4">
+      <%= Spree.t('admin.integrations.page_subtitle') %>
+    </div>
 
-    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 mb-4">
-      <% integrations.each do |integration| %>
-        <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+    <% grouped_available_store_integrations.each do |group, integrations| %>
+      <% if group.present? %>
+        <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
       <% end %>
-    </div>
-  <% end %>
+
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
+        <% integrations.each do |integration| %>
+          <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
 </div>

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

@@ -19,7 +19,8 @@
           </tr>
         </thead>
         <tbody>
-          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
+          <% default_theme = current_store.default_theme %>
+          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: ->(page) { [*spree_base_cache_scope.call(page), default_theme] } %>
         </tbody>
       </table>
       <%= render "spree/admin/shared/index_table_options", collection: @collection %>

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

@@ -2,69 +2,62 @@
   <%= render "spree/admin/payment_methods/configuration_guides/#{@object.configuration_guide_partial_name}", f: f %>
 <% end %>
 
+<% if !preference_fields(@object, f).empty? || @object.respond_to?(:custom_form_fields_partial_name) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title"><%= Spree.t(:payment_provider_settings) %></h5>
+    </div>
+    <div class="card-body">
+      <%= preference_fields(@object, f) unless preference_fields(@object, f).empty? %>
 
-<div class="row">
-  <% if !preference_fields(@object, f).empty? || @object.respond_to?(:custom_form_fields_partial_name) %>
-    <div class="col-12 col-md-6">
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title"><%= Spree.t(:payment_provider_settings) %></h5>
-        </div>
-        <div class="card-body">
-          <%= preference_fields(@object, f) unless preference_fields(@object, f).empty? %>
-
-          <% if @object.respond_to?(:custom_form_fields_partial_name) %>
-            <%= render "spree/admin/payment_methods/custom_form_fields/#{@object.custom_form_fields_partial_name}", f: f %>
-          <% end %>
-        </div>
-      </div>
+      <% if @object.respond_to?(:custom_form_fields_partial_name) %>
+        <%= render "spree/admin/payment_methods/custom_form_fields/#{@object.custom_form_fields_partial_name}", f: f %>
+      <% end %>
     </div>
-  <% end %>
+  </div>
+<% end %>
 
-  <div class="col-12 col-md-6">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
-      </div>
-      <div class="card-body">
-        <div class="form-group">
-          <%= label_tag :payment_method_name, Spree.t(:name) %>
-          <%= text_field :payment_method, :name, class: 'form-control' %>
-          <span class="text-muted form-text mt-2">
-            This name will be used to identify the payment method on the storefront
-          </span>
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= label_tag :payment_method_name, Spree.t(:name) %>
+      <%= text_field :payment_method, :name, class: 'form-control' %>
+      <span class="text-muted form-text mt-2">
+        This name will be used to identify the payment method on the storefront
+      </span>
 
-          <%= error_message_on :payment_method, :name %>
-        </div>
+      <%= error_message_on :payment_method, :name %>
+    </div>
 
-        <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
-          <div class="form-group">
-            <%= label_tag :payment_method_stores, Spree.t(:stores) %>
-            <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
-              <div class="custom-control custom-checkbox mb-1">
-                <%= b.check_box(class: 'custom-control-input') %>
-                <%= b.label(class: 'custom-control-label') %>
-              </div>
-            <% end %>
+    <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
+      <div class="form-group">
+        <%= label_tag :payment_method_stores, Spree.t(:stores) %>
+        <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
+          <div class="custom-control custom-checkbox mb-1">
+            <%= b.check_box(class: 'custom-control-input') %>
+            <%= b.label(class: 'custom-control-label') %>
           </div>
         <% end %>
+      </div>
+    <% end %>
 
-        <div class="form-group">
-          <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-          <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
-        </div>
-        <div class="form-group">
-          <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
-        </div>
+    <div class="form-group">
+      <%= label_tag :payment_method_display_on, Spree.t(:display) %>
+      <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
+      <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
+    </div>
 
-        <div class="form-group">
-          <label><%= Spree.t(:active) %></label>
-          <div class="custom-control custom-switch">
-            <%= f.check_box :active, class: 'custom-control-input' %>
-            <%= f.label :active, '&nbsp;'.html_safe, class: 'custom-control-label' %>
-          </div>
-        </div>
+    <div class="form-group">
+      <label><%= Spree.t(:active) %></label>
+      <div class="custom-control custom-switch">
+        <%= f.check_box :active, class: 'custom-control-input' %>
+        <%= f.label :active, '&nbsp;'.html_safe, class: 'custom-control-label' %>
       </div>
     </div>
   </div>

data/app/views/spree/admin/payment_methods/edit.html.erb

@@ -2,9 +2,13 @@
   <%= page_header_back_button spree.admin_payment_methods_path %>
   <%= @payment_method.name %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
 
 <%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method) do |f| %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/payment_methods/new.html.erb

@@ -3,10 +3,13 @@
   <%= @payment_method.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
-
 <%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_methods_path do |f| %>
   <%= f.hidden_field :type %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/new_resource_links' %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

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

@@ -8,7 +8,7 @@
 
     <div class="form-group mb-0">
       <%= f.label :description, Spree.t(:description) %>
-      <div class="border rounded mb-0">
+      <div class="trix-container mb-0">
         <%= f.text_area :description, { rows: 10, class: "form-control spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>
       </div>
     </div>

data/app/views/spree/admin/profile/edit.html.erb

@@ -2,10 +2,14 @@
   <%= Spree.t('admin.edit_profile') %>
 <% end %>
 
+<%= content_for :page_actions do %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user' %>
+<% end %>
+
 <%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>
   <div class="row">
-    <div class="col-lg-6 mb-4">
-      <div class="card">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title"><%= Spree.t('admin.personal_details') %></h5>
         </div>
@@ -30,9 +34,7 @@
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="col-lg-6 mb-4">
       <div class="card">
         <div class="card-header">
           <h5 class="card-title"><%= Spree.t('admin.notifications') %></h5>
@@ -72,8 +74,4 @@
       </div>
     </div>
   </div>
-
-  <div class="form-actions">
-    <%= turbo_save_button_tag Spree.t('actions.update') %>
-  </div>
 <% end %>

data/app/views/spree/admin/promotions/new.html.erb

@@ -3,9 +3,55 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 <%= form_for :promotion, url: collection_url do |f| %>
-  <%= render 'form', f: f %>
-  <p class="alert alert-info text-center mt-3">
-    In the next step you will be able to add actions and rules to your promotion
-  </p>
-  <%= render 'spree/admin/shared/new_resource_links' %>
+
+  <div class="row">
+    <div class="col-12 col-lg-6 offset-lg-3">
+      <%= render 'spree/admin/shared/error_messages', target: @promotion %>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:details) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <div class="form-group">
+            <%= f.label :name %>
+            <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
+            <%= f.error_message_on :name %>
+            <span class="form-text text-muted mt-2">
+              Customers will see this in their cart and at checkout.
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:kind) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <%= render 'spree/admin/promotions/form/kind', f: f %>
+        </div>
+      </div>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:settings) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <%= render 'spree/admin/promotions/form/settings', f: f %>
+        </div>
+      </div>
+
+      <p class="alert alert-info text-center">
+        In the next step you will be able to add actions and rules to your promotion
+      </p>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/shared/_content_header.html.erb

@@ -38,7 +38,7 @@
               <% if record.respond_to?(:audits) && spree.respond_to?(:admin_audits_path) && defined?(Audited) && can?(:read, Audited.audit_class) %>
                 <a href="<%= spree.admin_audits_path(q: { auditable_id_eq: record.id, auditable_type_eq: record.class.to_s }) %>" target="_blank" class="dropdown-item">
                   <%= icon 'history' %>
-                  <%= Spree.t(:audit_log) %>
+                  <%= Spree.t('admin.audit_log') %>
                 </a>
               <% end %>
               <% if record.respond_to?(:number) %>
@@ -71,8 +71,8 @@
 <% end %>
 
 <% if content_for?(:page_tabs) %>
-  <div class="container">
-    <ul class="nav nav-pills flex-nowrap w-100 mb-3">
+  <div class="container-fluid" id="page-tabs">
+    <ul class="nav">
       <%= yield :page_tabs %>
     </ul>
   </div>

data/app/views/spree/admin/shared/_head.html.erb

@@ -56,4 +56,5 @@
 <script>
   window.Spree = window.Spree || {}
   Spree.adminPath = '<%= spree.admin_path %>'
+  Spree.locale = '<%= I18n.locale %>'
 </script>

data/app/views/spree/admin/shared/_stock_nav.html.erb

@@ -1,4 +1,2 @@
-<ul class="nav mb-0" id="pills-tab" role="tablist">
-  <%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
-  <%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>
-</ul>
+<%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
+<%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>

data/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erb

@@ -2,7 +2,7 @@
   <% unless session[:spree_enterprise_edition_notice_dismissed] %>
     <section class="d-none d-lg-block">
       <div id="enterprise-edition-notice">
-        <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, method: :patch, class: 'btn-close' %>
+        <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, data: { turbo_method: :patch }, class: 'btn-close' %>
         <p>You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>
 
         <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-link btn-sm shadow-xs' %>

data/app/views/spree/admin/storefront/edit.html.erb

@@ -6,15 +6,19 @@
   <%= Spree.t(:settings) %>
 <% end %>
 
-<%= content_for(:page_actions) do %>
+<%= content_for(:page_actions_dropdown) do %>
   <%= link_to_edit_translations(@store) %>
 <% end %>
 
+<%= content_for(:page_actions) do %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: "edit_store_#{@store.id}" %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>
 
 <%= form_for @store, url: spree.admin_storefront_path, method: :patch do |f| %>
   <div class="row">
-    <div class="col-lg-6">
+    <div class="col-lg-6 offset-lg-3">
       <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title">
@@ -85,9 +89,7 @@
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="col-lg-6">
       <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title">
@@ -139,6 +141,4 @@
       </div>
     </div>
   </div>
-
-  <%= render 'spree/admin/stores/form/buttons' %>
 <% end %>

data/app/views/spree/admin/stores/edit.html.erb

@@ -9,5 +9,4 @@
   <%= render partial: 'spree/admin/stores/form/emails', locals: { f: f } if params[:section] == 'emails' %>
   <%= render partial: 'spree/admin/stores/form/checkout', locals: { f: f } if params[:section] == 'checkout' %>
   <%= render partial: 'spree/admin/stores/form/policies', locals: { f: f } if params[:section] == 'policies' %>
-  <%= render 'spree/admin/stores/form/buttons' %>
 <% end %>

data/app/views/spree/admin/stores/form/_checkout.html.erb

@@ -2,33 +2,14 @@
   <%= Spree.t(:checkout) %> <%= Spree.t(:settings) %>
 <% end %>
 
-<%= content_for :page_alerts do %>
-  <div class="alert alert-info mb-3">
-    <p>
-      <%= Spree.t('admin.checkout_settings.policy_copy', policies_link: link_to(Spree.t(:policies), spree.edit_admin_store_path + '?section=policies', class: 'alert-link')).html_safe %>
-    </p>
-  </div>
-<% end %>
-
 <div class="row">
-  <div class="col-lg-7">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
-      </div>
-
-      <div class="card-body">
-        <p class="text-muted">
-          <%= Spree.t('admin.checkout_settings.checkout_message_description') %>
-        </p>
-        <div class="trix-container">
-          <%= f.rich_text_area :checkout_message, class: 'overflow-auto', style: 'height: 300px' %>
-        </div>
-      </div>
+  <div class="col-lg-6 offset-lg-3">
+    <div class="alert alert-info mb-3">
+      <p>
+        <%= Spree.t('admin.checkout_settings.policy_copy', policies_link: link_to(Spree.t(:policies), spree.edit_admin_store_path + '?section=policies', class: 'alert-link')).html_safe %>
+      </p>
     </div>
-  </div>
 
-  <div class="col-lg-5">
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title"><%= Spree.t(:settings) %></h5>
@@ -66,5 +47,20 @@
         </div>
       </div>
     </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
+      </div>
+
+      <div class="card-body">
+        <p class="text-muted">
+          <%= Spree.t('admin.checkout_settings.checkout_message_description') %>
+        </p>
+        <div class="trix-container">
+          <%= f.rich_text_area :checkout_message, class: 'overflow-auto', style: 'height: 300px' %>
+        </div>
+      </div>
+    </div>
   </div>
 </div>

data/app/views/spree/admin/stores/form/_emails.html.erb

@@ -3,24 +3,7 @@
 <% end %>
 
 <div class="row">
-  <div class="col-lg-6">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">Logo for emails</h5>
-      </div>
-      <div class="card-body">
-        <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
-        <%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>
-        <p class="form-text text-muted mb-0 mt-2">
-          We recommend images with a transparent background.
-          <br />
-          Only JPEG and PNG formats are supported.
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title">Email addresses</h5>
@@ -55,5 +38,20 @@
         </div>
       </div>
     </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title">Logo for emails</h5>
+      </div>
+      <div class="card-body">
+        <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
+        <%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>
+        <p class="form-text text-muted mb-0 mt-2">
+          We recommend images with a transparent background.
+          <br />
+          Only JPEG and PNG formats are supported.
+        </p>
+      </div>
+    </div>
   </div>
 </div>

data/app/views/spree/admin/translations/edit.html.erb

@@ -4,7 +4,7 @@
 <% end %>
 <% if @locales.any?%>
   <% if @locales.many? %>
-    <%= form_with url: spree.edit_admin_translation_path(@resource, resource_type: @resource.class.to_s), class: "w-100 d-flex justify-content-end", data: { controller: 'auto-submit', turbo_frame: 'translations_table'}, method: :get do |f| %>
+    <%= form_with url: spree.edit_admin_translation_path(@resource, resource_type: @resource.class.to_s), class: "w-100 d-flex justify-content-end mb-3", data: { controller: 'auto-submit', turbo_frame: 'translations_table'}, method: :get do |f| %>
       <div class="form-inline gap-2">
         <%= f.label :translation_locale, Spree.t(:language) %>
         <%= f.select :translation_locale, options_for_select(@locales.map { |locale| [Spree.t('i18n.this_file_language', locale: locale), locale] }, @selected_translation_locale), {}, { class: 'custom-select', data: { action: 'change->auto-submit#submit' } } %>
@@ -19,9 +19,9 @@
           <table class="table">
             <thead>
               <tr>
-                <th scope="col" class="w-10 text-center"><%= Spree.t(:field) %></th>
-                <th scope="col" class="w-40 text-center"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
-                <th scope="col" class="w-50 text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
+                <th scope="col" class="w-10"><%= Spree.t(:field) %></th>
+                <th scope="col" class="w-40"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
+                <th scope="col" class="w-50"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
               </tr>
             </thead>
             <tbody>

data/app/views/spree/admin/translations/option_types/_form.html.erb

@@ -11,7 +11,11 @@
 
   <%= f.fields_for :option_values do |ff| %>
     <% ff.object.class.translatable_fields.each do |field| %>
-      <%= render "spree/admin/translations/translation_rows/text_field_row", f: ff, field: field, locale: locale %>
+      <tr>
+        <td><%= Spree.t(field) %></td>
+        <td><%= ff.object.send(field) %></td>
+        <td><%= ff.text_field "#{field}_#{locale}", class: 'form-control' %></td>
+      </tr>
     <% end %>
   <% end %>
 <% end %>

data/app/views/spree/admin/translations/products/_form.html.erb

@@ -1,11 +1,9 @@
 <%# locals: (f:, resource:, locale:) %>
 
 <% resource.class.translatable_fields.each do |field| %>
-  <% next if field == :meta_keywords %>
-
   <% case field%>
   <% when :description %>
-    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+    <%= render "spree/admin/translations/translation_rows/tinymce_row", f: f, field: field, locale: locale %>
   <% when :meta_description %>
     <%= render "spree/admin/translations/translation_rows/textarea_row", f: f, field: field, locale: locale %>
   <% else %>

data/app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb

@@ -11,19 +11,11 @@
 %>
 
 <tr>
-  <td class="text-center"><%= Spree.t(field) %></td>
+  <td><%= Spree.t(field) %></td>
   <td>
-    <div class="form-group">
-      <div class="input-group">
-        <% if base_permalink.present? %>
-          <div class="input-group-prepend">
-            <span class="input-group-text"><%= base_permalink %></span>
-          </div>
-        <% end %>
-
-        <%= value %>
-      </div>
-    </div>
+    <code>
+      <%= f.object.permalink %>
+    </code>
   </td>
   <td>
     <div class="form-group">

data/app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb

@@ -1,13 +1,13 @@
 <%# locals: (f:, field:, locale:) %>
 
 <tr>
-  <td class="text-center"><%= Spree.t(field) %></td>
+  <td><%= Spree.t(field) %></td>
   <td class="text-wrap">
     <%= @resource.send(field)%>
   </td>
   <td>
     <div class="trix-container mb-0">
-      <%= f.rich_textarea "#{field}_#{locale}" %>
+      <%= f.rich_text_area "#{field}_#{locale}" %>
     </div>
   </td>
 </tr>

data/app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb

@@ -1,7 +1,7 @@
 <%# locals: (f:, field:, locale:) %>
 
 <tr>
-  <td class="text-center"><%= Spree.t(field) %></td>
+  <td><%= Spree.t(field) %></td>
   <td><%= @resource.send(field) %></td>
   <td><%= f.text_field "#{field}_#{locale}", class: 'form-control' %></td>
 </tr>

data/app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb

@@ -1,11 +1,11 @@
 <%# locals: (f:, field:, locale:) %>
 
 <tr>
-  <td class="text-center"><%= Spree.t(field) %></td>
+  <td><%= Spree.t(field) %></td>
   <td>
     <%= @resource.send(field) %>
   </td>
   <td>
-    <%= f.textarea "#{field}_#{locale}", rows: 5, class: "form-control", data: { controller: 'textarea-autogrow'} %>
+    <%= f.text_area "#{field}_#{locale}", rows: 5, class: "form-control", data: { controller: 'textarea-autogrow'} %>
   </td>
 </tr>

data/app/views/spree/admin/translations/translation_rows/_tinymce_row.html.erb

@@ -0,0 +1,13 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td>
+    <%= @resource.send(field) %>
+  </td>
+  <td>
+    <div class="trix-container">
+      <%= f.text_area "#{field}_#{locale}", rows: 10, class: "form-control spree-rte" %>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/variants/edit.html.erb

@@ -3,18 +3,15 @@
   <%= @variant.human_name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
-
 <%= form_for [:admin, @product, @variant] do |f| %>
   <div class="row">
-    <div class="col-lg-6">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
       <%= render 'spree/admin/variants/form/basic', f: f %>
       <%= render 'spree/admin/variants/form/pricing', f: f %>
       <%= render 'spree/admin/variants/form/inventory', f: f %>
-    </div>
-    <div class="col-lg-6">
       <%= render 'spree/admin/variants/form/media', viewable: @variant %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     </div>
   </div>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

data/app/views/spree/admin/variants/form/_inventory.html.erb

@@ -4,8 +4,18 @@
       <%= Spree.t(:inventory) %>
     </h5>
   </div>
-  <div class="card-body p-0">
-    <table class="table">
+  <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="d-none">
+    <div class="custom-control custom-checkbox mb-4 m-3">
+      <%= f.check_box :track_inventory,
+            class: 'custom-control-input',
+            data: {
+              action: 'change->reveal#toggle'
+            }
+          %>
+      <%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>
+    </div>
+
+    <table class="table <%= 'd-none' unless f.object.track_inventory? %>" data-reveal-target="item">
       <thead>
         <tr>
           <th><%= Spree.t(:stock_location) %></th>

data/config/routes.rb

@@ -249,7 +249,8 @@ Spree::Core::Engine.add_routes do
     resource :dashboard, controller: 'dashboard'
     get '/dashboard/analytics', to: 'dashboard#analytics', as: :dashboard_analytics
     get '/getting-started', to: 'dashboard#getting_started', as: :getting_started
-    get '/dismiss_enterprise_edition_notice', to: 'dashboard#dismiss_enterprise_edition_notice', as: :dismiss_enterprise_edition_notice
+    patch '/dismiss_enterprise_edition_notice', to: 'dashboard#dismiss_enterprise_edition_notice', as: :dismiss_enterprise_edition_notice
+    patch '/dismiss_updater_notice', to: 'dashboard#dismiss_updater_notice', as: :dismiss_updater_notice
 
     root to: 'dashboard#show'
   end

data/lib/spree/admin/testing_support/capybara_utils.rb

@@ -35,10 +35,6 @@ module Spree
         rescue Selenium::WebDriver::Error::TimeoutError
           default_options[:error].nil? ? false : raise(default_options[:error])
         end
-
-        def fill_in_trix_editor(id, with:)
-          page.find(id, visible: :all).click.set(with)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -837,7 +837,6 @@ files:
 - app/views/spree/admin/promotion_rules/new.html.erb
 - app/views/spree/admin/promotions/_actions.html.erb
 - app/views/spree/admin/promotions/_filters.html.erb
-- app/views/spree/admin/promotions/_form.html.erb
 - app/views/spree/admin/promotions/_header.html.erb
 - app/views/spree/admin/promotions/_promotion.html.erb
 - app/views/spree/admin/promotions/_rules.html.erb
@@ -1050,6 +1049,7 @@ files:
 - app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb
 - app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb
 - app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb
+- app/views/spree/admin/translations/translation_rows/_tinymce_row.html.erb
 - app/views/spree/admin/user_passwords/edit.html.erb
 - app/views/spree/admin/user_passwords/new.html.erb
 - app/views/spree/admin/user_sessions/new.html.erb
@@ -1144,9 +1144,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.2
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,47 +0,0 @@
-<%= render 'spree/admin/shared/error_messages', target: @promotion %>
-
-<div class="row">
-  <div class="col-12 col-lg-8">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:details) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <div class="form-group">
-          <%= f.label :name %>
-          <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
-          <%= f.error_message_on :name %>
-          <span class="form-text text-muted mt-2">
-            Customers will see this in their cart and at checkout.
-          </span>
-        </div>
-      </div>
-    </div>
-
-    <div class="card">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:kind) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <%= render 'spree/admin/promotions/form/kind', f: f %>
-      </div>
-    </div>
-  </div>
-
-  <div class="col-12 col-lg-4">
-    <div class="card">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:settings) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <%= render 'spree/admin/promotions/form/settings', f: f %>
-      </div>
-    </div>
-  </div>
-</div>