spree_admin 5.2.6 → 5.3.0.rc1

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

@@ -9,24 +9,24 @@
         <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.platform') %></a>
       </li>
     </ul>
-    <div data-tabs-target="panel" class="animate__animated">
+    <div data-tabs-target="panel" class="animate-fade-in">
       <% if storefront_serializer_exists?(@object) %>
-        <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :storefront) %></code></pre>
+        <%= code_block serialize_to_json(@object, api_type: :storefront), style: 'height: calc(100dvh - 11rem);' %>
       <% else %>
-        <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
-          <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>
+        <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">
+          <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %>
           <p>
             <%= Spree.t('admin.json_preview.no_api_response') %>
           </p>
         </div>
       <% end %>
     </div>
-    <div data-tabs-target="panel" class="animate__animated" hidden>
+    <div data-tabs-target="panel" class="animate-fade-in" hidden>
       <% if platform_serializer_exists?(@object) %>
-        <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :platform) %></code></pre>
+        <%= code_block serialize_to_json(@object, api_type: :platform), style: 'height: calc(100dvh - 11rem);' %>
       <% else %>
-        <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
-          <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>
+        <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">
+          <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %>
           <p>
             <%= Spree.t('admin.json_preview.no_api_response') %>
           </p>

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

@@ -1,5 +1,5 @@
 <%= turbo_frame_tag dom_id(@line_item) do %>
-  <div class="order-line-items__form d-flex align-items-center">
+  <div class="order-line-items__form flex items-center">
     <div class="w-35">
       <%= render 'spree/admin/variants/variant', variant: @line_item.variant %>
     </div>
@@ -7,10 +7,10 @@
       <%= @line_item.single_money.to_html %>
     </div>
 
-    <div class="w-40 border rounded p-2 bg-white shadow-xs mx-auto">
-      <%= form_with model: @line_item, url: spree.admin_order_line_item_path(@order, @line_item), class: "d-flex align-items-center gap-2 justify-content-between" do |f| %>
+    <div class="w-40 border rounded-lg  p-2 bg-white shadow-xs mx-auto">
+      <%= form_with model: @line_item, url: spree.admin_order_line_item_path(@order, @line_item), class: "flex items-center gap-2 justify-between" do |f| %>
         <%= f.label :quantity, Spree.t('quantity'), class: 'm-0' %>
-        <%= f.number_field :quantity, class: 'form-control form-control-sm', required: true, max: @line_item.variant.should_track_inventory? && !@line_item.variant.backorderable? ? @line_item.variant.total_on_hand + @line_item.quantity : nil, min: 1, autofocus: true %>
+        <%= f.number_field :quantity, class: 'form-input form-input-sm', required: true, max: @line_item.variant.should_track_inventory? && !@line_item.variant.backorderable? ? @line_item.variant.total_on_hand + @line_item.quantity : nil, min: 1, autofocus: true %>
 
         <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
         <%= link_to Spree.t('actions.discard'),  spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>

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

@@ -5,22 +5,22 @@
       <%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>
         <%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %>
         <%= form.hidden_field :param_name, value: 'line_item' %>
-        <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
+        <%= form.search_field :q, value: params[:q], class: 'form-input', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
         <%= form.hidden_field :currency, value: @order.currency %>
       <% end %>
     </div>
     <%= form_with model: @line_item, url: spree.admin_order_line_items_path(@order), data: {turbo_frame: '_top'} do |form| %>
       <div class="dialog-body">
         <div id="variants_search_results" class="search-results">
-          <p class="text-muted text-center py-5">
+          <p class="text-gray-600 text-center py-12">
             <%= Spree.t(:start_typing_to_search_for_variants) %>
           </p>
         </div>
       </div>
       <div class="dialog-footer">
-        <div class="d-flex gap-2 m-0 align-items-center mr-auto">
+        <div class="flex gap-2 m-0 items-center mr-auto">
           <%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
-          <%= form.number_field :quantity, class: "form-control", min: 1 %>
+          <%= form.number_field :quantity, class: "form-input", min: 1 %>
         </div>
         <%= turbo_save_button_tag Spree.t(:add_selected_variant), disabled: true, data: { search_picker_target: :submit } %>
       </div>

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

