spree_admin 5.2.0.rc2 → 5.2.0

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

@@ -1,7 +1,4 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:image) %>
 <% if f.object.has_preference?(:image_alt) %>
-  <div class="form-group">
-    <%= f.label :preferred_image_alt, Spree.t(:alt_text) %>
-    <%= f.text_field :preferred_image_alt, data: { action: 'auto-submit#submit' }, class: 'form-control' %>
-  </div>
+  <%= f.spree_text_field :preferred_image_alt, label: Spree.t(:alt_text), data: { action: 'auto-submit#submit' } %>
 <% end %>

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

@@ -1 +1 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:logo) %>

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

@@ -2,9 +2,8 @@
   <%= Spree.t(:returns) %> & <%= Spree.t(:refunds) %>
 <% end %>
 
+<%= render_tab_navigation(:returns_tabs) %>
+
 <% content_for(:page_tabs) do %>
-  <%= 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) %>
   <%= render_admin_partials(:returns_and_refunds_nav_partials) %>
 <% end %>

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

@@ -1,5 +1,6 @@
+<%= render_tab_navigation(:shipping_tabs) %>
+
 <%= content_for(:page_tabs) do %>
-  <%= 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) %>
   <%= render_admin_partials(:shipping_nav_partials) %>
 <% end %>
+

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

@@ -1,7 +1,33 @@
-<aside id="main-sidebar" class="overflow-y-auto">
-  <% if defined?(current_vendor) && current_vendor.present? %>
-    <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
-  <% else %>
-    <%= render 'spree/admin/shared/sidebar/store_nav' %>
-  <% end %>
-</aside>
+<%# Desktop Sidebar %>
+<aside id="main-sidebar" class="overflow-y-auto" data-sidebar-target="desktop">
+  <div class="sidebar-content">
+    <% if defined?(current_vendor) && current_vendor.present? %>
+      <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+    <% else %>
+      <%= render 'spree/admin/shared/sidebar/store_nav' %>
+    <% end %>
+  </div>
+
+  <%= render 'spree/admin/shared/user_dropdown' %>
+</aside>
+
+<%# Mobile Sidebar Overlay %>
+<div class="sidebar-mobile d-lg-none" data-sidebar-target="mobile">
+  <div class="sidebar-backdrop" data-action="click->sidebar#closeMobile"></div>
+  <div class="sidebar-panel">
+    <div class="sidebar-mobile-header">
+      <button type="button" class="btn btn-sm" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">
+        <%= icon('x') %>
+      </button>
+    </div>
+    <div class="sidebar-mobile-content">
+      <% if defined?(current_vendor) && current_vendor.present? %>
+        <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+      <% else %>
+        <%= render 'spree/admin/shared/sidebar/store_nav' %>
+      <% end %>
+    </div>
+
+    <%= render 'spree/admin/shared/user_dropdown' %>
+  </div>
+</div>

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

@@ -1,3 +1,6 @@
-<%= 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) %>
-<%= render_admin_partials(:stock_nav_partials) %>
+<%= render_tab_navigation(:stock_tabs) %>
+
+<%= content_for(:page_tabs) do %>
+  <%= render_admin_partials(:stock_nav_partials) %>
+<% end %>
+

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

@@ -1,5 +1,4 @@
+<%= render_tab_navigation(:tax_tabs) %>
 <%= content_for(:page_tabs) do %>
-  <%= 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) %>
   <%= render_admin_partials(:tax_nav_partials) %>
 <% end %>

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

@@ -1,9 +1,8 @@
 <% content_for :page_title, Spree.t(:users) %>
 
+<%= render_tab_navigation(:team_tabs) %>
+
 <%= content_for(:page_tabs) do %>
