spree_admin 5.0.0.rc1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46d7797c6b7f96882ad96c43ea5a208adeca65c74816b1541a4eec33c6dbdd7
-  data.tar.gz: 51593866ea9184c76e644c9e87691b94e183ea9bab9d50df371f97bc6a53ae59
+  metadata.gz: 9a3f2875dd028cc2a4d3dc3fb9933583918ff856afe242193a4c784bae6af84f
+  data.tar.gz: 9b3ec33e0fbc122fa9915fb5f0199c2ec79e249f9291429713c6d7e5dd89e2b8
 SHA512:
-  metadata.gz: ab791c77bbf7061f800a622f19242dfea2ff77d5e11e6fca722ce06239462f7160bda2bfe31b983ef6fc440b0e9caa36802a986574a9c2ab7fee8dc50ab6b281
-  data.tar.gz: 850bd370e9ec8cc75cf0017d6c866ea7f45c116e33d737977217a6c1e61070e5b2edb9f1275d23cca355cc190ad2c60d17cbf6d57baf49cebd82a6fd49e11303
+  metadata.gz: 42d85993653cd2792a7ee9bb052da3a5dfab181415fb2362c73fd09f33acc46a4ed6253d81fcdbb3d61320ca14ca4d5fa5eb92f5080e292a179f397778dcfc1a
+  data.tar.gz: cadca2e5fa570bf58c8de527f4702e9623e0ad3a3861a030404838a9ae3e1186d23cdd071dea58d3fe5222faf5a3d90f49cd095e767ea08b870f28cb21921944

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

@@ -54,23 +54,32 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
     border-radius: $border-radius;
     display: flex;
     align-items: center;
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
+    padding-left: 0.35rem;
+    padding-right: 0.35rem;
     padding-top: 0.35rem;
     padding-bottom: 0.35rem;
 
     .ti {
       font-size: 1rem;
       margin-right: 0.5rem;
+      border-radius: $border-radius-sm;
+      padding: 0.2rem 0.2rem;
     }
 
     &:hover {
-      background-color: $gray-75;
+      background-color: $gray-50;
     }
     &.active {
       color: theme-color('primary');
-      background-color: $gray-100;
+      background-color: $white;
+      box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.05) 0px 0px 0px 1px, rgba(0, 0, 0, 0.05) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
       font-weight: 500;
+
+      .ti {
+        background-color: theme-color('primary');
+        color: $white;
+        box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.05) 0px 0px 0px 1px, rgba(0, 0, 0, 0.05) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
+      }
     }
 
     .badge {
@@ -96,6 +105,7 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
       &.active, &:active, &:focus {
         font-weight: 600;
         background-color: transparent !important;
+        box-shadow: none;
       }
     }
   }

data/app/assets/stylesheets/spree/admin/shared/_base.scss

