spree_admin 5.2.6 → 5.3.0.rc1

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

@@ -1,16 +1,16 @@
-<%= turbo_frame_tag dom_id(item.variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>
+<%= turbo_frame_tag dom_id(item.variant, :shipment_item), class: "border-b py-2 px-4 shipment-line-items__row" do %>
   <%= render 'spree/admin/variants/variant', variant: item.variant %>
-  <span class="d-flex align-items-center justify-content-center"><%= item.line_item.single_money.to_html %></span>
-  <span class="d-flex align-items-center justify-content-center">
+  <span class="flex items-center justify-center"><%= item.line_item.single_money.to_html %></span>
+  <span class="flex items-center justify-center">
     <% item.states.each do |state,count| %>
       <%= count %> x <%= Spree.t(state).downcase %>
     <% end %>
   </span>
-  <span class="d-flex align-items-center justify-content-center">
+  <span class="flex items-center justify-center">
     <%= line_item_shipment_price(item.line_item, item.quantity) %>
   </span>
   <% if can?(:split, shipment) %>
-    <span class="d-flex align-items-center justify-content-end">
+    <span class="flex items-center justify-end">
       <%= link_to_with_icon 'arrows-split', Spree.t(:split), spree.split_admin_order_shipment_path(@order, shipment, variant_id: item.variant), class: "btn btn-sm btn-light", no_text: true, data: { test_id: :split_item } %>
     </span>
   <% end %>

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

@@ -1,20 +1,20 @@
-<div class="card mb-4">
-  <div class="card-header d-flex align-items-center border-0">
-    <h6 class="card-title">
+<div class="card mb-6">
+  <div class="card-header flex items-center border-0">
+    <h5 class="card-title">
       <%= icon('truck', class: 'mr-2') %>
       <%= Spree.t(:shipments) %>
-    </h6>
+    </h5>
     <% if @shipments.any? %>
       <span class="badge badge-info ml-2"><%= @shipments.count %></span>
 
       <%= order_shipment_state(@order, class: "ml-auto") %>
     <% end %>
   </div>
-  <div class="card-body px-2 pt-0 pb-2 d-flex flex-column gap-2">
+  <div class="card-body px-2 pt-0 pb-2 flex flex-col gap-2">
     <% if @shipments.any? %>
       <%= render partial: "shipment", collection: @shipments %>
     <% else %>
-      <p class="text-center text-muted p-5">
+      <p class="text-center text-gray-600 p-12">
         <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Shipment)) %>
       </p>
     <% end %>

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

@@ -1,5 +1,5 @@
 <% if @order.special_instructions.present? %>
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
         <%= I18n.t('activerecord.attributes.spree/order.special_instructions') %>

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

@@ -1,107 +1,33 @@
-<div class="card mb-4" id="order_tab_summary">
+<% presenter = Spree::Admin::OrderSummaryPresenter.new(@order) %>
+
+<div class="card mb-6" id="order_tab_summary">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:summary) %></h5>
   </div>
   <ul class="list-group list-group-flush">
-    <% if @order.canceled? && @order.canceled_at %>
-      <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-        <span><%= Spree.t(:canceled_at) %></span>
-        <span class="text-rightfont-weight-bold">
-          <%= spree_time(@order.canceled_at) %>
-        </span>
-      </li>
-      <% if @order.canceler.present? %>
-        <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-          <span><%= Spree.t(:canceler) %></span>
-          <span class="text-rightfont-weight-bold">
-            <%= @order.canceler.name %>
+    <% presenter.rows.each do |row| %>
+      <% if row == :separator %>
+        <hr class="border-gray-100" />
+      <% else %>
+        <li class="list-group-item flex justify-between items-center border-0 <%= 'bg-gray-25' if row[:highlight] %>">
+          <span><%= row[:label] %></span>
+          <span class="<%= 'font-bold' if row[:bold] %> <%= 'text-danger' if row[:danger] %>" <%= "id=#{row[:id]}".html_safe if row[:id] %>>
+            <% if row[:link] %>
+              <%= link_to row[:value], row[:link], data: { turbo_frame: '_top' } %>
+            <% elsif row[:type] == :datetime %>
+              <%= spree_time(row[:value]) %>
+            <% elsif row[:type] == :code %>
+              <code><%= row[:value] %></code>
+            <% elsif row[:value].respond_to?(:to_html) %>
+              <%= row[:value].to_html %>
+            <% else %>
+              <%= row[:value] %>
+            <% end %>
           </span>
         </li>
       <% end %>
     <% end %>
 