-  <%= nav_item(Spree.t(:users), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %>
-  <%= nav_item(Spree.t(:invitations), spree.admin_invitations_path) if can?(:manage, Spree::Invitation) %>
-  <%= nav_item(Spree.t(:roles), spree.admin_roles_path) if can?(:manage, Spree::Role) %>
   <%= render_admin_partials(:team_nav_partials) %>
 <% end %>
 

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

@@ -1,20 +1,28 @@
 <% if try_spree_current_user.present? %>
-  <%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>
-    <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0' do %>
-      <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
-    <% end %>
-    <%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %>
-      <div class="d-flex align-items-center p-2 bg-light rounded-lg">
-        <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
-        <span class="d-none d-lg-inline ml-lg-2">
+  <div class="user-dropdown" id="user-menu">
+    <%= dropdown do %>
+      <%= dropdown_toggle class: 'user-dropdown-button dropdown-toggle' do %>
+        <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
+        <span class="user-name d-none d-lg-block">
           <% if try_spree_current_user.name.present? %>
-            <%= try_spree_current_user.name&.full %><br />
-            <span class="small text-muted"><%= try_spree_current_user.email %></span>
+            <%= try_spree_current_user.name&.full %>
           <% else %>
-            <%= try_spree_current_user.email %><br />
+            <%= try_spree_current_user.email %>
           <% end %>
         </span>
-      </div>
+      <% end %>
+      <%= dropdown_menu class: 'ml-2', style: 'min-width: 250px;' do %>
+        <div class="d-flex align-items-center p-2 bg-light rounded-lg">
+          <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
+          <span class="d-flex flex-column ml-2">
+            <% if try_spree_current_user.name.present? %>
+              <%= try_spree_current_user.name&.full %>
+              <small class="text-muted"><%= try_spree_current_user.email %></small>
+            <% else %>
+              <%= try_spree_current_user.email %>
+            <% end %>
+          </span>
+        </div>
 
       <%= render_admin_partials(:user_dropdown_partials) %>
 
@@ -29,16 +37,18 @@
         <h6 class="dropdown-header mt-2">
           <%= Spree.t(:support) %>
         </h6>
-        <%= external_link_to Spree.t(:help_center), 'https://spreecommerce.org/docs/user', class: 'dropdown-item justify-content-between', target: '_blank' %>
-        <%= external_link_to Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item justify-content-between', target: '_blank' %>
+        <%= link_to_with_icon 'book',  Spree.t('admin.documentation'), 'https://spreecommerce.org/docs', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'brand-slack', Spree.t('admin.slack'), 'https://slack.spreecommerce.org/', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'message', Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item', target: '_blank' %>
       <% end %>
 
       <div class="dropdown-divider"></div>
 
-      <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>
-        <%= icon('logout', class: "icon icon-logout")  %>
-        <%= Spree.t(:logout) %>
-      <% end if defined?(spree_admin_logout_path) %>
+        <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>
+          <%= icon('logout', class: "icon icon-logout")  %>
+          <%= Spree.t(:logout) %>
+        <% end if defined?(spree_admin_logout_path) %>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
 <% end %>

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

@@ -2,7 +2,14 @@
   <% customers_active = %w[users newsletter_subscribers].include?(controller_name) %>
   <%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users', active: customers_active) %>
 
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <ul class="nav-submenu <% unless customers_active %>d-none<% end %>">
     <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
   </ul>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <ul class="nav-submenu-dropdown d-none dropdown-container">
+    <%= nav_item(Spree.t(:customers), spree.admin_users_path) %>
+    <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
+  </ul>
 <% end %>

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

@@ -4,9 +4,10 @@
   <% 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) %>
-  
+
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
     <ul class="nav-submenu">
       <% if ready_to_ship_orders_count&.positive? %>
@@ -22,4 +23,23 @@
       <%= render_admin_partials(:store_orders_nav_partials) %>
     </ul>
   <% end %>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <% if ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts) %>
+    <ul class="nav-submenu-dropdown d-none dropdown-container">
+      <%= nav_item(Spree.t(:orders), spree.admin_orders_path) %>
+
+      <% if ready_to_ship_orders_count&.positive? %>
+        <% 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]})) %>
+      <% end %>
+
+      <% if can?(:manage, :checkouts) %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
+      <% end %>
+
+      <%= render_admin_partials(:store_orders_nav_partials) %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -2,6 +2,7 @@
 <% if can?(:manage, Spree::Product) %>
   <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>
 
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <ul class="nav-submenu <% unless products_active %>d-none<% end %>">
     <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
       <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
@@ -18,4 +19,24 @@
 
     <%= render_admin_partials(:store_products_nav_partials) %>
   </ul>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <ul class="nav-submenu-dropdown d-none dropdown-container">
+    <%= nav_item(Spree.t(:products), spree.admin_products_path) %>
+
+    <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
+      <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
+      <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::OptionType) %>
+      <%= nav_item(Spree.t(:options), spree.admin_option_types_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::Property) && Spree::Config[:product_properties_enabled] %>
+      <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
+    <% end %>
+
+    <%= render_admin_partials(:store_products_nav_partials) %>
+  </ul>
 <% end %>

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

@@ -1,7 +1,15 @@
 <% if can?(:manage, Spree::Promotion) %>
   <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) && @user.nil? %>
   <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %>