@@ -671,4 +671,15 @@ div.uppy-Root {
 
 .tooltip-inner {
   box-shadow: $dropdown-box-shadow;
-}
+}
+
+.avatar {
+  border-radius: 50%;
+  background-color: $gray-200;
+  color: $gray-500;
+  font-size: 1rem;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

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

@@ -83,7 +83,10 @@ module Spree
 
         product_ids = line_items_grouped.map(&:variant_product_id).uniq.compact
 
-        return if product_ids.empty?
+        if product_ids.empty?
+          @top_products = []
+          return
+        end
 
         products = current_store.products.with_deleted.includes(:master, :variants).where(id: product_ids)
 

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

@@ -3,6 +3,12 @@ module Spree
     module BaseHelper
       include Spree::ImagesHelper
 
+      def render_admin_partials(section, options = {})
+        Rails.application.config.spree_admin.send(section).map do |partial|
+          render partial, options
+        end.join.html_safe
+      end
+
       def enterprise_edition?
         defined?(Vendo)
       end
@@ -16,27 +22,35 @@ module Spree
       end
 
       def settings_active?
-        %w[stores zones shipping_methods oauth_applications
-           payment_methods refund_reasons reimbursement_types
-           shipping_categories store_credit_categories
-           syncs tax_categories tax_rates webhooks accounts
-           custom_domains audits exports imports return_authorization_reasons
-           documents stripe_tax_registrations members subscriptions stock_locations webhooks_subscribers].include?(controller_name)
+        @settings_active || %w[stores zones shipping_methods oauth_applications
+                               payment_methods refund_reasons reimbursement_types
+                               shipping_categories store_credit_categories
+                               syncs tax_categories tax_rates webhooks accounts
+                               custom_domains audits exports imports return_authorization_reasons
+                               documents stripe_tax_registrations members subscriptions stock_locations webhooks_subscribers].include?(controller_name)
       end
 
       def available_countries_iso
         @available_countries_iso ||= current_store.countries_available_for_checkout.pluck(:iso)
       end
 
-      def avatar_url_for(user)
+      def render_avatar(user, options = {})
         return unless user.present?
 
+        options[:width] ||= 128
+        options[:height] ||= 128
+        options[:class] ||= 'avatar'
+
         if user.respond_to?(:avatar) && user.avatar.attached? && user.avatar.variable?
-          main_app.cdn_image_url(
-            user.avatar.variant(spree_image_variant_options(resize_to_fill: [128, 128]))
+          image_tag(
+            main_app.cdn_image_url(
+              user.avatar.variant(spree_image_variant_options(resize_to_fill: [options[:width] * 2, options[:height] * 2]))
+            ),
+            class: options[:class],
+            style: "width: #{options[:width]}px; height: #{options[:height]}px;"
           )
         else
-          "https://eu.ui-avatars.com/api/?name=#{user.name&.initials}&background=random"
+          content_tag(:div, user.name&.initials, class: options[:class], style: "width: #{options[:width]}px; height: #{options[:height]}px;")
         end
       end
 

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

@@ -1,6 +1,19 @@
 module Spree
   module Admin
     module NavigationHelper
+      # Creates a navigation item with optional icon
+      # @param [String, SafeBuffer] label The text or HTML to use as the link content
+      # @param [String] url The URL for the link
+      # @param [String, nil] icon Optional icon name to prepend to the label
+      # @param [Boolean, nil] active Whether the link should be marked as active
+      # @return [SafeBuffer] The navigation item HTML
+      def nav_item(label, url, icon: nil, active: nil)
+        content_tag :li, class: 'nav-item', role: 'presentation' do
+          label = icon(icon) + label if icon.present?
+          active_link_to label, url, class: 'nav-link', active: active
+        end
+      end
+
       # the per_page_dropdown is used on index pages like orders, products, promotions etc.
       # this method generates the select_tag
       def per_page_dropdown
@@ -162,16 +175,6 @@ module Spree
         end
       end
 
-      def nav_pill_list_item(resource, url: nil, label: Spree.t(resource), active: nil, link_class: 'nav-link')
-        url = spree.send("admin_#{resource.to_s.pluralize}_path") if url.nil?
-        active = request.url.starts_with?(url) || request.fullpath.starts_with?(url) || controller_name == resource.to_s if active.nil?
-        link_class = "#{link_class} active" if active
-
-        content_tag :li, class: 'nav-item', role: 'presentation' do
-          link_to label, url, role: 'tab', 'aria-controls': 'pills-general', class: link_class, 'aria-selected': active
-        end
-      end
-
       def external_link_to(label, url, opts = {}, &block)
         opts[:target] ||= :blank
         opts[:rel] ||= :nofollow

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

@@ -77,8 +77,9 @@ module Spree
           )
         else
           initials = store.name.split.map(&:first).join.upcase
-          image_tag("https://eu.ui-avatars.com/api/?name=#{initials}&background=random", width: opts[:height], height: opts[:height],
-                                                                                        class: 'rounded with-tip', title: store.name)
+          content_tag(:div, initials, class: "avatar rounded with-tip bg-light",
+                     style: "width: #{opts[:height]}px; height: #{opts[:height]}px;",
+                     title: store.name)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Spree
         content_tag :div, class: 'col-xs-12 col-sm-6 col-md-4 col-lg-4 form-group' do
           content_tag :div, class: 'custom-control custom-switch' do
             (form.check_box resource_name, event_checkbox_opts(resource_name), true, nil) + ' ' +
-              form.label(resource_name, Spree.t("admin.webhooks_subscribers.#{resource_name.to_s.pluralize}"), class: 'custom-control-label')
+              form.label(resource_name, Spree.t("#{resource_name.to_s.pluralize}"), class: 'custom-control-label')
           end
         end
       end

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

@@ -36,7 +36,8 @@ export default class extends CheckboxSelectAll {
     variantIds: Object,
     currentStockLocationId: String,
     stockLocations: Array,
-    optionValuesSelectOptions: Array
+    optionValuesSelectOptions: Array,
+    locale: String
   }
 
   connect() {
@@ -403,7 +404,7 @@ export default class extends CheckboxSelectAll {
     pricesVariation.delete(null)
 
     if (pricesVariation.size === 0) {
-      parentPriceEl.value = this.priceForVariant(variantName, currency).amount
+      parentPriceEl.value = this.priceForVariant(variantName, currency).amount?.toLocaleString(this.localeValue) || ''
       parentPriceEl.placeholder = ''
       return
     }
@@ -668,7 +669,7 @@ export default class extends CheckboxSelectAll {
       }
 
       const existingPrice = this.priceForVariant(internalName, currency)
-      priceInput.value = existingPrice.amount
+      priceInput.value = existingPrice.amount?.toLocaleString(this.localeValue) || ''
       currencyInput.value = currency
       if (existingPrice.id) {
         idInput.value = existingPrice.id

data/app/views/layouts/spree/admin.html.erb

@@ -6,6 +6,8 @@
   </head>
 
   <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+    <%= render_admin_partials(:body_start_partials) %>
+
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/sidebar" %>
     <main id="content">
@@ -17,5 +19,7 @@
     </main>
     <%= render "spree/admin/shared/modal" %>
     <%= render "spree/admin/shared/alerts" %>
+
+    <%= render_admin_partials(:body_end_partials) %>
   </body>
 </html>

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

@@ -0,0 +1,2 @@
+<%= render 'updater' %>
+<%= render 'store_preview' %>

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

@@ -32,40 +32,50 @@
           </tr>
         </thead>
         <tbody>
-        <% @top_products.each do |list_item| %>
-          <% product = list_item[:product] %>
-          <tr>
-            <% cache_unless @vendor, spree_base_cache_scope.call(product) do %>
-              <td>
-                <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>
-                  <div class="mr-3">
-                    <%= render 'spree/admin/shared/product_image', object: product %>
-                  </div>
-                  <%= product.name %>
+        <% if @top_products.any? %>
+          <% @top_products.each do |list_item| %>
+            <% product = list_item[:product] %>
+            <tr>
+              <% cache_unless @vendor, spree_base_cache_scope.call(product) do %>
+                <td>
+                  <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>
+                    <div class="mr-3">
+                      <%= render 'spree/admin/shared/product_image', object: product %>
+                    </div>
+                    <%= product.name %>
+                  <% end %>
+                </td>
+                <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
+                  <td>
+                    <%= vendor_logo_link(product.vendor) if product.vendor.present? %>
+                  </td>
                 <% end %>
-              </td>
-              <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
                 <td>
-                  <%= vendor_logo_link(product.vendor) if product.vendor.present? %>
+                  <%= display_admin_price(product) %>
                 </td>
               <% end %>
-              <td>
-                <%= display_admin_price(product) %>
+              <td class="text-center">
+                <%= list_item[:quantity] %>
               </td>
-            <% end %>
-            <td class="text-center">
-              <%= list_item[:quantity] %>
-            </td>
-            <td class="text-right">
-              <%= list_item[:amount] %>
+              <td class="text-right">
+                <%= list_item[:amount] %>
+              </td>
+            </tr>
+          <% end %>
+        <% else %>
+          <tr>
+            <td colspan="5" class="text-center text-muted py-5">
+              <%= Spree.t(:no_resource_found, resource: Spree::Product.name.demodulize.underscore.humanize) %>
             </td>
           </tr>
         <% end %>
       </tbody>
     </table>
   </div>
-  <p class="text-center mt-0 border-top py-2 mb-0">
-    <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
-  </p>
+  <% if @top_products.any? %>
+    <p class="text-center mt-0 border-top py-2 mb-0">
+      <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
+    </p>
+  <% end %>
   </div>
 </div>

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

@@ -113,6 +113,8 @@
     </div>
   </div>
 
-  <%= render 'top_products' if @top_products.present? %>
+  <%= render 'top_products' if @top_products %>
   <%= render 'visits' if @visits %>
+
+  <%= render_admin_partials(:dashboard_analytics_partials) %>
 <% end %>

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

@@ -23,11 +23,7 @@
     <%= render 'analytics' %>
   </div>
   <div class="col-lg-4">
-    <% if defined?(current_vendor) && current_vendor %>
-      <%= render 'spree/admin/shared/vendor_faq' %>
-    <% else %>
-      <%= render 'updater' %>
-      <%= render 'store_preview' %>
-      <%= render 'vendors' if defined?(Spree::Vendor) %>
-    <% end %>
+    <%= render 'sidebar' %>
+    <%= render_admin_partials(:dashboard_sidebar_partials) %>
+  </div>
 </div>

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

@@ -1,8 +1,6 @@
 <% if order %>
   <% if order.user %>
     <span class="d-flex">
-      <%#= image_tag(avatar_url_for( order.user), width: 24, height: 24, class: 'mr-2 rounded') %>
-
       <% if can?(:manage, order.user) %>
         <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-dark', data: { 'turbo-frame': '_top' } %>
       <% else %>

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

@@ -89,7 +89,7 @@
         </div>
       </div>
 
-      <%= render "spree/admin/orders/extra_filters", f: f %>
+      <%= render_admin_partials(:orders_filters_partials, f: f) %>
     </div>
 
     <div class="form-actions">

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

@@ -63,6 +63,8 @@
     <% end %>
   <% end %>
 
+  <%= render_admin_partials(:order_page_dropdown_partials, order: @order) %>
+
   <% if can?(:cancel, @order) %>
     <div class="dropdown-divider"></div>
     <%= link_to spree.cancel_admin_order_path(@order),

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

@@ -74,7 +74,7 @@
       <%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
     </li>
 
-    <%= render 'summary_custom', order: @order %>
+    <%= render_admin_partials(:order_page_body_partials, order: @order) %>
 
     <li class="list-group-item d-flex justify-content-between align-items-center border-0">
       <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>

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

@@ -1,23 +1,21 @@
 <%= render 'header' %>
-<%= render 'header_custom' %>
+<%= render_admin_partials(:order_page_header_partials, order: @order) %>
 
 <div class="container px-0">
   <div class="row">
     <div class="col-lg-8">
-
       <%= render 'line_items' %>
       <%= render 'shipments' %>
       <%= render 'customer_returns' %>
       <%= render 'return_authorizations' %>
       <%= render 'payments'%>
       <%= render 'refunds'%>
-
-      <%= render 'body_custom' %>
+      <%= render_admin_partials(:order_page_body_partials, order: @order) %>
       <%= render 'summary' %>
     </div>
     <div class="col-lg-4">
-      <!-- TODO: add notes -->
       <%= render 'customer' %>
+      <%= render_admin_partials(:order_page_sidebar_partials, order: @order) %>
     </div>
   </div>
 </div>

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

@@ -43,7 +43,7 @@
           } %>
         </div>
       </div>
-      <%= render partial: "spree/admin/products/form/extra_filters", locals: { f: f } %>
+      <%= render_admin_partials(:products_filters_partials, f: f) %>
     </div>
 
     <div class="form-actions">

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

@@ -9,13 +9,13 @@
     <%= render 'spree/admin/products/form/inventory', f: f unless @product.has_variants? %>
     <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/properties', f: f %>
-    <%= render 'spree/admin/products/form/extra_form', f: f %>
+    <%= render_admin_partials(:product_form_partials, f: f, product: @product) %>
   </div>
   <div class="col-md-4">
     <%= render 'spree/admin/products/form/status', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
-    <%= render 'spree/admin/products/form/stores', f: f if Spree::Store.accessible_by(current_ability).count > 1 %>
-    <%= render 'spree/admin/products/form/extra_form_sidebar', f: f %>
+    <%= render 'spree/admin/products/form/stores', f: f if available_stores.count > 1 %>
+    <%= render_admin_partials(:product_form_sidebar_partials, f: f, product: @product) %>
 
     <%= render 'spree/admin/shared/seo',
           f: f,

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

@@ -6,6 +6,9 @@
     spree.admin_product_digital_assets_path(@product),
     class: "dropdown-item",
   ) if can?(:manage, Spree::Digital) %>
+
+  <%= render_admin_partials(:product_dropdown_partials, product: @product) %>
+
   <div class="dropdown-divider"></div>
 
   <%= external_page_preview_link(@product) %>

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

@@ -9,6 +9,7 @@
         data-controller="variants-form"
         class="variants-form"
         data-action="product-form:toggle-quantity-tracked@window->variants-form#toggleQuantityTracked"
+        data-variants-form-locale-value="<%= I18n.locale %>"
         <% if @product.persisted? %> data-variants-form-product-id-value="<%= @product.slug %>" <% end %>
         data-variants-form-current-currency-value="<%= current_currency %>"
         data-variants-form-currencies-value="<%= supported_currencies.map(&:to_s).to_json %>"

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

@@ -2,6 +2,6 @@
   <%= Spree.t(:developers) %>
 <% end %>
 <%= content_for :page_tabs do %>
-  <%= nav_pill_list_item(:api_keys, label: Spree.t(:api_keys), url: spree.admin_oauth_applications_path) if can?(:manage, Spree::OauthApplication) %>
-  <%= nav_pill_list_item(:webhooks, label: Spree.t(:webhooks), url: spree.admin_webhooks_subscribers_path) if can?(:manage, Spree::Webhooks::Subscriber) %>
+  <%= nav_item(Spree.t(:api_keys), spree.admin_oauth_applications_path) if can?(:manage, Spree::OauthApplication) %>
+  <%= nav_item(Spree.t(:webhooks), spree.admin_webhooks_subscribers_path) if can?(:manage, Spree::Webhooks::Subscriber) %>
 <% end %>

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

@@ -49,4 +49,6 @@
   </style>
 <% end %>
 
-<%= render 'spree/shared/google_places_api_loader' %>
+<%= render 'spree/shared/google_places_api_loader' %>
+
+<%= render_admin_partials(:head_partials) %>

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

@@ -3,6 +3,6 @@
 <% end %>
 
 <% content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:posts) if can?(:manage, Spree::Post) %>
-  <%= nav_pill_list_item(:post_categories, label: Spree.t(:categories)) if can?(:manage, Spree::PostCategory) %>
+  <%= nav_item(Spree.t(:posts), spree.admin_posts_path) if can?(:manage, Spree::Post) %>
+  <%= nav_item(Spree.t(:categories), spree.admin_post_categories_path) if can?(:manage, Spree::PostCategory) %>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:return_authorization_reasons, url: spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
-  <%= nav_pill_list_item(:refund_reasons, url: spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
-  <%= nav_pill_list_item(:reimbursement_types, url: spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
+  <%= nav_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
+  <%= nav_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
+  <%= nav_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
 <% end %>

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

@@ -1,4 +1,4 @@
 <%= content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:shipping_methods, url: spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
-  <%= nav_pill_list_item(:shipping_categories, url: spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
+  <%= nav_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
+  <%= nav_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
 <% end %>

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

@@ -1,4 +1,4 @@
 <ul class="nav mb-0" id="pills-tab" role="tablist">
-  <%= nav_pill_list_item(:stock_items) if can?(:manage, Spree::StockItem) %>
-  <%= nav_pill_list_item(:stock_transfers) if can?(:manage, Spree::StockTransfer) %>
+  <%= 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>

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

@@ -1,4 +1,4 @@
 <%= content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:tax_rates, url: spree.admin_tax_rates_path) if can?(:manage, Spree::TaxRate) %>
-  <%= nav_pill_list_item(:tax_categories, url: spree.admin_tax_categories_path) if can?(:manage, Spree::TaxCategory) %>
+  <%= nav_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can?(:manage, Spree::TaxRate) %>
+  <%= nav_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can?(:manage, Spree::TaxCategory) %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top} do %>
   <% if user.name.present? %>
-    <%= image_tag(avatar_url_for(user), width: 48, height: 48, class: 'mr-3 rounded-lg') %>
+    <%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>
   <% else %>
-    <div style="width: 48px; height: 48px" class="mr-3 rounded-lg bg-light"></div>
+    <div style="width: 48px; height: 48px" class="mr-3 avatar bg-light"></div>
   <% end %>
   <div class="text-left">
     <% if customer_full_name(user) %>

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

@@ -4,8 +4,8 @@
           class="btn d-flex align-items-center justify-content-between text-left w-100"
           data-toggle="dropdown" aria-expanded="false" id="accountNav">
       <div class="d-flex align-items-center">
-        <%= image_tag(avatar_url_for(try_spree_current_user), width: 34, height: 34, class: 'rounded-circle mr-lg-2') %>
-        <span class="d-none d-lg-inline">
+        <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
+        <span class="d-none d-lg-inline ml-lg-2">
           <%= try_spree_current_user.name&.full&.truncate(15)&.presence || try_spree_current_user.email.truncate(15) %><br />
           <span class="text-muted small"><%= try_spree_current_user.email.truncate(22) %></span>
         </span>

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

@@ -1,35 +1,25 @@
 <% orders_active = %[orders checkouts].include?(controller_name) || @order %>
 <% if can?(:manage, Spree::Order) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_orders_path, class: 'nav-link', active: orders_active do %>
-      <%= icon 'inbox' %>
-      <%= Spree.t(:orders) %>
-
+  <% orders_label = Spree.t(:orders) %>
+  <% if ready_to_ship_orders_count&.positive? %>
+    <% orders_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
+  <% end %>
+  
+  <%= nav_item(orders_label.html_safe, spree.admin_orders_path, icon: 'inbox', active: orders_active) %>
+  
+  <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
       <% if ready_to_ship_orders_count&.positive? %>
-        <span class="badge ml-auto">
-          <%= ready_to_ship_orders_count %>
-        </span>
+        <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>
+        <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
+        <%= nav_item(fulfill_label.html_safe, spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}), active: params.dig(:q, :shipment_state_not_in).present?) %>
+      <% end %>
+
+      <% if can?(:manage, :checkouts) %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path, active: params[:controller] == 'checkouts') %>
       <% end %>
