spree_admin 5.1.8 → 5.2.0.rc1

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

@@ -14,8 +14,7 @@
   url: search_form_path,
   class: "filter-wrap",
   data: {
-    controller: "filters reveal",
-    reveal_hidden_class: "d-none",
+    controller: "filters dropdown",
     filters_url_value: request.url
   } do |f| %>
   <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
@@ -42,66 +41,68 @@
     <%= render "spree/admin/orders/table_filter_dropdown" %>
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
-  <div data-reveal-target="item" class="d-none" id="table-filter">
-    <%= f.hidden_field :payment_state_eq, value: params.dig(:q, :payment_state_eq) %>
+  <div data-dropdown-target="menu" id="table-filter" class="hidden">
     <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
-    <%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>
-    <%= f.hidden_field :partially_refunded, value: params.dig(:q, :partially_refunded) %>
     <%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
     <%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
-
-    <% unless @user %>
-      <div class="row">
-        <div class="col-12 col-lg-4">
-          <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 } %>
-          </div>
-        </div>
-        <div class="col-12 col-lg-4">
-          <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 } %>
-          </div>
-        </div>
-        <div class="col-12 col-lg-4">
-          <div class="form-group">
-            <%= label_tag :q_email_eq, Spree.t(:email) %>
-            <%= f.email_field :email_eq, class: "form-control", data: { filters_target: :input } %>
-          </div>
-        </div>
-      </div>
+    <%= f.hidden_field :shipment_state_eq, value: params.dig(:q, :shipment_state_eq) %>
+    <% Array(params.dig(:q, :shipment_state_not_in)).each do |state| %>
+      <%= hidden_field_tag 'q[shipment_state_not_in][]', state %>
+    <% end %>
+    <%= f.hidden_field :state_eq, value: params.dig(:q, :state_eq) %>
+    <% Array(params.dig(:q, :state_in)).each do |state| %>
+      <%= hidden_field_tag 'q[state_in][]', state %>
     <% end %>
+    <%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>
+    <%= f.hidden_field :partially_refunded, value: params.dig(:q, :partially_refunded) %>
 
-    <div class="row">
 
-      <div class="col-12 col-lg-4">
-        <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 } %>
-        </div>
+    <% 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 } %>
       </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in,
-                   Spree::Promotion.applied.pluck(:name, :id),
-                   { include_blank: true },
-                   data: {
-                     controller: "autocomplete-select",
-                     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 } %>
       </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 } %>
+      </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 } %>
+    </div>
 
-      <%= render_admin_partials(:orders_filters_partials, f: f) %>
+    <div class="form-group">
+      <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+      <%= f.select :promotions_id_in,
+              Spree::Promotion.applied.pluck(:name, :id),
+              { include_blank: true },
+              data: {
+                controller: "autocomplete-select",
+                filters_target: :input,
+              } %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+      <% payment_state_options = Spree::Order::PAYMENT_STATES.map { |state| [Spree.t("payment_states.#{state}"), state] } %>
+      <% payment_state_options += [
+            [Spree.t('payment_states.refunded'), 'refunded'],
+            [Spree.t('payment_states.partially_refunded'), 'partially_refunded']
+          ] %>
+      <%= f.select :payment_state_eq,
+                    payment_state_options,
+                    { include_blank: true },
+                    { class: "custom-select", data: { filters_target: :input } } %>
     </div>
 