+
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <ul class="nav-submenu <% unless discounts_active %>d-none<% end %>">
     <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %>
   </ul>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <ul class="nav-submenu-dropdown d-none dropdown-container">
+    <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %>
+    <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %>
+  </ul>
 <% end %>

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

@@ -3,6 +3,7 @@
 <% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
   <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>
 
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <% if returns_active %>
     <ul class="nav-submenu">
       <% if can?(:manage, Spree::ReturnAuthorization) %>
@@ -11,4 +12,15 @@
       <%= render_admin_partials(:returns_nav_partials) %>
     </ul>
   <% end %>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <% if can?(:manage, Spree::ReturnAuthorization) %>
+    <ul class="nav-submenu-dropdown d-none dropdown-container">
+      <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path) %>
+
+      <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
+
+      <%= render_admin_partials(:returns_nav_partials) %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -2,9 +2,11 @@
   <%= dropdown do %>
     <%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %>
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
-      <%= truncate(current_store.name, length: 10) %>
+      <span class="store-name d-none d-lg-block">
+        <%= truncate(current_store.name, length: 10) %>
+      </span>
     <% end %>
-    <%= dropdown_menu class: 'ml-2', direction: 'left' do %>
+    <%= dropdown_menu class: 'ml-2' do %>
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>

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

@@ -1,4 +1,6 @@
-<% if settings_area? %>
+<% if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation %>
+  <%# Legacy navigation system %>
+  <% if settings_area? %>
   <ul class="nav flex-column">
     <% if can?(:manage, current_store) %>
       <%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>
@@ -114,4 +116,16 @@
       <% end %>
     </ul>
   </div>
+  <% end %>
+<% else %>
+  <%# New navigation system %>
+  <% if settings_area? %>
+    <%= render_navigation(:settings) %>
+  <% else %>
+    <%= render_navigation(:sidebar) %>
+
+    <div class="mt-auto d-flex flex-column">
+      <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
+    </div>
+  <% end %>
 <% end %>

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

@@ -2,19 +2,41 @@
   <% 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) %>
 
+  <%# Submenu for expanded sidebar (only shown when active) %>
   <ul class="nav-submenu <% unless storefront_active %>d-none<% end %>">
     <% if can?(:manage, Spree::Theme) %>
       <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
     <% end %>
-    
+
     <% 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 %>
+
+    <%= render_admin_partials(:storefront_nav_partials) %>
+  </ul>
+
+  <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+  <ul class="nav-submenu-dropdown d-none dropdown-container">
+    <% if can?(:manage, Spree::Theme) %>
+      <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+    <% end %>
+
+    <% 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) %>
+    <% end %>
+
     <% if can?(:manage, current_store) %>
       <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
     <% end %>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -33,7 +33,7 @@
       <%= dropdown_toggle class: 'btn-sm px-1 h-100' do %>
         <%= icon('dots-vertical', class: 'mr-0') %>
       <% end %>
-      <%= dropdown_menu class: 'dropdown-menu-right' do %>
+      <%= dropdown_menu do %>
         <% if can?(:create, Spree::Taxon) %>
           <%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %>
           <div class="dropdown-divider"></div>

data/app/views/spree/admin/shipping_categories/_table_header.html.erb

@@ -1,4 +1,4 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"></th>
 </tr>

data/app/views/spree/admin/shipping_methods/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
   <th scope="col"><%= Spree.t(:estimated_delivery_time) %></th>
   <th scope="col"><%= Spree.t(:amount) %></th>

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

@@ -1,10 +1,16 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dialog" } do |f| %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
 
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="stock-items-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <div class="form-group">
       <%= f.label :variant_sku_cont, Spree.t(:sku) %>
       <%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>
@@ -17,8 +23,12 @@
                 data: { controller: 'autocomplete-select' }  %>
     </div>
     <%= render_admin_partials(:stock_items_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>

data/app/views/spree/admin/stock_locations/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :country, Spree.t(:country) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :country, Spree.t(:country) %></th>
   <th scope="col"><%= Spree.t(:active) %>?</th>
   <% if can?(:mark_as_default, Spree::StockLocation) %>
     <th scope="col"><%= Spree.t(:default) %>?</th>

data/app/views/spree/admin/stock_locations/_table_row.html.erb

@@ -20,7 +20,7 @@
             <%= dropdown_toggle class: 'btn-sm h-100' do %>
               <%= icon('dots-vertical', class: 'mr-0') %>
             <% end %>
-            <%= dropdown_menu class: 'dropdown-menu-right' do %>
+            <%= dropdown_menu do %>
               <%= link_to_with_icon 'check',
                 Spree.t(:mark_as_default),
                 spree.mark_as_default_admin_stock_location_path(stock_location),

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

@@ -1,9 +1,15 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="stock-transfers-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <div class="form-group">
       <%= f.label :reference_cont, Spree.t(:reference) %>
       <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>
@@ -29,10 +35,14 @@
               } %>
     </div>
     <%= render_admin_partials(:stock_transfers_filters_partials, f: f) %>
