spree_admin 5.2.6 → 5.3.0.rc1

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-body">
     <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
     <%= f.spree_check_box :active %>

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

@@ -3,12 +3,12 @@
   <%= 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 %>">
+  <ul class="nav-submenu <% unless customers_active %>hidden<% 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">
+  <ul class="nav-submenu-dropdown hidden dropdown-container">
     <%= nav_item(Spree.t(:customers), spree.admin_users_path) %>
     <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
   </ul>

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

@@ -1,9 +1,9 @@
 <% if can?(:manage, current_store) && !enterprise_edition? %>
   <% unless session[:spree_enterprise_edition_notice_dismissed] %>
-    <section class="d-none d-lg-block">
+    <section class="hidden lg:block">
       <div id="enterprise-edition-notice">
         <%= 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>
+        <p>Thank you for using Spree Community Edition! Please consider upgrading to Enterprise Edition for access to all features and support.</p>
 
         <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-secondary btn-sm shadow-xs' %>
       </div>

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

@@ -26,7 +26,7 @@
 
   <%# 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">
+    <ul class="nav-submenu-dropdown hidden dropdown-container">
       <%= nav_item(Spree.t(:orders), spree.admin_orders_path) %>
 
       <% if ready_to_ship_orders_count&.positive? %>

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

@@ -3,7 +3,7 @@
   <%= 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 %>">
+  <ul class="nav-submenu <% unless products_active %>hidden<% 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)) %>
     <% end %>
@@ -21,7 +21,7 @@
   </ul>
 
   <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
-  <ul class="nav-submenu-dropdown d-none dropdown-container">
+  <ul class="nav-submenu-dropdown hidden dropdown-container">
     <%= nav_item(Spree.t(:products), spree.admin_products_path) %>
 
     <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>

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

@@ -3,12 +3,12 @@
   <%= 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 %>">
+  <ul class="nav-submenu <% unless discounts_active %>hidden<% 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">
+  <ul class="nav-submenu-dropdown hidden dropdown-container">
     <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %>
     <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %>
   </ul>

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

@@ -15,7 +15,7 @@
 
   <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
   <% if can?(:manage, Spree::ReturnAuthorization) %>
-    <ul class="nav-submenu-dropdown d-none dropdown-container">
+    <ul class="nav-submenu-dropdown hidden dropdown-container">
       <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path) %>
 
       <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>

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

@@ -2,11 +2,11 @@
   <%= dropdown do %>
     <%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %>
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
-      <span class="store-name d-none d-lg-block">
+      <span class="store-name hidden lg:block">
         <%= truncate(current_store.name, length: 10) %>
       </span>
     <% end %>
-    <%= dropdown_menu class: 'ml-2' do %>
+    <%= dropdown_menu do %>
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>
@@ -14,7 +14,7 @@
       <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'dropdown-item', data: { turbo_prefetch: false } do %>
         <%= icon 'tools' %>
         <%= Spree.t('admin.edit_theme') %>
-      <% end if current_store.default_theme && can?(:manage, Spree::Theme) %>
+      <% end if current_store.respond_to?(:default_theme) && current_store.default_theme && can?(:manage, Spree::Theme) %>
 
       <% if available_stores.count > 1 %>
         <div class="dropdown-divider"></div>
@@ -26,9 +26,9 @@
             <% if store.id == current_store.id %>
               <div class="store-chooser-item active">
                 <%= store_admin_icon(store, height: 32, width: 32) %>
-                <span class="d-flex flex-column mr-2">
+                <span class="flex flex-col mr-2">
                   <%= store.name %>
-                  <small class="text-muted">
+                  <small class="text-gray-600">
                     <%= store.url_or_custom_domain %>
                   </small>
                 </span>
@@ -37,9 +37,9 @@
             <% else %>
               <%= link_to spree.admin_dashboard_url(host: store.url), class: 'store-chooser-item' do %>
                 <%= store_admin_icon(store, height: 32, width: 32) %>
-                <span class="d-flex flex-column">
+                <span class="flex flex-col">
                   <%= store.name %>
-                  <small class="text-muted">
+                  <small class="text-gray-600">
                     <%= store.url_or_custom_domain %>
                   </small>
                 </span>

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

@@ -1,7 +1,7 @@
 <% if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation %>
   <%# Legacy navigation system %>
   <% if settings_area? %>
