spree_admin 5.2.6 → 5.3.0.rc1

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

@@ -1,4 +1,4 @@
-<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-4 blur-busy" do  %>
+<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-6 blur-busy" do  %>
   <div class="card-header">
     <h5 class="card-title">
       <%= Spree.t(:customer) %>
@@ -18,7 +18,7 @@
           <% end %>
           <% if can?(:update_customer, @order) %>
             <% if @order.user.present? %>
-              <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %>
+              <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %>
             <% else %>
               <%= link_to Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: 'dropdown-item' %>
             <% end %>
@@ -32,45 +32,45 @@
       <% unless @order.user.present? %>
         <h6><%= Spree.t(:contact_information) %></h6>
       <% end %>
-      <div class='card-text d-flex flex-col'>
+      <div class='card-text flex flex-col'>
         <% if @order.user.present? %>
           <%= render 'spree/admin/shared/user', user: @order.user %>
           <%= render 'spree/admin/orders/user_overview', user: @order.user %>
         <% elsif @order.email.present? %>
-          <div class="d-flex align-items-center w-100">
+          <div class="flex items-center w-full gap-2 py-2">
             <%= mail_to @order.email, @order.email, class: 'text-blue' %>
             <%= clipboard_component(@order.email) %>
           </div>
         <% else %>
-          <span class="text-muted">
+          <span class="text-gray-600">
             <%= Spree.t(:no_email_provided) %>
           </span>
         <% end %>
         <% if !@order.user.present? && can?(:update_customer, @order) %>
-          <%= link_to_with_icon 'plus', Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: "btn btn-secondary mt-3" %>
+          <%= link_to_with_icon 'plus', Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: "btn btn-secondary mt-4" %>
         <% end %>
       </div>
     <% end %>
-    <h6 class="<%= defined?(current_vendor) && current_vendor ? "" : "mt-4" %> font-weight-bold"><%= Spree.t(:shipping_address) %></h6>
+    <h6 class="font-bold mt-6 mb-2"><%= Spree.t(:shipping_address) %></h6>
     <%= turbo_frame_tag :order_ship_address do %>
       <% if @order.ship_address.present? %>
         <%= render 'spree/admin/shared/address', address: @order.ship_address %>
       <% elsif can?(:update_addresses, @order) %>
-        <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-secondary w-100", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+        <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-secondary w-full", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
       <% else %>
-        <span class="text-muted"><%= Spree.t(:no_shipping_address_available) %></span>
+        <span class="text-gray-600"><%= Spree.t(:no_shipping_address_available) %></span>
       <% end %>
     <% end %>
-    <h6 class="mt-4 font-weight-bold"><%= Spree.t(:billing_address) %></h6>
+    <h6 class="font-bold mt-6 mb-2"><%= Spree.t(:billing_address) %></h6>
     <%= turbo_frame_tag :order_bill_address do %>
       <% if @order.shipping_eq_billing_address? && @order.bill_address.present? %>
-        <span class="text-muted"><%= Spree.t(:same_as_shipping_address) %></span>
+        <span class="text-gray-600"><%= Spree.t(:same_as_shipping_address) %></span>
       <% elsif @order.bill_address.present? %>
         <%= render 'spree/admin/shared/address', address: @order.bill_address %>
       <% elsif can?(:update_addresses, @order) %>
-        <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-secondary w-100", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+        <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-secondary w-full", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
       <% else %>
-        <span class="text-muted"><%= Spree.t(:no_billing_address_available) %></span>
+        <span class="text-gray-600"><%= Spree.t(:no_billing_address_available) %></span>
       <% end %>
     <% end %>
   </div>

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

@@ -1,13 +1,13 @@
 <% if @customer_returns.exists? && can?(:read, Spree::CustomerReturn) %>