-    <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-      <span><%= Spree.t(:currency) %></span>
-      <span id='currency'>
-        <%= @order.currency %>
-      </span>
-    </li>
-
-    <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-      <span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span>
-      <span id='item_total'>
-        <%= @order.display_item_total.to_html %>
-      </span>
-    </li>
-
-    <% if @order.promo_total != 0 %>
-      <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-        <span><%= Spree.t(:discount_amount) %></span>
-        <span class="text-right span" id='date_complete'>
-        <%= @order.display_promo_total.to_html %>
-      </span>
-      </li>
-    <% end %>
-
-    <% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>
-      <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-        <span data-hook='admin_order_tab_ship_total_title'>
-          <%= Spree.t(:ship_total) %>
-        </span>
-        <span id='ship_total'>
-          <%= @order.display_ship_total.to_html %>
-        </span>
-      </li>
-    <% end %>
-
-    <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-      <span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span>
-      <span id='included_tax_total'>
-        <%= @order.display_included_tax_total.to_html %>
-      </span>
-    </li>
-
-    <% tax_lines = order_summary_tax_lines_additional(@order) %>
-
-    <li class="list-group-item border-0" data-controller="reveal">
-      <span class="d-flex justify-content-between align-items-center">
-        <span><%= Spree.t(:tax) %></span>
-        <span id="additional_tax_total">
-          <% if tax_lines.any? %>
-            <button type="button" class="btn btn-light btn-sm mr-2" data-action="click->reveal#toggle">
-              <%= Spree.t(:show_details) %>
-              <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
-            </button>
-          <% end %>
-
-          <%= @order.display_additional_tax_total.to_html %>
-        </span>
-      </span>
-
-      <%= render 'tax_lines', tax_lines: tax_lines %>
-    </li>
-
     <%= render_admin_partials(:order_page_summary_partials, order: @order) %>
-
-    <li class="list-group-item d-flex justify-content-between align-items-center border-0">
-      <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>
-      <span class="font-weight-bold text-capitalize" id='order_total'>
-        <%= @order.display_total.to_html %>
-      </span>
-    </li>
-
-    <li class="list-group-item d-flex justify-content-between align-items-center border-top bg-light">
-      <span data-hook='admin_order_tab_payment_total_title'><%= Spree.t(:payment_total) %></span>
-      <span id='payment_total'>
-        <%= @order.display_payment_total.to_html %>
-      </span>
-    </li>
-
-    <li class="list-group-item d-flex justify-content-between align-items-center bg-light">
-      <span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span>
-      <span id='outstanding_balance'>
-        <%= @order.display_outstanding_balance.to_html %>
-      </span>
-    </li>
   </ul>
 </div>

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

@@ -1,7 +1,7 @@
 <% if controller_name == 'orders' %>
   <%= 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>
       <%= order_filter_dropdown_value %>
@@ -9,7 +9,7 @@
     <%= dropdown_menu do %>
       <%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
       <%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
-                  class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>
+                  class: "dropdown-item flex items-center justify-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>
           <%= Spree.t('admin.orders.unfulfilled') %>
           <% if ready_to_ship_orders_count&.positive? %>
             <span class="badge badge-light ml-2">

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

@@ -1,6 +1,6 @@
-<ul class="list-group mt-3 mb-3 hidden" data-reveal-target="item">
+<ul class="list-group mt-4 mb-4 hidden" data-reveal-target="item">
   <% tax_lines.each do |tax_line| %>
-    <li class="list-group-item d-flex justify-content-between align-items-center">
+    <li class="list-group-item flex justify-between items-center">
       <%= tax_line.name %>
 
       <span class="text-right">

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