-  <ul class="nav flex-column">
+  <ul class="nav flex-col">
     <% 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') %>
     <% end %>
@@ -52,11 +52,11 @@
         <%= 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 %>
+          <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full' do %>
             <%= icon 'history' %>
             <%= Spree.t('admin.audit_log') %>
 
-            <span class="badge ml-auto rounded-pill" data-controller="tooltip">
+            <span class="badge ml-auto rounded-full" data-controller="tooltip">
               Enterprise
               <%= tooltip("This feature is part of the Enterprise Edition.") %>
             </span>
@@ -74,7 +74,7 @@
     <%= render_admin_partials(:settings_nav_partials) %>
   </ul>
 <% else %>
-  <ul class="nav flex-column">
+  <ul class="nav flex-col">
     <% if can?(:manage, current_store) %>
       <% unless current_store.setup_completed? %>
         <%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>
@@ -106,10 +106,10 @@
     <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
   </ul>
 
-  <div class="mt-auto d-flex flex-column">
+  <div class="mt-auto flex flex-col">
     <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
 
-    <ul class="nav flex-column mb-2">
+    <ul class="nav flex-col mb-2">
       <% if can?(:manage, current_store) %>
         <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>
         <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>
@@ -124,7 +124,7 @@
   <% else %>
     <%= render_navigation(:sidebar) %>
 
-    <div class="mt-auto d-flex flex-column">
+    <div class="mt-auto flex flex-col">
       <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
     </div>
   <% end %>

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

@@ -3,7 +3,7 @@
   <%= 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 %>">
+  <ul class="nav-submenu <% unless storefront_active %>hidden<% end %>">
     <% if can?(:manage, Spree::Theme) %>
       <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
     <% end %>
@@ -24,7 +24,7 @@
   </ul>
 
   <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
-  <ul class="nav-submenu-dropdown d-none dropdown-container">
+  <ul class="nav-submenu-dropdown hidden dropdown-container">
     <% if can?(:manage, Spree::Theme) %>
       <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
     <% end %>

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

@@ -3,11 +3,11 @@
     <%= render_admin_partials(:vendors_nav_partials) %>
   <% else %>
     <li class="nav-item">
-      <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100', data: { controller: 'tooltip' } do %>
+      <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full', data: { controller: 'tooltip' } do %>
         <%= icon 'heart-handshake' %>
         <%= Spree.t(:vendors) %>
 
-        <span class="badge ml-auto rounded-pill">
+        <span class="badge ml-auto rounded-full">
           Enterprise
         </span>
         <%= tooltip('This feature is part of the Enterprise Edition.') %>

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

@@ -2,17 +2,17 @@
 <% taxon = child_resource %>
 
 
-<div class="sortable-tree-item-row d-flex align-items-center w-100 rounded-lg hover-light border" data-controller="row-link">
+<div class="sortable-tree-item-row flex items-center w-full rounded-xl hover:bg-gray-25 border" data-controller="row-link">
   <div class="move-handle mr-3 ml-2">
-    <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
+    <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2 cursor-grab') %>
   </div>
 
-  <div class="flex-grow-1 cursor-pointer" data-action="click->row-link#openLink">
-    <div class="d-flex align-items-center overflow-hidden w-100 <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">
+  <div class="grow cursor-pointer" data-action="click->row-link#openLink">
+    <div class="flex items-center overflow-hidden w-full <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">
       <% if taxon.square_image&.attached? && taxon.square_image.variable? %>