-    <% end %>
-    <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
-      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-        <% if ready_to_ship_orders_count&.positive? %>
-          <li class="nav-item">
-            <%= active_link_to spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}), class: 'nav-link', active: params.dig(:q, :shipment_state_not_in).present? do %>
-              <span><%= Spree.t('admin.orders.orders_to_fulfill') %></span>
-              <span class="badge ml-auto">
-                <%= ready_to_ship_orders_count %>
-              </span>
-            <% end %>
-          </li>
-        <% end %>
 
-        <% if can?(:manage, :checkouts) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:draft_orders), spree.admin_checkouts_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+      <%= render_admin_partials(:store_orders_nav_partials) %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -1,41 +1,22 @@
 <% products_active =  %w[products external_categories taxons taxonomies option_types option_values properties stock_items stock_transfers].include?(controller_name) || request.path.include?('products') %>
 <% if can?(:manage, Spree::Product) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_products_path, class: 'nav-link', active: products_active do %>
-      <span class="position-relative">
-      <%= icon 'box-seam' %>
-    </span>
-    <%= Spree.t(:products) %>
-  <% end %>
+  <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'box-seam', active: products_active) %>
   <% if products_active %>
     <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
       <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:stock), spree.admin_stock_items_path, class: 'nav-link', active: %w[stock_items stock_transfers].include?(controller_name) %>