@@ -0,0 +1,86 @@
+<div class="card mb-6" id="order_taxes">
+  <div class="card-header flex justify-between items-center border-0">
+    <h5 class="card-title flex items-center">
+      <%= icon('receipt-tax', class: 'mr-2') %>
+      <%= Spree.t(:tax_rates) %>
+      <% if @tax_adjustments.any? %>
+        <span class="badge badge-info ml-2"><%= @tax_adjustments.count %></span>
+      <% end %>
+    </h5>
+  </div>
+  <div class="card-body p-0 border-t">
+    <% if @tax_adjustments.any? %>
+      <div class="table-responsive">
+        <table class="table">
+          <thead>
+            <tr>
+              <th class="rounded-none"><%= Spree.t(:name) %></th>
+              <th class="rounded-none"><%= Spree.t(:applied_to) %></th>
+              <th class="rounded-none"><%= Spree.t(:included_in_price) %></th>
+              <th class="rounded-none"><%= Spree.t(:pre_tax_amount) %></th>
+              <th class="rounded-none"><%= Spree.t(:rate) %></th>
+              <th class="rounded-none"><%= Spree.t(:amount) %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @tax_adjustments.each do |adjustment| %>
+              <% tax_rate = adjustment.source %>
+              <tr>
+                <td>
+                  <% if tax_rate.present? && can?(:manage, tax_rate) %>
+                    <%= link_to tax_rate.name, spree.edit_admin_tax_rate_path(tax_rate), data: { turbo_frame: '_top' }, class: 'font-semibold' %>
+                  <% else %>
+                    <%= adjustment.label %>
+                  <% end %>
+                </td>
+                <td class="text-sm text-gray-600">
+                  <% if adjustment.adjustable.is_a?(Spree::LineItem) %>
+                    <span class="badge badge-light">
+                      <%= icon('box') %>
+                      <%= Spree.t(:line_item) %>
+                    </span>
+
+                    <%= adjustment.adjustable.name %>
+                  <% elsif adjustment.adjustable.is_a?(Spree::Shipment) %>
+                    <span class="badge badge-info">
+                      <%= icon('truck') %>
+                      <%= Spree.t(:shipment) %>
+                    </span>
+
+                    #<%= adjustment.adjustable.number %>
+                  <% elsif adjustment.adjustable.is_a?(Spree::Order) %>
+                    <span class="badge badge-primary">
+                      <%= icon('shopping-cart') %>
+                      <%= Spree.t(:order) %>
+                    </span>
+
+                    #<%= adjustment.adjustable.number %>
+                  <% end %>
+                </td>
+                <td>
+                  <%= active_badge(adjustment.included?) %>
+                </td>
+                <td>
+                  <%= adjustment.adjustable.display_pre_tax_amount if adjustment.adjustable.respond_to?(:display_pre_tax_amount) %>
+                <td>
+                  <% if tax_rate.present? %>
+                    <%= number_to_percentage(tax_rate.amount * 100, precision: 2, strip_insignificant_zeros: true) %>
+                  <% else %>
+                    -
+                  <% end %>
+                </td>
+                <td>
+                  <%= adjustment.display_amount.to_html %>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% else %>
+      <p class="text-center text-gray-600 p-8">
+        <%= Spree.t(:no_taxes) %>
+      </p>
+    <% end %>
+  </div>
+</div>

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

@@ -1,9 +1,9 @@
 <% if @order.user.orders.complete.any? %>
   <div class="alert alert-info mt-2 mb-0">
     <div>
-      <h6 class="font-weight-bold">
+      <h5 class="font-bold">
         <%= icon('magic') %> Assistant
-      </h6>
+      </h5>
       This is a repeat customer that has spent a total of
       <strong><%= Spree::Money.new(@order.user.orders.complete.sum(:total)) %></strong> across
       <strong><%= @order.user.orders.complete.count %> orders</strong>, averaging

data/app/views/spree/admin/orders/adjustments/_form.html.erb

@@ -0,0 +1,6 @@
+<%= f.spree_text_field :label, autofocus: true %>
+<%= f.spree_money_field :amount,
+                        required: true,
+                        currency: @order.currency,
+                        prepend: @order.currency,
+                        help: Spree.t(:adjustment_amount_help) %>

data/app/views/spree/admin/orders/adjustments/create.turbo_stream.erb

@@ -0,0 +1,10 @@
+<%= turbo_render_alerts %>
+<%= turbo_close_dialog %>
+
+<%= turbo_stream.replace 'order_adjustments' do %>
+  <%= render 'spree/admin/orders/adjustments' %>
+<% end %>
+
+<%= turbo_stream.replace 'order_tab_summary' do %>
+  <%= render 'spree/admin/orders/summary' %>
+<% end %>