-        <%= spree_image_tag(taxon.square_image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
+        <%= spree_image_tag(taxon.square_image, class: 'rounded-md mr-4', width: 48, height: 48, loading: :lazy) %>
       <% elsif taxon.image&.attached? && taxon.image.variable? %>
-        <%= spree_image_tag(taxon.image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
+        <%= spree_image_tag(taxon.image, class: 'rounded-md mr-4', width: 48, height: 48, loading: :lazy) %>
       <% end %>
       <div class="overflow-hidden">
         <%= taxon.name %>
@@ -20,17 +20,17 @@
     </div>
   </div>
 
-  <div class="overflow-hidden text-muted font-size-sm ml-auto">
-    <% if taxon.classifications.count > 0 %>
-      <%= pluralize(taxon.classifications.count, Spree.t(:product)) %>
+  <div class="overflow-hidden text-gray-600 text-sm ml-auto">
+    <% if taxon.classification_count.positive? %>
+      <%= pluralize(taxon.classification_count, Spree.t(:product)) %>
     <% end %>
   </div>
 
-  <div class="d-flex align-items-center px-3 ml-3 gap-2">
+  <div class="flex items-center px-3 ml-3 gap-2">
     <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>
 
-    <%= dropdown class: 'h-100' do %>
-      <%= dropdown_toggle class: 'btn-sm px-1 h-100' do %>
+    <%= dropdown class: 'h-full' do %>
+      <%= dropdown_toggle class: 'btn-sm btn-light px-1 h-full' do %>
         <%= icon('dots-vertical', class: 'mr-0') %>
       <% end %>
       <%= dropdown_menu do %>
@@ -38,7 +38,7 @@
           <%= 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>
         <% end %>
-        <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item btn-danger') if can?(:destroy, taxon) %>
+        <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item text-red-600 hover:bg-red-100') if can?(:destroy, taxon) %>
       <% end %>
     <% end %>
   </div>

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

@@ -1,27 +1,27 @@
 <%= turbo_frame_tag dom_id(@shipment, :shipping_method) do %>
-  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 d-flex justify-content-between align-items-center" do |f| %>
+  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full flex justify-between items-center" do |f| %>
     <div>
       <%= f.select :selected_shipping_rate_id, options_for_select(@shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, @shipment.selected_shipping_rate_id),
-        {},  class: 'custom-select', autofocus: true %>
+        {},  class: 'form-select', autofocus: true %>
     </div>
-    <div class="d-flex h-100 align-items-center">
+    <div class="flex h-full items-center gap-2">
       <% if can? :update, @shipment %>
-        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
-        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light" %>
       <% end %>
     </div>
   <% end %>
 <% end %>
 <%= turbo_frame_tag dom_id(@shipment, :tracking) do %>
-  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 py-1 d-flex justify-content-between align-items-center" do |f| %>
-    <div class="form-inline">
-      <%= f.label :tracking, Spree.t(:tracking_number) %>
-      <%= f.text_field :tracking, class: 'form-control ml-3', required: true, autofocus: true %>
+  <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full py-1 flex justify-between items-center" do |f| %>
+    <div class="flex items-center text-nowrap gap-x-3 items-center grow mr-3">
+      <%= f.label :tracking, Spree.t(:tracking_number), class: 'mb-0' %>
+      <%= f.text_field :tracking, class: 'form-input', required: true, autofocus: true %>
     </div>
-    <div class="d-flex h-100 align-items-center">
+    <div class="flex h-full items-center gap-2">
       <% if can? :update, @shipment %>
-        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>
-        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+        <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary' %>
+        <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light" %>
       <% end %>
     </div>
   <% end %>

data/app/views/spree/admin/shipments/split.html.erb

@@ -1,12 +1,12 @@
-<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>
+<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-b py-2 px-4 shipment-line-items__row" do %>
   <%= form_with url: transfer_admin_order_shipment_path(@order, @shipment), class: "shipment-line-items__form" do |f| %>
     <%= hidden_field_tag :variant_id, @variant.id %>
-    <div class="d-flex flex-row gap-2 align-items-center w-full form-group mb-0">
-      <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-muted font-size-sm font-weight-bold' %>
-      <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "flex-grow-1" %>
+    <div class="flex flex-row gap-2 items-center w-full form-group mb-0">
+      <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-gray-600 text-sm font-bold' %>
+      <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "grow" %>
     </div>
-    <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-control", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>
-    <span class="d-flex justify-content-end align-items-center gap-2 w-100"  style="grid-column: quantity/-1">
+    <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-input", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>
+    <span class="flex justify-end items-center gap-2 w-full"  style="grid-column: quantity/-1">
       <% if can?(:split, @shipment) %>
         <%= turbo_save_button_tag Spree.t(:move), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
       <% end %>

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

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-body">
     <%= f.spree_text_field :name, autofocus: f.object.new_record?, required: true %>
   </div>

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

@@ -1,7 +1,7 @@
 <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
   <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
   <td class="actions">
-    <span class="d-flex justify-content-end">
+    <span class="flex justify-end">
       <%= link_to_edit(shipping_category, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, shipping_category %>
     </span>
   </td>

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

@@ -1,12 +1,12 @@
-<div class="row">
-  <div class="col-lg-6">
+<div class="grid grid-cols-12 gap-6">
+  <div class="col-span-12 lg:col-span-6">
     <%= render 'spree/admin/shipping_methods/form/display', f: f %>
     <%= render 'spree/admin/shipping_methods/form/tracking_url', f: f %>
     <%= render 'spree/admin/shipping_methods/form/zones', f: f %>
     <%= render 'spree/admin/shipping_methods/form/shipping_categories', f: f %>
     <%= render 'spree/admin/shipping_methods/form/tax_category', f: f %>
   </div>
-  <div class="col-lg-6">
+  <div class="col-span-12 lg:col-span-6">
     <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, calculators: @calculators } %>
     <%= render 'spree/admin/shipping_methods/form/estimated_transit_business_days', f: f %>
     <%= render_admin_partials(:shipping_method_form_partials, f: f, shipping_method: @shipping_method) %>

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

@@ -7,7 +7,7 @@
       </span>
     <% end %>
   </td>
-  <td data-action="click->row-link#openLink" class="w-25 text-wrap">
+  <td data-action="click->row-link#openLink" class="w-1/4 whitespace-normal">
     <% shipping_method.zones.each do |zone| %>
       <% if can?(:manage, zone) %>
         <%= link_to zone.name, spree.edit_admin_zone_path(zone), class: 'badge badge-light border mb-2' %>
@@ -24,7 +24,7 @@
   </td>
   <td class="w-10">
     <%= form_with model: shipping_method, url: spree.admin_shipping_method_path(shipping_method), method: :patch, data: { controller: 'auto-submit' } do |f| %>
-      <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>
+      <%= f.select :display_on, display_on_options, {}, { class: 'form-select form-select-sm', data: { action: 'auto-submit#submit' } } %>
     <% end %>
   </td>
   <td class="actions w-10">

data/app/views/spree/admin/shipping_methods/form/_display.html.erb

@@ -1,47 +1,10 @@
-<div class="card mb-4">
-  <div class="card-body">
-    <div class="row">
-      <div class="col-lg-6">
-        <div class="form-group">
-          <%= f.label :name, Spree.t(:name) %>
-          <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-          <%= f.error_message_on :name %>
-        </div>
-
-        <p class="form-text small mt-2">
-          This will be displayed to customers.
-        </p>
-      </div>
-
-      <div class="col-lg-6">
-        <div class="form-group">
-          <%= f.label :display_on %>
-          <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select' } %>
-          <%= f.error_message_on :display_on %>
-        </div>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="col-lg-6">
-        <div class="form-group">
-          <%= f.label :admin_name, Spree.t(:internal_name) %>
-          <%= f.text_field :admin_name, class: 'form-control' %>
-          <%= f.error_message_on :admin_name %>
-        </div>
-
-        <p class="form-text small mt-2">
-          This will be displayed to admins.
-        </p>
-      </div>
-
-      <div class="col-lg-6">
-        <div class="form-group">
-          <%= f.label :code, Spree.t(:code) %>
-          <%= f.text_field :code, class: 'form-control' %>
-          <%= f.error_message_on :code %>
-        </div>
-      </div>
+<div class="card mb-6">
+  <div class="card-body pb-0">
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-3">
+      <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, help: 'This will be displayed to customers'  %>
+      <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display_on) }, { required: true } %>
+      <%= f.spree_text_field :admin_name, label: Spree.t(:internal_name), help: 'This will be displayed to admins' %>
+      <%= f.spree_text_field :code, label: Spree.t(:code)%>
     </div>
   </div>
 </div>