-  <div class="card mb-4">
-    <div class="card-header justify-content-between">
+  <div class="card mb-6">
+    <div class="card-header justify-between">
       <h5 class="card-title">
         <%= Spree.t(:customer_returns) %></h5>
     </div>
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table">
-          <thead class="border-bottom">
+          <thead class="border-b">
             <tr>
               <th scope="col"><%= Spree.t(:date) %></th>
               <th scope="col"><%= Spree.t(:status) %></th>

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

@@ -1,19 +1,19 @@
 <% if order %>
   <% if order.user %>
-    <span class="d-flex">
+    <span class="flex">
       <% if can?(:manage, order.user) %>
-        <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-dark', data: { 'turbo-frame': '_top' } %>
+        <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-gray-900', data: { 'turbo-frame': '_top' } %>
       <% else %>
         <%= order.full_name %>
       <% end %>
     </span>
   <% elsif order.email.present? %>
-    <span class="text-muted">
+    <span class="text-gray-600">
       <%= order.full_name %>
     </span>
     <%= help_bubble('This order was placed by a guest customer') %>
   <% else %>
-    <span class="text-muted">
+    <span class="text-gray-600">
       <%= Spree.t(:not_available) %>
     </span>
   <% end %>

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

@@ -19,7 +19,7 @@
   } do |f| %>
     <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-    <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: :multi_search %>
 
       <% if controller_name == 'checkouts' %>
@@ -37,13 +37,13 @@
       <% end %>
 
       <%= render "spree/admin/orders/table_filter_dropdown" %>
-      <%= 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="order-filters-drawer">
+  <%= drawer(id: 'order-filters-drawer', controller_name: 'dialog') do %>
     <%= drawer_header(Spree.t(:filter), 'dialog') %>
     <div class="drawer-body">
     <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
@@ -64,20 +64,20 @@
     <% unless @user %>
       <div class="form-group">
         <%= label_tag :q_bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
-        <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
+        <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-input", data: { filters_target: :input } %>
       </div>
       <div class="form-group">
         <%= label_tag :q_bill_address_lastname_eq, Spree.t(:last_name) %>
-        <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>
+        <%= f.text_field :bill_address_lastname_eq, class: "form-input", data: { filters_target: :input } %>
       </div>
       <div class="form-group">
         <%= label_tag :q_email_eq, Spree.t(:email) %>
-        <%= f.email_field :email_eq, class: "form-control", data: { filters_target: :input } %>
+        <%= f.email_field :email_eq, class: "form-input", data: { filters_target: :input } %>
       </div>
     <% end %>
     <div class="form-group">
       <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
-      <%= f.text_field :line_items_variant_sku_eq, class: "form-control", data: { filters_target: :input } %>
+      <%= f.text_field :line_items_variant_sku_eq, class: "form-input", data: { filters_target: :input } %>
     </div>
 
     <div class="form-group">
@@ -100,7 +100,7 @@
       <%= f.select :payment_state_eq,
                     payment_state_options,
                     { include_blank: true },
-                    { class: "custom-select", data: { filters_target: :input } } %>
+                    { class: "form-select", data: { filters_target: :input } } %>
     </div>
 
     <%= render_admin_partials(:orders_filters_partials, f: f) %>
@@ -109,7 +109,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>

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

@@ -7,6 +7,6 @@
   <%= tom_select_tag 'order[user_id]', { include_blank: Spree.t(:select_user), options: users_for_select_options } %>
 </div>
 
-<p class="text-center text-muted my-0"><%= Spree.t(:or) %></p>
+<p class="text-center text-gray-600 my-0"><%= Spree.t(:or) %></p>
 
 <%= f.spree_email_field :email, autofocus: f.object.new_record?, label: Spree.t('admin.orders.provide_email') %>

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

@@ -9,7 +9,7 @@
   <%= order_payment_state(@order) %>
   <%= order_shipment_state(@order) %>
   <% if @order.completed? %>
-    <span class="text-muted font-size-sm font-weight-normal">
+    <span class="text-gray-600 text-sm font-normal">
       <%= I18n.t('activerecord.attributes.spree/order.completed_at') %>
       <%= spree_time_ago(@order.completed_at) %>
     </span>