data/app/views/spree/admin/orders/adjustments/destroy.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace 'order_adjustments' do %>
+  <%= render 'spree/admin/orders/adjustments' %>
+<% end %>
+
+<%= turbo_stream.replace 'order_tab_summary' do %>
+  <%= render 'spree/admin/orders/summary' %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<%= turbo_frame_tag :dialog do %>
+  <%= dialog_header(Spree.t(:edit)) %>
+  <%= form_with model: @adjustment, url: spree.admin_order_adjustment_path(@order, @adjustment), data: { turbo_frame: '_top' } do |f| %>
+    <div class="dialog-body">
+      <%= render 'spree/admin/shared/error_messages', target: @adjustment %>
+      <%= render 'form', f: f %>
+    </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/admin/orders/adjustments/new.html.erb

@@ -0,0 +1,15 @@
+<%= turbo_frame_tag :dialog do %>
+  <div>
+    <%= dialog_header(Spree.t(:new_adjustment)) %>
+    <%= form_with model: @adjustment, url: spree.admin_order_adjustments_path(@order), data: { turbo_frame: '_top' } do |f| %>
+      <div class="dialog-body">
+        <%= render 'spree/admin/shared/error_messages', target: @adjustment %>
+        <%= render 'form', f: f %>
+      </div>
+      <div class="dialog-footer">
+        <%= dialog_discard_button %>
+        <%= turbo_save_button_tag Spree.t('actions.create') %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/adjustments/toggle_state.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace 'order_adjustments' do %>
+  <%= render 'spree/admin/orders/adjustments' %>
+<% end %>
+
+<%= turbo_stream.replace 'order_tab_summary' do %>
+  <%= render 'spree/admin/orders/summary' %>
+<% end %>

data/app/views/spree/admin/orders/adjustments/update.turbo_stream.erb

@@ -0,0 +1,10 @@
+<%= turbo_render_alerts %>
+<%= turbo_close_dialog %>
+
+<%= turbo_stream.replace 'order_adjustments' do %>
+  <%= render 'spree/admin/orders/adjustments' %>
+<% end %>
+
+<%= turbo_stream.replace 'order_tab_summary' do %>
+  <%= render 'spree/admin/orders/summary' %>
+<% end %>

data/app/views/spree/admin/orders/billing_address/_form.html.erb

@@ -1,4 +1,4 @@
-<div data-form="new_address" class="d-none">
+<div data-form="new_address" class="hidden">
   <%= render 'spree/admin/shared/error_messages', target: address %>
   <%= render 'spree/addresses/form',
                    address_name: 'address',
@@ -7,10 +7,10 @@
                    address: address %>
 </div>
 <% if @order.user.present? && @order.user.addresses.many? %>
-  <div data-form="existing_address" class="d-none">
+  <div data-form="existing_address" class="hidden">
     <%= label_tag :billing_address_id, Spree.t(:existing_address), class: 'sr-only' %>
     <%= select_tag :billing_address_id, 
                    options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.id]}), 
-                   { include_blank: Spree.t(:select_existing_address), class: "custom-select", data: { action: 'auto-submit#submit' } } %>
+                   { include_blank: Spree.t(:select_existing_address), class: "form-select", data: { action: 'auto-submit#submit' } } %>
   </div>
 <% end %>

data/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb

@@ -1,22 +1,22 @@
 <%= turbo_stream.update :dialog do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <%= dialog_header(Spree.t(:new_billing_address)) %>
-    <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">
+    <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address">
       <div>
         <% if @order.shipping_address.present? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span>
           <% end %>
         <% end %>
-        <%= label_tag nil, class: 'form-control custom-radio' do %>
+        <%= label_tag nil, class: 'custom-radio' do %>
           <%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
-          <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+          <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span>
         <% end %>
         <% if @order.user.present? && @order.user.addresses.many? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span>
           <% end %>
         <% end %>
       </div>

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

@@ -1,29 +1,29 @@
 <%= turbo_frame_tag :dialog do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <%= dialog_header(Spree.t(:billing_address)) %>
-    <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">
+    <div class="dialog-body flex flex-col gap-6" data-controller="order-billing-address">
       <div>
         <% if @order.shipping_address.present? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span>
           <% end %>
         <% end %>
         <% if @order.shipping_eq_billing_address? %>