data/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title">
       <%= Spree.t(:estimated_transit_business_days) %>
@@ -9,15 +9,9 @@
       This is the estimated number of business days it will take for the package to arrive at the customer's address.
       It will be displayed on the checkout page.
     </div>
-    <div class="row">
-      <div class="col">
-        <%= f.label :estimated_transit_business_days_min, Spree.t(:min) %>
-        <%= f.number_field :estimated_transit_business_days_min, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:min), min: 1 %>
-      </div>
-      <div class="col">
-        <%= f.label :estimated_transit_business_days_max, Spree.t(:max) %>
-        <%= f.number_field :estimated_transit_business_days_max, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:max), min: 1 %>
-      </div>
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+      <%= f.spree_number_field :estimated_transit_business_days_min, size: 2, placeholder: Spree.t(:min), min: 1, label: Spree.t(:min) %>
+      <%= f.spree_number_field :estimated_transit_business_days_max, size: 2, placeholder: Spree.t(:max), min: 1, label: Spree.t(:max) %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title">
       <%= Spree.t(:shipping_categories) %>
@@ -8,7 +8,7 @@
   <div class="card-body">
     <div class="form-group">
       <% @shipping_categories.each do |category| %>
-        <div class="custom-control custom-checkbox mb-2">
+        <div class="custom-control form-checkbox mb-2">
           <%= check_box_tag('shipping_method[shipping_category_ids][]', category.id, @shipping_method.shipping_categories.include?(category), id: "shipping_method_categories_#{category.id}", class: 'custom-control-input') %>
           <%= label_tag "shipping_method_categories_#{category.id}", class: 'custom-control-label' do %>
             <%= category.name.gsub('_',  ' ') %>