-        </li>
+        <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
       <% end %>
       <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:taxonomies), spree.admin_taxonomies_path, class: 'nav-link' %>
-        </li>
+        <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
       <% end %>
       <% if can?(:manage, Spree::OptionType) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:options), spree.admin_option_types_path, class: 'nav-link', active: %w[option_types option_values].include?(controller_name) %>
-        </li>
+        <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
       <% end %>
       <% if can?(:manage, Spree::Property) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:properties), spree.admin_properties_path, class: 'nav-link' %>
-        </li>
+        <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
       <% end %>
 
-      <% if defined?(Spree::ExternalCategory) && can?(:manage, Spree::ExternalCategory) %>
-        <li class="nav-item">
-          <%= active_link_to 'Category mapper', spree.admin_external_categories_path, class: 'nav-link' %>
-        </li>
-      <% end %>
+      <%= render_admin_partials(:store_products_nav_partials) %>
     </ul>
     <% end %>
-  </li>
 <% end %>

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

@@ -1,20 +1,13 @@
 <% returns_active = %[customer_returns return_authorizations].include?(controller_name) %>
 
 <% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_customer_returns_path, class: 'nav-link', active: returns_active do %>
-      <%= icon 'receipt-refund' %>
-      <%= Spree.t(:returns) %>
-    <% end %>
+  <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>
 