+    <%= render_admin_partials(:orders_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
-
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
 <% end %>

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

@@ -0,0 +1,12 @@
+<%= f.spree_select :currency, options_for_select(supported_currency_options, current_store.default_currency), { label: Spree.t(:currency), autocomplete: true } %>
+
+<hr class="my-4" />
+
+<div class="form-group">
+  <%= f.label :user_id, Spree.t(:select_user) %>
+  <%= 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>
+
+<%= 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,18 +9,13 @@
   <%= order_payment_state(@order) %>
   <%= order_shipment_state(@order) %>
   <% if @order.completed? %>
-    <span class="text-muted font-size-sm font-weight-normal with-tip">
+    <span class="text-muted font-size-sm font-weight-normal">
       <%= I18n.t('activerecord.attributes.spree/order.completed_at') %>
-      <%= local_time(@order.completed_at) %>
+      <%= spree_time_ago(@order.completed_at) %>
     </span>
   <% end %>
 <% end %>
 
-<%# TODO: Fix mobile %>
-<% content_for :page_actions do %>
-
-<% end %>
-
 <% content_for(:page_actions_dropdown) do %>
   <% if @order.completed? && spree.respond_to?(:order_path) %>
     <%= link_to_with_icon "eye",

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

@@ -23,16 +23,11 @@
     </div>
     <div class="w-5">
       <% if can?(:edit, line_item) %>
-        <div class="dropdown">
-          <button
-            class="btn btn-sm btn-light"
-            type="button"
-            data-toggle="dropdown"
-            aria-expanded="false"
-          >
+        <%= dropdown do %>
+          <%= dropdown_toggle class: 'btn-light btn-sm' do %>
             <%= icon "dots-vertical", class: "mr-0" %>
-          </button>
-          <div class="dropdown-menu dropdown-menu-right w-100">
+          <% end %>
+          <%= dropdown_menu do %>
             <%= link_to_with_icon "edit",
               Spree.t(:edit),
               spree.edit_admin_order_line_item_path(@order, line_item),
@@ -53,8 +48,8 @@
               <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' %>
             <% end %>
-          </div>
-        </div>
+          <% end %>
+        <% end %>
       <% end %>
     </div>
   </div>

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

@@ -1,7 +1,6 @@
-
-<%= turbo_frame_tag dom_id(@order, :line_items), class: "card mb-4" do %>
-  <% if @line_items.any? %>
-    <div class="card-header d-flex justify-content-between align-items-center">
+<% 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">
         <%= icon('shopping-cart', class: 'mr-2') %>
         <%= Spree.t(:line_items) %>
@@ -9,49 +8,45 @@
       </h5>
       <div class="d-flex gap-2">
         <% if can?(:create, Spree::LineItem.new(order: @order)) %>
-          <div data-toggle="modal" data-target="#modal">
-            <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: :dialog_modal }, class: "btn btn-link btn-sm" %>
-          </div>
-        <% end %>
-        <% if @order.completed? %>
-          <button class="btn btn-light btn-sm" type="button" data-toggle="collapse" data-target="#line-items" aria-expanded="false" aria-controls="collapseExample">
-            <%= Spree.t(:show_details) %>
-            <%= icon('selector', class: 'mr-0 ml-1') %>
-          </button>
+          <%= 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" %>
         <% end %>
+        <span class="btn btn-light btn-sm d-inline-flex align-items-center">
+          <%= Spree.t(:show_details) %>
+          <%= icon('selector', class: 'mr-0 ml-1 arrow') %>
+        </span>
       </div>
-    </div>
-    <div class="card-body mb-0 p-0 <% if @order.completed? && params[:line_item_updated].blank? %>collapse<% else %>show<% end %>" id="line-items">
-      <div class="order-line-items">
-        <div class="d-flex align-items-center text-muted border-bottom py-2 px-3 font-size-sm order-line-items__row">
-          <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>
+    </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>
-        <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %>
       </div>
+      <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %>
     </div>
-  <% elsif can?(:create, Spree::LineItem.new(order: @order)) %>
+  </details>
+<% elsif can?(:create, Spree::LineItem.new(order: @order)) %>
+  <div class="card mb-4">
     <div class="card-header">
       <h5 class="card-title">
         <%= icon('shopping-cart', class: 'mr-2') %>
@@ -59,10 +54,7 @@
       </h5>
     </div>
     <div class="card-body">
-      <div data-toggle="modal" data-target="#modal">
-        <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: :dialog_modal }, class: "btn btn-link w-100 py-3" %>
-      </div>
+      <%= 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" %>
     </div>
-  <% end %>
+  </div>
 <% end %>
-

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

@@ -1,18 +1,18 @@
 <% if @orders.any? %>
   <div class="table-responsive">
-    <table class="table position-relative" id="listing_orders">
+    <table class="table" id="listing_orders">
       <thead>
         <tr>
-          <th><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+          <th scope="col"><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
           <% if controller_name == 'orders' %>
-            <th><%= sort_link @search, :completed_at,   Spree.t(:date) %></th>
+            <th scope="col"><%= sort_link @search, :completed_at,   Spree.t(:date) %></th>
           <% else %>
-            <th><%= sort_link @search, :created_at,     Spree.t(:date) %></th>
+            <th scope="col"><%= sort_link @search, :created_at,     Spree.t(:date) %></th>
           <% end %>
           <th class="d-customer"><%= Spree.t(:customer) %></th>