data/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb

@@ -1,5 +1,5 @@
 <% if can?(:manage, Spree::TaxCategory) %>
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
         <%= Spree.t(:tax_category) %>
@@ -7,7 +7,7 @@
     </div>
 
     <div class="card-body">
-      <%= f.spree_collection_select :tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none'), label: Spree.t(:tax_category) } %>
+      <%= f.spree_collection_select :tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none'), label: Spree.t(:tax_category), autocomplete: true } %>
     </div>
   </div>
 <% end %>

data/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb

@@ -1,4 +1,4 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title">
       <%= Spree.t(:tracking_url) %>
@@ -6,7 +6,7 @@
   </div>
   <div class="card-body">
     <div class="form-group">
-      <%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
+      <%= f.url_field :tracking_url, class: 'form-input', placeholder: Spree.t(:tracking_url_placeholder) %>
       <%= f.error_message_on :tracking_url %>
     </div>
 

data/app/views/spree/admin/shipping_methods/form/_zones.html.erb

@@ -1,20 +1,20 @@
-<div class="card mb-4">
-  <div class="card-header d-flex align-items-center">
+<div class="card mb-6">
+  <div class="card-header flex items-center">
     <h5 class="card-title">
       <%= Spree.t(:zones) %>
     </h5>
 
-    <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
+    <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto') if can?(:manage, Spree::Zone) %>
   </div>
 
   <div class="card-body">
-    <div class="form-group">
+    <div class="form-group flex flex-col gap-2">
       <% @available_zones.each do |zone| %>
-        <div class="custom-control custom-checkbox mb-2">
+        <div class="custom-control form-checkbox rounded-lg hover:bg-gray-100 p-2 transition-colors duration-100 ease-linear">
           <%= check_box_tag('shipping_method[zone_ids][]', zone.id, @shipping_method.zone_ids.include?(zone.id), id: "shipping_method_zones_#{zone.id}", class: 'custom-control-input') %>
-          <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label' do %>
+          <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label flex flex-col items-start' do %>
             <span ><%= zone.name.gsub('_',  ' ') %></span>
-            <p class="text-muted small mb-0">
+            <p class="text-gray-600 small mb-0">
               <%= zone.zone_members.map {|zone_member| zone_member.zoneable.name }.join(', ') %>
             </p>
           <% end %>

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

@@ -1,19 +1,19 @@
 <%= 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">
+    <div class="flex flex-col lg:flex-row gap-2">
       <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
 
-      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+      <%= button_tag type: 'button', class: 'btn btn-light flex 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(id: 'stock-items-filters-drawer', controller_name: 'dialog') do %>
     <%= 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} %>
+      <%= f.text_field :variant_sku_cont, size: 15, class: "form-input", data: {filters_target: :input} %>
     </div>
     <div class="form-group">
       <%= f.label :stock_location_id_eq, Spree.t(:stock_location) %>
@@ -28,7 +28,7 @@
       <%= drawer_discard_button('dialog') %>
       <%= render 'spree/admin/shared/filter_submit' %>
     </div>
-  </dialog>
+  <% end %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>