-    <% if returns_active %>
-      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-        <% if can?(:manage, Spree::ReturnAuthorization) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:return_authorizations), spree.admin_return_authorizations_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+  <% if returns_active %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+      <% if can?(:manage, Spree::ReturnAuthorization) %>
+        <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -5,79 +5,51 @@
     </li>
 
     <% if can?(:manage, current_store) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('building-store', Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
-      </li>
+      <%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>
     <% end %>
 
     <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'receipt', Spree.t(:account), main_app.edit_account_path(current_account), class: 'nav-link' %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link rounded-lg ' %>
-      </li>
+      <%= nav_item(Spree.t(:account), main_app.edit_account_path(current_account), icon: 'receipt') %>
+      <%= nav_item(Spree.t(:account_members), main_app.account_members_path(current_account), icon: 'users') %>
     <% end %>
 
     <% if can?(:manage, current_store) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('send', Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), class: 'nav-link', active: params[:section] == 'emails') %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('list-check', Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), class: 'nav-link', active: params[:section] == 'policies') %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('shopping-cart', Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), class: 'nav-link', active: params[:section] == 'checkout') %>
-      </li>
+      <%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') %>
+      <%= nav_item(Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), icon: 'list-check', active: params[:section] == 'policies') %>
+      <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') %>
     <% end %>
 
     <% if can?(:manage, Spree::CustomDomain) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('world-www', Spree.t(:domains), spree.admin_custom_domains_path, class: 'nav-link') %>