-    <div class="form-actions">
-      <%= button Spree.t(:search), "search" %>
     </div>
-  </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <div class="form-actions">
+        <%= button Spree.t(:search), "search" %>
+      </div>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>

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

@@ -15,7 +15,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
             <th scope="col"></th>
           </tr>
         </thead>

data/app/views/spree/admin/store_credits/_list.html.erb

@@ -1,4 +1,4 @@
-<% if @store_credits.any? %>
+<% if @collection.any? %>
   <div class="table-responsive">
     <table class="table">
       <thead>
@@ -11,11 +11,11 @@
         <th scope="col"><%= Spree.t(:issued_on) %></th>
       </thead>
       <tbody>
-        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @store_credits, as: :store_credit, cached: spree_base_cache_scope %>
+        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @collection, as: :store_credit, cached: spree_base_cache_scope %>
       </tbody>
     </table>
   </div>
-  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @store_credits } %>
+  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
 <% else %>
   <%= render 'spree/admin/shared/no_resource_found', model_class: Spree::StoreCredit, new_object_url: spree.new_admin_user_store_credit_path(@user) %>
 <% end %>

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

@@ -63,21 +63,9 @@
           </h5>
         </div>
         <div class="card-body">
-          <div class="form-group">
-            <%= f.label :favicon_image do %>
-              Favicon image
-              <%= help_bubble("A favicon is a small image that appears in the tab of your web browser when you visit a website. It is usually a tiny square or rectangle with a unique design or logo that represents the website") %>
-            <% end %>
-            <%= render 'active_storage/upload_form', form: f, field_name: :favicon_image, width: 120, height: 120, crop: true %>
-          </div>
+          <%= f.spree_file_field :favicon_image, width: 120, height: 120, crop: true, label: 'Favicon image', help_bubble: "A favicon is a small image that appears in the tab of your web browser when you visit a website. It is usually a tiny square or rectangle with a unique design or logo that represents the website" %>
 
-          <div class="form-group mb-0">
-            <%= f.label :social_image do %>
-              Preview image
-              <%= help_bubble("This image will be used when your store is shared on social media or in search engines.") %>
-            <% end %>
-            <%= render 'active_storage/upload_form', form: f, field_name: :social_image, width: 1200, height: 630, crop: true %>
-          </div>
+          <%= f.spree_file_field :social_image, width: 1200, height: 630, crop: true, label: 'Preview image', help_bubble: "This image will be used when your store is shared on social media or in search engines." %>
         </div>
       </div>
 

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

@@ -12,14 +12,8 @@
       <%= Spree.t(:store_name_help) %>
     </p>
     <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
-    
-    <div class="form-group mb-0">
-      <%= f.label :logo do %>
-        <%= Spree.t(:logo) %>
-        <%= help_bubble("Used in the admin dashboard") %>
-      <% end %>
-      <%= render 'active_storage/upload_form', form: f, field_name: :logo, width: 240, height: 240, crop: true %>
-    </div>
+
+    <%= f.spree_file_field :logo, width: 240, height: 240, crop: true, help_bubble: "Used in the admin dashboard" %>
   </div>
 </div>
 

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

@@ -9,10 +9,10 @@
 
   <div class="card-body">
     <%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>
-    <small class="form-text mb-3">
+    <span class="form-text mb-3">
       <%= Spree.t(:shipping_zone_help) %>
       <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
-    </small>
+    </span>
 
     <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>
 

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

@@ -11,7 +11,7 @@
         >
           <%= turbo_frame_tag spree_dom_id(link), class: 'd-flex align-items-center w-100 py-2 pl-3 pr-2' do %>
             <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block text-dark flex-fill' %>
-            <button class="btn btn-sm pr-0 handle hover-gray h-100 px-1">
+            <button class="btn btn-sm pr-0 handle shadow-none hover-gray-200 px-1">
               <%= icon 'grip-vertical', class: 'mr-0' %>
             </button>
           <% end %>