@@ -1,12 +1,12 @@
 <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters auto-submit"} do |f| %>
-  <div class="d-flex">
+  <div class="flex">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, label: Spree.t(:title) %>
 
     <%= select_tag 'q[resource_type_eq]',
           options_for_select(metafield_definition_resource_types, params.dig(:q, :resource_type_eq)),
           { 
             include_blank: Spree.t(:all),
-            class: 'custom-select w-20',
+            class: 'form-select w-20',
             data: { 
               filters_target: :input,
               action: 'auto-submit#submit'

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

@@ -1,14 +1,14 @@
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-body">
     <div class="form-group">
       <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
     </div>
 
-    <div class="row">
-      <div class="form-group col-lg-4">
+    <div class="grid grid-cols-12 gap-6">
+      <div class="form-group col-span-12 lg:col-span-4">
         <%= f.spree_text_field :namespace, required: true, placeholder: 'eg. custom' %>
       </div>
-      <div class="form-group col-lg-8">
+      <div class="form-group col-span-12 lg:col-span-8">
         <%= f.spree_text_field :key, required: true, placeholder: 'eg. id' %>
       </div>
     </div>
@@ -28,12 +28,12 @@
 
       <div class="form-group">
         <%= f.label :resource_type, Spree.t(:resource) %>
-        <p class="font-weight-bold"><%= f.object.resource_type.demodulize.titleize %></p>
+        <p class="font-bold"><%= f.object.resource_type.demodulize.titleize %></p>
       </div>
 
       <div class="form-group">
         <%= f.label :metafield_type, Spree.t(:type) %>
-        <p class="font-weight-bold"><%= f.object.metafield_type.demodulize.titleize %></p>
+        <p class="font-bold"><%= f.object.metafield_type.demodulize.titleize %></p>
       </div>
     <% end %>
 

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

@@ -5,7 +5,7 @@
   <td><span class="badge badge-light"><%= metafield_definition.metafield_type.demodulize.titleize %></span></td>
   <td>
     <%= form_with model: metafield_definition, url: admin_metafield_definition_path(metafield_definition), method: :patch, data: { controller: 'auto-submit' } do |f| %>
-      <%= f.select :display_on, display_on_options(Spree::MetafieldDefinition), {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>
+      <%= f.select :display_on, display_on_options(Spree::MetafieldDefinition), {}, { class: 'form-select form-select-sm', data: { action: 'auto-submit#submit' } } %>
     <% end %>
   </td>
   <td>
@@ -13,7 +13,7 @@
       <%= metafield_definition.metafields.count %>
       <%= Spree.t(metafield_definition.resource_type.demodulize.pluralize.to_sym) %>
     <% else %>
-      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+      <span class="text-gray-600"><%= Spree.t(:not_available) %></span>
     <% end %>
   </td>
   <td class="text-right">

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

@@ -6,4 +6,4 @@
   <%= link_to_with_icon 'plus', Spree.t(:new_metafield_definition), new_object_url, class: 'btn btn-primary' %>
 <% end %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :metafield_definitions %>

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

@@ -9,15 +9,15 @@
           <%= metafield_form.hidden_field :type %>
           <% metafield_definition = metafield_form.object.metafield_definition %>
           <div class="form-group">
-            <div class="d-flex justify-content-between">
+            <div class="flex justify-between">
               <%= metafield_form.label :value do %>
                 <strong><%= metafield_definition.name %></strong>
-                <small class="text-muted mt-2"><code><%= metafield_definition.full_key %></code></small>
+                <small class="text-gray-600 mt-2"><code><%= metafield_definition.full_key %></code></small>
               <% end %>
 
               <% if metafield_definition.display_on == 'back_end' %>
                 <span data-controller="tooltip">
-                  <%= icon('eye-off', class: 'text-muted') %>
+                  <%= icon('eye-off', class: 'text-gray-600') %>
                   <%= tooltip(Spree.t("admin.display_on_options.#{metafield_definition.display_on}")) %>
                 </span>
               <% end %>
@@ -33,10 +33,10 @@
     <% end %>
   <% else %>
     <div class="drawer-body">
-      <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
-        <%= icon 'map-search', class: 'mb-3', style: 'font-size: 2rem;' %>
+      <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col gap-4">
+        <%= icon 'map-search', class: 'text-4xl' %>
         <p>No metafield definitions configured for <%= model_class.name.demodulize.titleize.pluralize %>.</p>
-        <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %>
+        <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %>
       </div>
     </div>
   <% end %>

data/app/views/spree/admin/metafields/types/_boolean.html.erb

@@ -1,4 +1,4 @@
-<div class="custom-control custom-checkbox">
+<div class="custom-control form-checkbox">
   <%= f.check_box :value, class: 'custom-control-input', checked: f.object.value&.to_b %>
   <%= f.label :value, Spree.t(:say_yes), class: 'custom-control-label' %>
 </div>

data/app/views/spree/admin/metafields/types/_json.html.erb

@@ -1,4 +1,4 @@
-<div data-controller="codemirror" data-codemirror-language-value="json" class="form-control h-auto overflow-hidden p-0">
+<div data-controller="codemirror" data-codemirror-language-value="json" class="form-input h-auto overflow-hidden p-0">
   <div data-codemirror-target="editor"></div>
   <%= f.text_area :value, data: { codemirror_target: 'input' }, class: 'invisible' %>
 </div>

data/app/views/spree/admin/metafields/types/_long_text.html.erb

@@ -1 +1 @@
- <%= f.text_area :value, class: 'form-control', data: { controller: 'textarea-autogrow' } %>
+ <%= f.text_area :value, class: 'form-input', data: { controller: 'textarea-autogrow' } %>

data/app/views/spree/admin/metafields/types/_number.html.erb

@@ -1 +1 @@
-<%= f.number_field :value, class: 'form-control' %>
+<%= f.number_field :value, class: 'form-input' %>

data/app/views/spree/admin/metafields/types/_short_text.html.erb

@@ -1 +1 @@
-<%= f.text_field :value, class: 'form-control' %>
+<%= f.text_field :value, class: 'form-input' %>

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

@@ -1,10 +1,10 @@
 <%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } 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: :email_cont, label: Spree.t(:email) %>
 
     <%= dropdown do %>
       <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
-        <span class="text-muted font-weight-normal mr-1">
+        <span class="text-gray-600 font-normal mr-1">
           <%= Spree.t(:show) %>
         </span>
         <%# Show current filter value %>

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

@@ -3,11 +3,11 @@
     <%= newsletter_subscriber.email %>
     <%= clipboard_component(newsletter_subscriber.email) %>
   </td>
-  <td class="w-25">
+  <td class="w-1/4">
     <% if newsletter_subscriber.user.present? %>
       <%= link_to newsletter_subscriber.user.full_name, spree.admin_user_path(newsletter_subscriber.user) %>
     <% else %>
-      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+      <span class="text-gray-600"><%= Spree.t(:not_available) %></span>
     <% end %>
   </td>
   <td class="w-10">
@@ -17,7 +17,7 @@
     <% if newsletter_subscriber.verified_at.present? %>
       <%= spree_date(newsletter_subscriber.verified_at) %>
     <% else %>
-      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+      <span class="text-gray-600"><%= Spree.t(:not_available) %></span>
     <% end %>
   </td>
   <td class="w-15">

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

@@ -6,4 +6,4 @@
   <%= link_to_export_modal %>
 <% end %>
 
-<%= render 'spree/admin/shared/index_table', new_object_url: nil, export_type: Spree::Exports::NewsletterSubscribers %>
+<%= render_table @collection, :newsletter_subscribers, export_type: Spree::Exports::NewsletterSubscribers, edit_object_url: nil %>

data/app/views/spree/admin/oauth_applications/_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_select :scopes, [['Read Only', 'admin read'], ['Read & Write', 'admin write']], { selected: @oauth_application.scopes.to_s }, { required: true } %>

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

@@ -1,11 +1,11 @@
 <tr id="<%= spree_dom_id oauth_application %>">
   <td class="w-20"><code><%= oauth_application.name %></code></td>
   <td class="w-40">
-    <div class="d-flex gap-2 align-items-center" data-controller="password-toggle">
+    <div class="flex gap-2 items-center" data-controller="password-toggle">
       <%= button_tag class: 'btn btn-light btn-sm px-1', data: { action: 'click->password-toggle#password' } do %>
         <%= icon 'eye', class: 'mr-0' %>
       <% end %>
-      <%= password_field_tag :password, oauth_application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
+      <%= password_field_tag :password, oauth_application.uid, class: 'form-input-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
     </div>
   </td>
   <td class="w-15">
@@ -25,7 +25,7 @@
     <% if oauth_application.last_used_at %>
       <%= spree_time(oauth_application.last_used_at) %>
     <% else %>
-      <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
+      <span class="text-gray-600"><%= Spree.t('admin.oauth_applications.never') %></span>
     <% end %>
   </td>
   <td class="actions w-10">

data/app/views/spree/admin/oauth_applications/create.turbo_stream.erb

@@ -1,28 +1,28 @@
 <%= turbo_stream.replace "new_oauth_application" do %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
+  <div class="grid grid-cols-12 gap-6">
+    <div class="col-span-12 lg:col-span-6 lg:col-start-4">
       <div class="card">
         <div class="card-body">
           <div class="form-group">
             <%= label_tag :client_id, Spree.t('admin.oauth_applications.client_id') %>
-            <div class="d-flex gap-2 align-items-center">
-              <%= text_field_tag :client_id, @object.uid, class: 'form-control-plaintext bg-light rounded', readonly: true %>
+            <div class="flex gap-2 items-center">
+              <%= text_field_tag :client_id, @object.uid, class: 'form-input-plaintext bg-gray-25 rounded', readonly: true %>
               <%= clipboard_component(@object.uid) %>
             </div>
           </div>
 
           <div class="form-group">
             <%= label_tag :client_secret, Spree.t('admin.oauth_applications.client_secret') %>
-            <div class="d-flex gap-2 align-items-center">
-              <%= text_field_tag :client_secret, @object.plaintext_secret, class: 'form-control-plaintext bg-light rounded', readonly: true %>
+            <div class="flex gap-2 items-center">
+              <%= text_field_tag :client_secret, @object.plaintext_secret, class: 'form-input-plaintext bg-gray-25 rounded', readonly: true %>
               <%= clipboard_component(@object.plaintext_secret) %>
             </div>
-            <div class="alert alert-warning mt-3">
+            <div class="alert alert-warning mt-6">
               This is your application's secret token, copy it now and keep it safe. It won't be shown again.
             </div>
           </div>
         </div>
-        <div class="card-footer border-top">
+        <div class="card-footer border-t">
           <%= link_to 'Back to list', spree.admin_oauth_applications_url, class: 'btn btn-light' %>
         </div>
       </div>

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

@@ -10,8 +10,8 @@
 <%= content_for :page_alerts do %>
   <div class="alert alert-info">
     <p>
-      Here you can manage API keys to access the <%= link_to 'Platform API', 'https://spreecommerce.org/docs/api-reference/platform/authentication', target: '_blank' %>.
-      For headless storefronts you don't need an API key, please use the <%= link_to 'Storefront API', 'https://spreecommerce.org/docs/api-reference/storefront/authentication', target: '_blank' %>.
+      Here you can manage API keys to access the <%= external_link_to 'Platform API', 'https://spreecommerce.org/docs/api-reference/platform/authentication' %>.
+      For headless storefronts you don't need an API key, please use the <%= external_link_to 'Storefront API', 'https://spreecommerce.org/docs/api-reference/storefront/authentication' %>.
     </p>
   </div>
 <% end %>

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

@@ -1,19 +1,19 @@
-<div class="card mb-4">
+<div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title"><%= Spree.t(:general_information) %></h5>
     </div>
     <div class="card-body" data-controller="slug-form">
-      <div class="row mb-3">
-        <div class="col-md-6">
+      <div class="grid grid-cols-12 gap-6 mb-6">
+        <div class="col-span-12 md:col-span-6">
           <%= f.spree_text_field :presentation, required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' }, help_text: "This is used to display the option type on the storefront." %>
         </div>
 
-        <div class="col-md-6">
+        <div class="col-span-12 md:col-span-6">
           <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: raw("This is used internally to identify the option type. <strong>It must be unique.</strong>") %>
         </div>
       </div>
-      <div class="row">
-        <div class="col-12 col-md-6">
+      <div class="grid grid-cols-12 gap-6">
+        <div class="col-span-12 md:col-span-6">
           <%= f.spree_check_box :filterable, help_text: raw(Spree.t('option_type_filterable_info')) %>
         </div>
       </div>
@@ -26,15 +26,15 @@
     <% end %>
   </template>
 
-  <div class="card mb-4">
-    <div class="card-header d-flex justify-content-between align-items-center">
+  <div class="card mb-6">
+    <div class="card-header flex justify-between items-center">
       <h5 class="card-title"><%= Spree.t(:option_values) %></h5>
     </div>
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table">
           <thead>
-            <tr class="border-bottom">
+            <tr class="border-b">
               <th scope="col"></th>
               <th scope="col"><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
               <th scope="col"><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>
@@ -52,7 +52,7 @@
 
             <tr class="hover-none">
               <td colspan="4" class="text-center p-2">
-                <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-100" id="add_option_value_button">
+                <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-full" id="add_option_value_button">
                   <%= icon('plus') %>
                   <%= Spree.t(:add_one) %>
                 </button>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -10,15 +10,15 @@
   >
   <td class="w-5 <%= f.object.id.present? ? 'move-handle text-center' : 'text-center' %>">
     <% if f.object.id.present? %>
-      <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
+      <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %>
     <% end %>
     <%= f.hidden_field :id %>
   </td>
   <td class="w-45 presentation">
-    <%= f.text_field :presentation, class: "form-control", data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
+    <%= f.text_field :presentation, class: "form-input", data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
   </td>
   <td class="w-40 name">
-    <%= f.text_field :name, class: "form-control", data: { slug_form_target: :url } %>
+    <%= f.text_field :name, class: "form-input", data: { slug_form_target: :url } %>
   </td>
   <td class="w-10 actions">
     <button type="button" class="btn btn-danger btn-sm remove_option_value_button" data-action="nested-form#remove">

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

@@ -1,9 +1,9 @@
 <tr id="<%= spree_dom_id option_type %>" data-controller="row-link" data-sortable-update-url="<%= spree.admin_option_type_path(option_type) %>">
   <td class="move-handle text-center w-5">
-    <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
+    <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %>
   </td>
   <td class="w-20 cursor-pointer" data-action="click->row-link#openLink"><code><%= option_type.name %></code></td>
-  <td class="w-35 cursor-pointer font-weight-bold" data-action="click->row-link#openLink"><%= option_type.presentation %></td>
+  <td class="w-35 cursor-pointer font-bold" data-action="click->row-link#openLink"><%= option_type.presentation %></td>
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
     <%= active_badge(option_type.filterable) %>
   </td>

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

@@ -1,12 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_option_types_url %>
-  <%= @option_type.presentation %>
-<% end %>
-
-
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
-
-<%= form_for [:admin, @option_type], data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } do |f| %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource', data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } %>

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

@@ -16,7 +16,7 @@
 
 <%= render_admin_partials(:option_types_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table', sortable: true %>
+<%= render_table @collection, :option_types, sortable: true %>
 
 <p class="documentation-link-container">
   <%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>

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

@@ -1,11 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_option_types_path %>
-  <%= Spree.t(:new_option_type) %>
-<% end %>
-
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
-
-<%= form_for [:admin, @option_type], data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } do |f| %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/new_resource_links' %>
-<% end %>
+<%= render 'spree/admin/shared/new_resource', data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } %>

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