-      </li>
+      <%= nav_item(Spree.t(:domains), spree.admin_custom_domains_path, icon: 'world-www') %>
     <% end %>
 
     <% if can?(:manage, Spree::PaymentMethod) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('credit-card', Spree.t(:payments), spree.admin_payment_methods_path, class: 'nav-link') %>
-      </li>
+      <%= nav_item(Spree.t(:payments), spree.admin_payment_methods_path, icon: 'credit-card') %>
     <% end %>
 
     <% if can?(:manage, Spree::Zone) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('world', Spree.t(:zones), spree.admin_zones_path, { active: %w[zones countries states].include?(controller_name), class: 'nav-link' }) %>
-      </li>
+      <%= nav_item(Spree.t(:zones), spree.admin_zones_path, icon: 'world', active: %w[zones countries states].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::ShippingMethod) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('truck', Spree.t(:shipping), spree.admin_shipping_methods_path, { active: %w[shipping_methods shipping_categories].include?(controller_name), class: 'nav-link' }) %>
-      </li>
+      <%= nav_item(Spree.t(:shipping), spree.admin_shipping_methods_path, icon: 'truck', active: %w[shipping_methods shipping_categories].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::TaxRate) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('receipt-tax', Spree.t(:tax), spree.admin_tax_rates_path, active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name), class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:tax), spree.admin_tax_rates_path, icon: 'receipt-tax', active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::ReturnAuthorizationReason) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('receipt-refund', Spree.t(:returns), spree.admin_return_authorization_reasons_path, active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name), class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:returns), spree.admin_return_authorization_reasons_path, icon: 'receipt-refund', active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::StockLocation) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('map-pin', Spree.t(:stock_locations), spree.admin_stock_locations_path, class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:stock_locations), spree.admin_stock_locations_path, icon: 'map-pin') %>
     <% end %>
 
     <% if can?(:manage, Spree::Store) %>
       <% if enterprise_edition? %>
-        <li class="nav-item">
-          <%= active_link_to_with_icon('history', Spree.t('admin.audit_log'), spree.admin_audits_path, class: 'nav-link w-auto', active: %w[audits exports imports].include?(controller_name)) %>
-        </li>
+        <%= nav_item(Spree.t('admin.audit_log'), spree.admin_audits_path, icon: 'history', active: %w[audits exports imports].include?(controller_name)) %>
       <% else %>
         <li class="nav-item">
           <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