-          <%= link_to spree.new_admin_order_billing_address_path(@order, selected_form: :new), class:"form-control custom-radio mb-2" do %>
+          <%= link_to spree.new_admin_order_billing_address_path(@order, selected_form: :new), class:"custom-radio flex no-underline" do %>
             <%= radio_button_tag :billing_address_type, :new, false, class: 'custom-control-input' %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span>
           <% end %>
         <% else %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :new, true, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:update_address) %></span>
           <% end %>
         <% end %>
         <% if @order.user.present? && @order.user.addresses.many? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span>
           <% end %>
         <% end %>
       </div>

data/app/views/spree/admin/orders/billing_address/new.html.erb

@@ -1,22 +1,22 @@
 <%= turbo_frame_tag :dialog do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <%= dialog_header(Spree.t(:billing_address)) %>
-    <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">
+    <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address">
       <div>
         <% if @order.shipping_address.present? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span>
           <% end %>
         <% end %>
-        <%= label_tag nil, class: 'form-control custom-radio' do %>
+        <%= label_tag nil, class: 'custom-radio' do %>
           <%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil? || params[:selected_form] == 'new', class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
-          <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+          <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span>
         <% end %>
         <% if @order.user.present? && @order.user.addresses.many? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span>
           <% end %>
         <% end %>
       </div>

data/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb

@@ -1,22 +1,22 @@
 <%= turbo_stream.update :dialog do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
     <%= dialog_header(Spree.t(:update_billing_address)) %>
-    <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">
+    <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address">
       <div>
         <% if @order.shipping_address.present? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span>
           <% end %>
         <% end %>
-        <%= label_tag nil, class: 'form-control custom-radio' do %>
+        <%= label_tag nil, class: 'custom-radio' do %>
           <%= radio_button_tag :billing_address_type, :new, !@order.shipping_eq_billing_address?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
-          <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>
+          <span class="custom-control-label"><%= Spree.t(:update_address) %></span>
         <% end %>
         <% if @order.user.present? && @order.user.addresses.many? %>
-          <%= label_tag nil, class: 'form-control custom-radio' do %>
+          <%= label_tag nil, class: 'custom-radio' do %>
             <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
-            <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+            <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span>
           <% end %>
         <% end %>
       </div>

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

@@ -4,7 +4,7 @@
     <div class="dialog-body">
       <div class="form-group">
         <%= f.label :email, Spree.t(:email) %>
-        <%= f.email_field :email, class: 'form-control', required: true %>
+        <%= f.email_field :email, class: 'form-input', required: true %>
       </div>
     </div>
     <div class="dialog-footer">

data/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb

@@ -14,7 +14,7 @@
     data-controller="row-link"
     class="cursor-pointer"
   >
-    <td data-action="click->row-link#openLink" class="font-weight-bolder">
+    <td data-action="click->row-link#openLink" class="font-bolder">
       <%= link_to customer_return.number, edit_link %>
     </td>
     <td data-action="click->row-link#openLink">

data/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb

@@ -14,7 +14,7 @@
         data-controller="row-link"
         class="cursor-pointer"
       >
-        <td data-action="click->row-link#openLink" class="font-weight-bolder">
+        <td data-action="click->row-link#openLink" class="font-bolder">
           <%= link_to reimbursement.number,
           (
             if reimbursement.reimbursed?

data/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erb

@@ -35,7 +35,7 @@
           end %>
         </td>
         <% if show_decision %>
-          <td class='actions d-flex gap-2'>
+          <td class='actions flex gap-2'>
             <% if can?(:accept, return_item) %>
               <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-primary btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, title: Spree.t(:accept), method: 'put' } do %>
                 <%= Spree.t(:accept) %>

data/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erb

@@ -1,9 +1,9 @@
-<div class="table-responsive bg-white rounded-lg">
+<div class="table-responsive bg-white rounded-xl">
   <table class="table">
-    <thead class="border-bottom">
+    <thead class="border-b">
       <tr>
         <th scope="col">
-          <div class="custom-control custom-checkbox ml-1">
+          <div class="custom-control form-checkbox ml-1">
             <input
               type="checkbox"
               class="custom-control-input"
@@ -25,7 +25,7 @@
         <% return_item = item_fields.object %>
         <tr>
           <td class="align-center">
-            <div class="custom-control custom-checkbox ml-1">
+            <div class="custom-control form-checkbox ml-1">
               <%= item_fields.hidden_field :inventory_unit_id %>
               <%= item_fields.hidden_field :return_authorization_id %>
               <%= item_fields.hidden_field :pre_tax_amount %>