@@ -60,7 +60,7 @@
   <% if can?(:cancel, @order) %>
     <div class="dropdown-divider"></div>
     <%= link_to spree.cancel_admin_order_path(@order),
-                class: 'text-left btn-danger dropdown-item',
+                class: 'dropdown-item text-danger hover:bg-red-100',
                 data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } do %>
       <%= icon "cancel" %>
       <%= Spree.t(:cancel_order) %>

data/app/views/spree/admin/orders/_line_item.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>
@@ -46,7 +46,7 @@
 
             <% if can?(:destroy, line_item) %>
               <div class="dropdown-divider"></div>
-              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item btn-danger' %>
+              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %>
             <% end %>
           <% end %>
         <% end %>

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

@@ -1,52 +1,59 @@
 <% if @line_items.any? %>
-  <details class="card mb-4" <% if !@order.completed? || params[:line_item_updated].present? %>open<% end %>>
-    <summary class="card-header d-flex justify-content-between align-items-center list-style-none cursor-pointer border-0 bg-transparent">
-      <h5 class="card-title d-flex align-items-center">
+  <% line_items_expanded = !@order.completed? || params[:line_item_updated].present? %>
+  <div class="card mb-6" data-controller="reveal" data-reveal-hidden-class="is-collapsed">
+    <div class="card-header card-header--collapsible flex justify-between items-center cursor-pointer border-0 bg-transparent"
+         data-action="click->reveal#toggle">
+      <h5 class="card-title flex items-center">
         <%= icon('shopping-cart', class: 'mr-2') %>
         <%= Spree.t(:line_items) %>
         <span class="badge badge-info ml-2"><%= @line_items.count %></span>
       </h5>
-      <div class="d-flex gap-2">
+      <div class="flex gap-2">
         <% if can?(:create, Spree::LineItem.new(order: @order)) %>
-          <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %>
+          <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open click->reveal:stop' }, class: "btn btn-secondary btn-sm" %>
         <% end %>
-        <span class="btn btn-light btn-sm d-inline-flex align-items-center">
+        <span class="btn btn-light btn-sm inline-flex items-center">
           <%= Spree.t(:show_details) %>
-          <%= icon('selector', class: 'mr-0 ml-1 arrow') %>
+          <%= icon('selector', class: 'mr-0 ml-1 transition-transform duration-200') %>
         </span>
       </div>
-    </summary>
-    <div class="card-body mb-0 p-0" id="line-items">
-      <div class="d-flex align-items-center text-muted border-bottom py-2 px-3 font-size-sm order-line-items__row bg-light border-top">
-        <div class="w-35">
-          <%= Spree.t(:item_description) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:price) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:quantity) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:subtotal) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:tax) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:discount) %>
-        </div>
-        <div class="w-10">
-          <%= Spree.t(:total) %>
-        </div>
-        <div class="w-5">
+    </div>
+    <div data-reveal-target="item"
+         class="collapsible-content <%= 'is-collapsed' unless line_items_expanded %>">
+      <div>
+        <div class="card-body mb-0 p-0" id="line-items">
+          <div class="flex items-center text-gray-600 border-b py-2 px-4 text-sm order-line-items__row bg-gray-25 border-t">
+            <div class="w-35">
+              <%= Spree.t(:item_description) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:price) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:quantity) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:subtotal) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:tax) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:discount) %>
+            </div>
+            <div class="w-10">
+              <%= Spree.t(:total) %>
+            </div>
+            <div class="w-5">
+            </div>
+          </div>
+          <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %>
         </div>
       </div>
-      <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %>
     </div>
-  </details>
+  </div>
 <% elsif can?(:create, Spree::LineItem.new(order: @order)) %>
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
         <%= icon('shopping-cart', class: 'mr-2') %>
@@ -54,7 +61,7 @@
       </h5>
     </div>
     <div class="card-body">