-          <th><%= Spree.t(:package_from) %></th>
-          <th><%= I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
-          <th><%= I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
+          <th scope="col"><%= Spree.t(:package_from) %></th>
+          <th scope="col"><%= I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
+          <th scope="col"><%= I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
           <th class="text-right"><%= sort_link @search, :item_count, I18n.t(:item_count, scope: 'activerecord.attributes.spree/order') %></th>
           <th class="text-right"><%= sort_link @search, :total, I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
         </tr>

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

@@ -3,7 +3,7 @@
     <%= 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 } %>
   </td>
   <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
-    <%= local_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P', class: 'with-tip') %>
+    <%= spree_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P') %>
   </td>
   <td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink">
     <%= render 'spree/admin/orders/customer_summary', order: order %>

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

@@ -1,5 +1,5 @@
 <% if can?(:read, Spree::Payment) && (@order.payment_required? && @order.bill_address.present?) || @payments.any? %>
-  <div class="card mb-4 bg-transparent">
+  <div class="card mb-4">
     <div class="card-header d-flex align-items-center border-0">
       <h6 class="card-title">
         <%= icon('credit-card-pay', class: 'mr-2') %>
@@ -18,7 +18,7 @@
           <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
 
           <% 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 with-tip', title: Spree.t(:send_payment_link_title) %>
+            <%= 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) %>
 
             <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">

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

@@ -12,11 +12,11 @@
         <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
           <thead>
             <tr data-hook="refunds_header" class="border-bottom">
-              <th><%= Spree.t(:amount) %></th>
-              <th><%= Spree.t(:status) %></th>
-              <th><%= Spree.t(:reason) %></th>
-              <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-              <th></th>
+              <th scope="col"><%= Spree.t(:amount) %></th>
+              <th scope="col"><%= Spree.t(:status) %></th>
+              <th scope="col"><%= Spree.t(:reason) %></th>
+              <th scope="col"><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+              <th scope="col"></th>
             </tr>
           </thead>
           <tbody>
@@ -31,12 +31,10 @@
                   <% end %>
                 </td>
                 <td><%= truncate(refund.reason.name, length: 100) %></td>
-                <td><%= local_time(refund.created_at) %></td>
+                <td><%= spree_time(refund.created_at) %></td>
                 <% if refund.editable? && can?(:edit, refund) %>
                   <td class="actions">
-                    <span data-toggle="modal" data-target="#modal">
-                      <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, data: { turbo_frame: 'dialog_modal' }, class: "btn btn-light btn-sm") if can?(:edit, refund) %>
-                    </span>
+                    <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-light btn-sm") if can?(:edit, refund) %>
                   </td>
                 <% end %>
               </tr>

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

@@ -9,11 +9,11 @@
         <table class="table">
           <thead class="border-bottom">
             <tr>
-              <th><%= Spree.t(:rma_number) %></th>
-              <th><%= Spree.t(:status) %></th>
-              <th><%= Spree.t(:pre_tax_total) %></th>
-              <th><%= "#{Spree.t("date")}/#{Spree.t("time")}" %></th>
-              <th></th>
+              <th scope="col"><%= Spree.t(:rma_number) %></th>
+              <th scope="col"><%= Spree.t(:status) %></th>
+              <th scope="col"><%= Spree.t(:pre_tax_total) %></th>
+              <th scope="col"><%= "#{Spree.t("date")}/#{Spree.t("time")}" %></th>
+              <th scope="col"></th>
             </tr>
           </thead>
           <tbody>

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

@@ -1,4 +1,4 @@
-<ul class="list-group mt-3 collapse" id="risk-analysis-<%= payment.id %>">
+<ul class="list-group mt-3 hidden" data-reveal-target="item">
   <li class="list-group-item d-flex justify-content-between align-items-center">
     <%= Spree.t(:avs_response) %>
     <span class="badge badge-<%= payment.is_avs_risky? ? 'warning' : 'complete' %>">

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

@@ -6,7 +6,7 @@
       <strong class="shipment-number"><%= shipment.number %></strong>
       <% if shipment.shipped_at.present? %>
         <small class="text-muted">
-          <%= local_time_ago(shipment.shipped_at, class: 'with-tip') %>
+          <%= spree_time_ago(shipment.shipped_at) %>
         </small>
       <% end %>
     </div>
@@ -55,7 +55,7 @@
       </div>
 
       <% if( (can? :update, shipment) and !shipment.shipped? && !order.canceled? && !shipment.canceled?) %>
-        <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'with-tip btn btn-sm btn-light', no_text: true %>
+        <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-sm btn-light', no_text: true %>
       <% end %>
     <% end %>
 