@@ -0,0 +1,72 @@
+<tr id="<%= dom_id(adjustment) %>">
+  <td>
+    <div class="font-medium"><%= adjustment.label %></div>
+  </td>
+  <td>
+    <% if adjustment.source_type.blank? %>
+      <span class="badge badge-light"><%= Spree.t(:manual) %></span>
+    <% else %>
+      <span class="badge badge-info"><%= adjustment.source_type.demodulize.underscore.humanize %></span>
+    <% end %>
+  </td>
+  <td class="text-sm text-gray-600">
+    <% if adjustment.adjustable.is_a?(Spree::LineItem) %>
+      <%= icon('shopping-cart') %>
+      <%= truncate(adjustment.adjustable.name, length: 30) %>
+    <% elsif adjustment.adjustable.is_a?(Spree::Shipment) %>
+      <%= icon('truck') %>
+      <%= Spree.t(:shipment) %> #<%= adjustment.adjustable.number %>
+    <% elsif adjustment.adjustable.is_a?(Spree::Order) %>
+      <%= icon('receipt') %>
+      <%= Spree.t(:order) %>
+    <% end %>
+  </td>
+  <td>
+    <% if adjustment.closed? %>
+      <span class="badge badge-light" data-controller="tooltip">
+        <%= tooltip(Spree.t(:adjustment_closed_description)) %>
+        <%= icon('lock') %> <%= Spree.t(:closed) %>
+      </span>
+    <% else %>
+      <span class="badge badge-success" data-controller="tooltip">
+        <%= tooltip(Spree.t(:adjustment_open_description)) %> <%= icon('lock-open') %> <%= Spree.t(:open) %>
+      </span>
+    <% end %>
+  </td>
+  <td>
+    <%= adjustment.display_amount.to_html %>
+  </td>
+  <td class="text-right">
+    <% if can?(:update, adjustment) || can?(:destroy, adjustment) %>
+      <%= dropdown do %>
+        <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
+          <%= icon "dots-vertical", class: "mr-0" %>
+        <% end %>
+        <%= dropdown_menu do %>
+          <% if can?(:update, adjustment) %>
+            <% if adjustment.source_type.blank? %>
+              <%= link_to_with_icon "edit",
+                Spree.t(:edit),
+                spree.edit_admin_order_adjustment_path(@order, adjustment),
+                data: { turbo_frame: 'dialog', action: 'dialog#open' },
+                class: "dropdown-item" %>
+            <% end %>
+            <%= link_to_with_icon adjustment.closed? ? "lock-open" : "lock",
+              adjustment.closed? ? Spree.t('actions.open') : Spree.t('actions.close'),
+              spree.toggle_state_admin_order_adjustment_path(@order, adjustment),
+              data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) },
+              class: "dropdown-item" %>
+          <% end %>
+          <% if can?(:destroy, adjustment) && adjustment.source_type.blank? %>
+            <div class="dropdown-divider"></div>
+            <%= link_to_with_icon "trash",
+              Spree.t(:delete),
+              spree.admin_order_adjustment_path(@order, adjustment),
+              data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) },
+              class: 'dropdown-item text-red-600 hover:bg-red-100' %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,41 @@
+<% adjustments = @order.all_adjustments.where.not(source_type: ['Spree::PromotionAction', 'Spree::TaxRate']).or(@order.all_adjustments.where(source_type: nil)).includes(:source, :adjustable).order(created_at: :desc) %>
+
+<div class="card mb-6" id="order_adjustments">
+  <div class="card-header flex justify-between items-center border-0">
+    <h5 class="card-title flex items-center">
+      <%= icon('adjustments', class: 'mr-2') %>
+      <%= Spree.t(:adjustments) %>
+      <% if adjustments.any? %>
+        <span class="badge badge-info ml-2"><%= adjustments.count %></span>
+      <% end %>
+    </h5>
+    <% if can?(:create, Spree::Adjustment.new(order: @order)) %>
+      <%= link_to_with_icon 'plus', Spree.t(:new_adjustment), spree.new_admin_order_adjustment_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %>
+    <% end %>
+  </div>
+  <div class="card-body p-0 border-t">
+    <% if adjustments.any? %>
+      <div class="table-responsive">
+        <table class="table">
+          <thead>
+            <tr>
+              <th class="rounded-none"><%= Spree.t(:label) %></th>
+              <th class="rounded-none"><%= Spree.t(:type) %></th>
+              <th class="rounded-none"><%= Spree.t(:applied_to) %></th>
+              <th class="rounded-none"><%= Spree.t(:state) %></th>
+              <th class="rounded-none"><%= Spree.t(:amount) %></th>
+              <th class="rounded-none"></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render collection: adjustments, partial: 'spree/admin/orders/adjustment', as: :adjustment %>
+          </tbody>
+        </table>
+      </div>
+    <% else %>
+      <p class="text-center text-gray-600 p-8">
+        <%= Spree.t(:no_adjustments) %>
+      </p>
+    <% end %>
+  </div>
+</div>