-      <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary w-100 py-3" %>
+      <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary w-full py-4" %>
     </div>
   </div>
 <% end %>

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

@@ -1,6 +1,6 @@
 <tr id="<%= dom_id(order) %>" data-controller="row-link">
   <td class="p-0 w-10">
-    <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bolder d-block p-2 px-3 text-decoration-none', data: { 'turbo-frame': '_top', row_link_target: :link } %>
+    <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-bolder block p-2 px-4 no-underline', data: { 'turbo-frame': '_top', row_link_target: :link } %>
   </td>
   <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
     <%= spree_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P') %>
@@ -8,7 +8,7 @@
   <td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink">
     <%= render 'spree/admin/orders/customer_summary', order: order %>
   </td>
-  <td class="text-wrap w-20 cursor-pointer" data-action="click->row-link#openLink">
+  <td class="whitespace-normal w-20 cursor-pointer" data-action="click->row-link#openLink">
     <% order.shipments.map(&:stock_location).compact.uniq.each_with_index do |stock_location, index| %>
       <% if index > 0 %>, <% end %><%= stock_location.name %>
     <% end %>

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

@@ -0,0 +1,32 @@
+<% promotion = order_promotion.promotion %>
+<tr>
+  <td>
+    <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: "font-bold" %>
+  </td>
+  <td>
+    <% if promotion.coupon_code? %>
+      <span class="badge badge-light"><%= Spree.t(:coupon_code) %></span>
+    <% else %>
+      <span class="badge badge-info"><%= Spree.t(:automatic_promotion) %></span>
+    <% end %>
+  </td>
+  <td>
+    <%= Spree::Money.new(order_promotion.amount, currency: @order.currency).to_html %>
+  </td>
+  <td class="text-right">
+    <% if can?(:destroy, order_promotion) %>
+      <%= dropdown do %>
+        <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
+          <%= icon('dots-vertical', class: 'mr-0') %>
+        <% end %>
+        <%= dropdown_menu do %>
+          <%= link_to_with_icon 'trash',
+                    Spree.t('actions.destroy'),
+                    spree.admin_order_order_promotion_path(@order, order_promotion),
+                    data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) },
+                    class: "dropdown-item text-red-600 hover:bg-red-100" %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -1,21 +1,21 @@
 <% if can?(:read, Spree::Payment) && (@order.payment_required? && @order.bill_address.present?) || @payments.any? %>
-  <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('credit-card-pay', class: 'mr-2') %>
         <%= Spree.t(:payments) %>
-      </h6>
+      </h5>
       <% if @payments.any? %>
         <span class="badge badge-info ml-2"><%= @payments.count %></span>
         <%= order_payment_state(@order, class: "ml-auto") %>
       <% end %>
     </div>
-    <div class="card-body d-flex flex-column gap-2 px-2 pt-0 pb-2">
+    <div class="card-body flex flex-col gap-2 px-2 pt-0 pb-2">
       <%= render collection: @payments, partial: 'spree/admin/payments/payment', as: :payment %>
 
       <% if @order.payment_total < @order.total && can?(:create, Spree::Payment.new(order: @order)) %>
-        <div class="d-flex justify-content-center w-100 gap-3 p-3">
-          <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
+        <div class="flex justify-center w-full gap-6 p-6">
+          <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-secondary' %>
 
           <% if spree.respond_to?(:checkout_state_url) %>
             <%= link_to_with_icon 'send', Spree.t('admin.send_payment_link'), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-light', title: Spree.t(:send_payment_link_title) %>
@@ -23,7 +23,7 @@
             <div data-controller="clipboard" data-clipboard-success-content-value="<%= Spree.t('admin.copied') %>">
               <input type="hidden" value="<%= spree.checkout_state_url(@order.token, :payment, host: current_store.url_or_custom_domain) %>" readonly data-clipboard-target="source">
               <button class="btn btn-light" type="button" data-clipboard-target="button" data-action="click->clipboard#copy">