@@ -76,22 +76,23 @@
 
         <% if can?(:update, shipment) && (!order.canceled? && !shipment.canceled?) %>
           <% if shipment.tracking.present? %>
-            <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm with-tip', no_text: true, title: Spree.t(:edit) %>
+            <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm', no_text: true, title: Spree.t(:edit) %>
           <% else %>
-            <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm with-tip', no_text: true, title: Spree.t(:add_one) %>
+            <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm', no_text: true, title: Spree.t(:add_one) %>
           <% end %>
         <% end %>
       <% end %>
     <% end %>
 
     <% if can_ship?(shipment) %>
-      <div class="card-footer d-flex justify-content-end border-top bg-gray-25">
+      <div class="card-footer d-flex justify-content-end border-top bg-light">
         <% 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? %>
-          <span class="ship-tooltip with-tip ship ml-auto btn btn-primary disabled mb-0" data-toggle="tooltip" data-placement="left" title="Before marking shipment as shipped please provide tracking details">
+          <span class="ship ml-auto btn btn-primary disabled mb-0" data-controller="tooltip" data-tooltip-placement-value="left">
             <%= icon 'send' %>
             <%= Spree.t(:ship) %>
+            <%= tooltip(Spree.t('admin.shipment.please_provide_tracking_details')) %>
           </span>
         <% else %>
           <span class="text-muted w-100">

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

@@ -11,7 +11,7 @@
   </span>
   <% if can?(:split, shipment) %>
     <span class="d-flex align-items-center justify-content-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 with-tip", no_text: true, data: { test_id: :split_item } %>
+      <%= 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 %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<div class="card mb-4 bg-transparent">
+<div class="card mb-4">
   <div class="card-header d-flex align-items-center border-0">
     <h6 class="card-title">
       <%= icon('truck', class: 'mr-2') %>

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

@@ -7,7 +7,7 @@
       <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">
-          <%= local_time(@order.canceled_at) %>
+          <%= spree_time(@order.canceled_at) %>
         </span>
       </li>
       <% if @order.canceler.present? %>
@@ -20,6 +20,13 @@
       <% 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'>
@@ -56,22 +63,22 @@
 
     <% tax_lines = order_summary_tax_lines_additional(@order) %>
 
-    <li class="list-group-item border-0">
+    <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? %>
-            <%= link_to '#tax-lines-additional', class: 'btn btn-light btn-sm mr-2', data: { toggle: 'collapse' } do %>
+            <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') %>
-            <% end %>
+            </button>
           <% end %>
 
           <%= @order.display_additional_tax_total.to_html %>
         </span>
       </span>
 
-      <%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
+      <%= render 'tax_lines', tax_lines: tax_lines %>
     </li>
 
     <%= render_admin_partials(:order_page_summary_partials, order: @order) %>
@@ -83,14 +90,14 @@
       </span>
     </li>
 
-    <li class="list-group-item d-flex justify-content-between align-items-center border-top bg-gray-25">
+    <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-gray-25">
+    <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 %>

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

@@ -1,12 +1,12 @@
 <% if controller_name == 'orders' %>
-  <div class="dropdown">
-    <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+  <%= dropdown do %>
+    <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
       <span class="text-muted font-weight-normal mr-1">
         <%= Spree.t(:show) %>
       </span>
       <%= order_filter_dropdown_value %>
-    </button>
-    <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">
+    <% end %>
+    <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' 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 %>
@@ -29,6 +29,6 @@
       <%= link_to Spree.t('admin.orders.partially_refunded'),
         params.to_unsafe_h.deep_merge({q: {partially_refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', refunded: '' }}),
         class: "dropdown-item #{'active' if params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?}" %>
-    </div>
-  </div>
+    <% end %>
+  <% end %>
 <% end %>

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

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

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

@@ -8,7 +8,9 @@
 </div>
 <% if @order.user.present? && @order.user.addresses.many? %>
   <div data-form="existing_address" class="d-none">
-    <%= label_tag :billing_address_id, Spree.t(:existing_address), class: "sr-only" %>
-    <%= tom_select_tag :billing_address_id, {include_blank: Spree.t(:existing_address), class: "mb-2", options: @order.user.addresses.map { |a| {id: a.id, name: a.to_s.gsub('<br/>', ", ")}}.as_json, select_data: {action: 'auto-submit#submit'} }  %>
+    <%= 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' } } %>
   </div>
 <% end %>