@@ -91,10 +63,10 @@
     <% end %>
 
     <% if can?(:manage, Spree::OauthApplication) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('terminal', Spree.t(:developers), spree.admin_oauth_applications_path, class: 'nav-link', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
-      </li>
+      <%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
     <% end %>
+
+    <%= render_admin_partials(:store_settings_nav_partials) %>
   </ul>
 <% else %>
   <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
@@ -159,18 +131,18 @@
 
     <%= render 'spree/admin/shared/sidebar/custom_nav' %>
 
+    <%= render_admin_partials(:store_nav_partials) %>
+
     <li class="nav-item border-top border-top-dashed my-1"></li>
     <%= render 'spree/admin/shared/sidebar/storefront_nav' %>
     <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
 
-    <li class="nav-item border-top border-top-dashed my-1"></li>
-    <li class="nav-item">
-      <%= active_link_to_with_icon('settings', Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
-    </li>
+    <% if can?(:manage, current_store) %>
+      <li class="nav-item border-top border-top-dashed my-1"></li>
+      <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>
+    <% end %>
     <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link' %>
-      </li>
+      <%= nav_item(Spree.t(:account_members), main_app.account_members_path(current_account), icon: 'users') %>
     <% end %>
   </ul>
 <% end %>

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

@@ -1,29 +1,22 @@
 <% if can?(:manage, Spree::Theme) %>
-  <li class="nav-item">
-    <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
-    <%= active_link_to_with_icon('building-store', Spree.t('admin.storefront'), spree.admin_themes_path, class: 'nav-link', active: storefront_active) %>
+  <% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
+  <%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>
 
-    <% if storefront_active %>
-      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:themes), spree.admin_themes_path, class: 'nav-link' %>
-        </li>
-        <% if can?(:manage, Spree::Page) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:pages), spree.admin_pages_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-        <% if can?(:manage, Spree::Post) %>
-          <li class="nav-item">
-          <%= active_link_to Spree.t(:posts), spree.admin_posts_path, class: 'nav-link', active: %w[posts post_categories].include?(controller_name) %>
-          </li>
-        <% end %>
-        <% if can?(:manage, current_store) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:settings), spree.edit_admin_storefront_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+  <% if storefront_active %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+      <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+      
+      <% if can?(:manage, Spree::Page) %>
+        <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>
+      <% end %>
+      
+      <% if can?(:manage, Spree::Post) %>
+        <%= nav_item(Spree.t(:posts), spree.admin_posts_path, active: %w[posts post_categories].include?(controller_name)) %>
+      <% end %>
+      
+      <% if can?(:manage, current_store) %>
+        <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -155,6 +155,6 @@
       </div>
     </div>
   </div>
-
-  <%= render "spree/admin/stores/form/custom", f: f %>
 </div>
+
+<%= render_admin_partials(:store_form_partials, f: f) %>

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

@@ -1,5 +1,11 @@
 <% cache variant do %>
-  <%= link_to spree.edit_admin_product_variant_path(variant.product, variant), id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>
+  <% if variant.is_master? %>
+    <% variant_url = spree.edit_admin_product_path(variant.product) %>
+  <% else %>
+    <% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
+  <% end %>
+
+  <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>
     <%= render 'spree/admin/shared/product_image', object: variant %>
     <div class="ml-3">
       <strong><%= variant.name %></strong>
@@ -10,4 +16,4 @@
       <% end %>
     </div>
   <% end %>
-<% end %>
+<% end %>

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

@@ -30,13 +30,13 @@
             <td><%= price_form.object.currency %></td>
             <td>
               <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">
-                <%= price_form.text_field :amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object) %>
+                <%= price_form.text_field :amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.amount.present? ? Spree::Money.new(price_form.object.amount, currency: price_form.object.currency, symbol: '').to_s : '' %>
                 <span><%= currency_symbol(price_form.object.currency) %></span>
               </div>
             </td>
             <td>
               <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">
-                <%= price_form.text_field :compare_at_amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object) %>
+                <%= price_form.text_field :compare_at_amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.compare_at_amount.present? ? Spree::Money.new(price_form.object.compare_at_amount, currency: price_form.object.currency, symbol: '').to_s : '' %>
                 <span><%= currency_symbol(price_form.object.currency) %></span>
               </div>
             </td>
@@ -45,4 +45,5 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>
+

data/config/locales/en.yml

@@ -251,54 +251,11 @@ en:
         stock_locations_link: To add more stock locations please go to <a href="%{link}">Stock Locations</a>
         total_inventory_html: 'Total inventory at %{stock_location} location: %{count} available'
       webhooks_subscribers:
-        addresses: Addresses
         all_events: All Events
-        assets: Assets
-        credit_cards: Credit Cards
-        customer_returns: Customer Returns
-        digital_links: Digital Links
-        digitals: Digitals
-        inventory_units: Inventory Units
-        line_items: Line Items
         new_webhooks_subscriber: New Webhooks Subscriber
         no_events: No Events
-        option_types: Option Types
-        option_values: Option Values
-        orders: Orders
-        payment_capture_events: Payment Capture Events
-        payments: Payments
-        prices: Prices
-        products: Products
-        promotions: Promotions
-        properties: Properties
-        prototypes: Prototypes
-        refunds: Refunds
-        reimbursements: Reimbursements
-        return_authorizations: Return Authorizations
-        return_items: Return Items
-        roles: Roles
         select_events: Select events
-        shipment_transfer:
-          wrong_destination: Selected location is not a valid destination
-        shipments: Shipments
-        shipping_categories: Shipping Categories
-        shipping_methods: Shipping Methods
-        shipping_rates: Shipping Rates
-        stock_items: Stock Items
-        stock_locations: Stock Locations
-        stock_movements: Stock Movements
-        stock_transfers: Stock Transfers
-        store_credits: Store Credits
-        stores: Stores
         subscribe_to_all_events: Subscribe to all events
         subscriptions: Subscriptions
-        tax_rates: Tax Rates
-        taxonomies: Taxonomies
-        taxons: Taxons
         time_of_last_event: Time of Last Event
-        variants: Variants
         webhooks_events: Webhooks Events
-        webhooks_subscribers: Webhooks Subscribers
-        wished_items: Wished Items
-        wishlists: Wishlists
-        zones: Zones