-                <%= icon('copy-check') %>
+                <%= icon('copy') %>
                 <%= Spree.t('admin.copy_payment_link') %>
               </button>
             </div>

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

@@ -0,0 +1,37 @@
+<div class="card mb-6" id="order_promotions">
+  <div class="card-header flex justify-between items-center border-0">
+    <h5 class="card-title flex items-center">
+      <%= icon('tag', class: 'mr-2') %>
+      <%= Spree.t(:promotions) %>
+      <% if @order_promotions.any? %>
+        <span class="badge badge-info ml-2"><%= @order_promotions.count %></span>
+      <% end %>
+    </h5>
+    <% if can?(:update, @order) && Spree::Promotion.order_activatable?(@order) %>
+      <%= link_to_with_icon 'plus', Spree.t(:add_coupon_code), spree.new_admin_order_order_promotion_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 @order_promotions.any? %>
+      <div class="table-responsive">
+        <table class="table">
+          <thead>
+            <tr>
+              <th class="rounded-none"><%= Spree.t(:name) %></th>
+              <th class="rounded-none"><%= Spree.t(:type) %></th>
+              <th class="rounded-none"><%= Spree.t(:amount) %></th>
+              <th class="rounded-none"></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render collection: @order_promotions, partial: 'spree/admin/orders/order_promotion' %>
+          </tbody>
+        </table>
+      </div>
+    <% else %>
+      <p class="text-center text-gray-600 p-8">
+        <%= Spree.t(:no_promotions_applied) %>
+      </p>
+    <% end %>
+  </div>
+</div>

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

@@ -1,17 +1,17 @@
 <% if @refunds.any? %>
-  <div class="card mb-4">
-    <div class="card-header d-flex align-items-center">
-      <h6 class="card-title">
+  <div class="card mb-6">
+    <div class="card-header flex items-center">
+      <h5 class="card-title">
         <%= icon('credit-card-refund', class: 'mr-2') %>
         <%= Spree.t(:refunds) %>
-      </h6>
+      </h5>
       <span class="badge badge-info ml-2"><%= @refunds.count %></span>
     </div>
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
           <thead>
-            <tr data-hook="refunds_header" class="border-bottom">
+            <tr data-hook="refunds_header" class="border-b">
               <th scope="col"><%= Spree.t(:amount) %></th>
               <th scope="col"><%= Spree.t(:status) %></th>
               <th scope="col"><%= Spree.t(:reason) %></th>

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

@@ -1,13 +1,13 @@
 <% if @return_authorizations.exists? && can?(:read, Spree::ReturnAuthorization) %>
-  <div class="card mb-4">
-    <div class="card-header justify-content-between">
+  <div class="card mb-6">
+    <div class="card-header justify-between">
       <h5 class="card-title">
         <%= Spree.t(:return_authorizations) %></h5>
     </div>
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table">
-          <thead class="border-bottom">
+          <thead class="border-b">
             <tr>
               <th scope="col"><%= Spree.t(:rma_number) %></th>
               <th scope="col"><%= Spree.t(:status) %></th>

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

@@ -1,5 +1,5 @@
-<ul class="list-group mt-3 hidden" data-reveal-target="item">
-  <li class="list-group-item d-flex justify-content-between align-items-center">
+<ul class="list-group mt-4 hidden" data-reveal-target="item">
+  <li class="list-group-item flex justify-between items-center">
     <%= Spree.t(:avs_response) %>
     <span class="badge badge-<%= payment.is_avs_risky? ? 'warning' : 'complete' %>">
       <% if payment.is_avs_risky? %>
@@ -11,7 +11,7 @@
       <% end %>
     </span>
   </li>
-  <li class="list-group-item d-flex justify-content-between align-items-center">
+  <li class="list-group-item flex justify-between items-center">
     <%= Spree.t(:cvv_response) %>
     <span class="badge  badge-<%= payment.is_cvv_risky? ? 'warning' : 'complete' %>">
       <% if payment.is_cvv_risky? %>

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

@@ -1,19 +1,19 @@
 <% order ||= shipment.order %>
-<%= turbo_frame_tag dom_id(shipment), class: "card" do %>
-  <div class="card-header align-items-center justify-content-between">
-    <div class="d-flex align-items-center gap-2">
-      <span class="d-flex align-items-center"><%= shipment_state(shipment.state) %></span>
+<%= turbo_frame_tag dom_id(shipment), class: "card rounded-lg" do %>
+  <div class="card-header items-center justify-between">
+    <div class="flex items-center gap-2">
+      <span class="flex items-center"><%= shipment_state(shipment.state) %></span>
       <strong class="shipment-number"><%= shipment.number %></strong>
       <% if shipment.shipped_at.present? %>
-        <small class="text-muted">
+        <small class="text-gray-600">
           <%= spree_time_ago(shipment.shipped_at) %>
         </small>
       <% end %>
     </div>
 
-    <span class="d-flex justify-content-between align-items-center gap-2">
-      <small class="text-muted"><%= Spree.t(:package_from).downcase %></small>
-      <strong>
+    <span class="flex justify-between items-center gap-2">
+      <span class="text-gray-600"><%= Spree.t(:package_from).downcase %></span>
+      <span class="font-semibold">
         <% if can?(:edit, shipment.stock_location) %>
           <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_path(shipment.stock_location), data: { turbo_frame: '_top' } %>
         <% else %>
@@ -24,7 +24,7 @@
   </div>
   <div class="card-body mb-0 p-0">
     <div class="shipment-line-items">
-      <div class="text-muted text-center border-bottom py-2 px-3 font-size-sm shipment-line-items__row">
+      <div class="text-gray-600 text-center border-b py-2 px-4 text-sm shipment-line-items__row">
         <span class="text-left">
           <%= Spree.t(:item_description) %>
         </span>
@@ -42,7 +42,7 @@
       </div>
       <%= render collection: shipment.manifest, partial: 'spree/admin/orders/shipment_manifest_item', as: :item, locals: { shipment: shipment } %>
     </div>
-    <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "py-2 px-3 d-flex justify-content-between align-items-center min-h-14" do %>
+    <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "py-2 px-4 flex justify-between items-center min-h-14" do %>
       <div>
         <% if rate = shipment.selected_shipping_rate %>
           <strong><%= rate.name %></strong>
@@ -60,8 +60,8 @@
     <% end %>
 
     <% unless shipment.digital? %>
-      <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-top px-3 d-flex justify-content-between align-items-center min-h-14" do %>
-        <div class="py-3">
+      <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-t px-4 flex justify-between items-center min-h-14" do %>
+        <div class="py-4">
           <strong><%= Spree.t(:tracking) %>: </strong>
           <% if shipment.tracked? %>
             <% if shipment.tracking_url.present? %>
@@ -70,7 +70,7 @@
               <span><%= shipment.tracking %></span>
             <% end %>
           <% else %>
-            <span class="text-muted"><%= Spree.t(:no_tracking_present) %></span>
+            <span class="text-gray-600"><%= Spree.t(:no_tracking_present) %></span>
           <% end %>
         </div>
 
@@ -85,7 +85,7 @@
     <% end %>
 
     <% if can_ship?(shipment) %>
-      <div class="card-footer d-flex justify-content-end border-top bg-light">
+      <div class="card-footer flex justify-end border-t bg-gray-25">
         <% if shipment.tracked? %>
           <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure)} %>
         <% elsif !shipment.digital? %>
@@ -95,7 +95,7 @@
             <%= tooltip(Spree.t('admin.shipment.please_provide_tracking_details')) %>
           </span>
         <% else %>
-          <span class="text-muted w-100">
+          <span class="text-gray-600 w-full">
             <%= Spree.t('admin.digital_shipment_fulfillment_note') %>
           </span>
         <% end %>