data/lib/spree/admin/engine.rb

@@ -3,6 +3,33 @@ require_relative 'runtime_configuration'
 module Spree
   module Admin
     class Engine < ::Rails::Engine
+      Environment = Struct.new(
+        :head_partials,
+        :body_start_partials,
+        :body_end_partials,
+        :dashboard_analytics_partials,
+        :dashboard_sidebar_partials,
+        :product_dropdown_partials,
+        :product_form_partials,
+        :product_form_sidebar_partials,
+        :products_filters_partials,
+        :order_page_header_partials,
+        :order_page_body_partials,
+        :order_page_summary_partials,
+        :order_page_sidebar_partials,
+        :order_page_dropdown_partials,
+        :orders_filters_partials,
+        :store_form_partials,
+        :store_nav_partials,
+        :store_settings_nav_partials,
+        :store_orders_nav_partials,
+        :store_products_nav_partials
+      )
+
+      # accessible via Rails.application.config.spree_admin
+      initializer 'spree.admin.environment', before: :load_config_initializers do |app|
+        app.config.spree_admin = Environment.new
+      end
 
       initializer 'spree.admin.configuration', before: :load_config_initializers do |_app|
         Spree::Admin::RuntimeConfig = Spree::Admin::RuntimeConfiguration.new
@@ -46,6 +73,29 @@ module Spree
           end
         end
       end
+
+      config.after_initialize do
+        Rails.application.config.spree_admin.head_partials = []
+        Rails.application.config.spree_admin.body_start_partials = []
+        Rails.application.config.spree_admin.body_end_partials = []
+        Rails.application.config.spree_admin.dashboard_analytics_partials = []
+        Rails.application.config.spree_admin.dashboard_sidebar_partials = []
+        Rails.application.config.spree_admin.product_form_partials = []
+        Rails.application.config.spree_admin.product_form_sidebar_partials = []
+        Rails.application.config.spree_admin.product_dropdown_partials = []
+        Rails.application.config.spree_admin.products_filters_partials = []
+        Rails.application.config.spree_admin.order_page_header_partials = []
+        Rails.application.config.spree_admin.order_page_body_partials = []
+        Rails.application.config.spree_admin.order_page_sidebar_partials = []
+        Rails.application.config.spree_admin.order_page_summary_partials = []
+        Rails.application.config.spree_admin.order_page_dropdown_partials = []
+        Rails.application.config.spree_admin.orders_filters_partials = []
+        Rails.application.config.spree_admin.store_form_partials = []
+        Rails.application.config.spree_admin.store_nav_partials = []
+        Rails.application.config.spree_admin.store_settings_nav_partials = []
+        Rails.application.config.spree_admin.store_orders_nav_partials = []
+        Rails.application.config.spree_admin.store_products_nav_partials = []
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-03 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.0.0.rc1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -498,6 +498,7 @@ files:
 - app/views/spree/admin/dashboard/_analytics.html.erb
 - app/views/spree/admin/dashboard/_setup_progress.html.erb
 - app/views/spree/admin/dashboard/_setup_tasks.html.erb
+- app/views/spree/admin/dashboard/_sidebar.html.erb
 - app/views/spree/admin/dashboard/_store_preview.html.erb
 - app/views/spree/admin/dashboard/_top_products.html.erb
 - app/views/spree/admin/dashboard/_updater.html.erb
@@ -541,7 +542,6 @@ files:
 - app/views/spree/admin/orders/_customer.html.erb
 - app/views/spree/admin/orders/_customer_returns.html.erb
 - app/views/spree/admin/orders/_customer_summary.html.erb
-- app/views/spree/admin/orders/_extra_filters.html.erb
 - app/views/spree/admin/orders/_filters.html.erb
 - app/views/spree/admin/orders/_header.html.erb
 - app/views/spree/admin/orders/_header_custom.html.erb
@@ -740,9 +740,6 @@ files:
 - app/views/spree/admin/products/edit.html.erb
 - app/views/spree/admin/products/form/_base.html.erb
 - app/views/spree/admin/products/form/_categorization.html.erb
-- app/views/spree/admin/products/form/_extra_filters.html.erb
-- app/views/spree/admin/products/form/_extra_form.html.erb
-- app/views/spree/admin/products/form/_extra_form_sidebar.erb
 - app/views/spree/admin/products/form/_inventory.html.erb
 - app/views/spree/admin/products/form/_properties.html.erb
 - app/views/spree/admin/products/form/_shipping.html.erb
@@ -928,7 +925,6 @@ files:
 - app/views/spree/admin/stores/form/_basic.html.erb
 - app/views/spree/admin/stores/form/_buttons.html.erb
 - app/views/spree/admin/stores/form/_checkout.html.erb
-- app/views/spree/admin/stores/form/_custom.html.erb
 - app/views/spree/admin/stores/form/_emails.html.erb
 - app/views/spree/admin/stores/form/_policies.html.erb
 - app/views/spree/admin/stores/new.html.erb
@@ -1059,9 +1055,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.0.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.0
 post_install_message:
 rdoc_options: []
 require_paths: