spree_admin 5.0.4 → 5.1.0.beta

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

@@ -0,0 +1,113 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_admin_users_path, @admin_user %>
+  <%= @admin_user.name %>
+<% end %>
+
+<%= content_for :title do %>
+  <%= @admin_user.name %>
+<% end %>
+
+<div class="row">
+  <div class="col-lg-8">
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title">
+          <%= icon 'history', class: 'mr-1' %>
+          <%= Spree.t(:audit_log) %>
+        </h5>
+      </div>
+      <div class="card-body">
+        <%= render 'audit_log' %>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-lg-4">
+    <div class="card mb-4" id="user-details">
+      <%= turbo_frame_tag :edit_user do %>
+        <div class="card-header d-flex align-items-center justify-content-between">
+          <h5 class="card-title">
+            <%= Spree.t(:details) %>
+          </h5>
+          <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_admin_user_path(@admin_user), class: 'btn btn-light btn-sm', data: { turbo_frame: :edit_user } %>
+        </div>
+        <div class="card-body p-0">    
+          <ul class="list-group list-group-flush">
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= Spree.t(:email) %>
+              <span>
+                <%= @admin_user.email %>
+              </span>
+            </li>
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= Spree.t(:name) %>
+              <span>
+                <%= @admin_user.name %>
+              </span>
+            </li>
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= Spree.t(:roles) %>
+              <span>
+                <% @role_users.each do |role_user| %>
+                  <span class="badge badge-light"><%= role_user.role.name %></span>
+                <% end %>
+              </span>
+            </li>
+            <% if @admin_user.respond_to?(:sign_in_count) %>
+              <li class="list-group-item d-flex justify-content-between align-items-center">
+                <%= I18n.t('activerecord.attributes.user.sign_in_count') %>
+                <span>
+                  <%= @admin_user.sign_in_count %>
+                </span>
+              </li>
+            <% end %>
+            <% if @admin_user.respond_to?(:last_sign_in_at) %>
+              <li class="list-group-item d-flex justify-content-between align-items-center">
+                <%= I18n.t('activerecord.attributes.user.last_sign_in') %>
+                <span>
+                  <% if @admin_user.last_sign_in_at %>
+                    <%= local_time(@admin_user.last_sign_in_at) %>
+                  <% else %>
+                    <%= Spree.t(:not_available) %>
+                  <% end %>
+                </span>
+              </li>
+            <% end %>
+            <% if @admin_user.respond_to?(:current_sign_in_at) %>
+              <li class="list-group-item d-flex justify-content-between align-items-center">
+                <%= I18n.t('activerecord.attributes.user.current_sign_in') %>
+                <span>
+                  <% if @admin_user.current_sign_in_at %>
+                    <%= local_time(@admin_user.current_sign_in_at) %>
+                  <% else %>
+                    <%= Spree.t(:not_available) %>
+                  <% end %>
+                </span>
+              </li>
+            <% end %>
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= Spree.t(:created_at) %>
+              <span>
+                <%= local_time(@admin_user.created_at) %>
+              </span>
+            </li>
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= Spree.t(:updated_at) %>
+              <span>
+                <%= local_time(@admin_user.updated_at) %>
+              </span>
+            </li>
+            <% if @admin_user.invited_by %>
+              <li class="list-group-item d-flex justify-content-between align-items-center">
+                <%= Spree.t(:invited_by) %>
+                <span>
+                <%= @admin_user.invited_by.name %>
+                </span>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -8,8 +8,8 @@
           <%= render 'spree/admin/shared/filters_search_bar', param: :code_eq %>
 
           <div class="d-flex align-items-center justify-content-between">
-            <div class="dropdown h-100">
-              <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
+            <div class="dropdown">
+              <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
                 <span class="text-muted font-weight-normal mr-1">
                   <%= Spree.t(:show) %>
                 </span>
@@ -19,14 +19,14 @@
               </button>
               <div class="dropdown-menu w-100 font-size-sm" style="min-width: 200px">
                 <%= active_link_to Spree.t(:all),
-                  spree.admin_promotion_coupon_codes_path,
+                  spree.admin_promotion_coupon_codes_path(@promotion),
                   class: 'dropdown-item',
                   active: (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>
                 <%= link_to Spree.t('admin.coupon_codes.used'),
-                  params.merge({q: {state_eq: :used}}).permit!,
+                  spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :used}),
                   class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'used'}" %>
                 <%= link_to Spree.t('admin.coupon_codes.unused'),
-                  params.merge({q: {state_eq: :unused}}).permit!,
+                  spree.admin_promotion_coupon_codes_path(@promotion, q: {state_eq: :unused}),
                   class: "dropdown-item #{'active' if params.dig(:q, :state_eq) == 'unused'}" %>
               </div>
             </div>
@@ -42,7 +42,7 @@
       <div class="table-responsive">
         <% if @coupon_codes.any? %>
           <table class="table">
-            <thead class="text-muted">
+            <thead>
             <tr data-hook="rate_header">
               <th><%= Spree.t(:code) %></th>
               <th><%= Spree.t(:used) %></th>

data/app/views/spree/admin/custom_domains/_custom_domains.html.erb

@@ -1,7 +1,7 @@
 <% if current_store.custom_domains.any? %>
   <div class="table-responsive rounded mt-3 border">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:name) %></th>
           <th>Active?</th>

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

@@ -20,7 +20,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr data-hook="rate_header">
             <th><%= Spree.t(:number) %></th>
             <th><%= Spree.t(:created_at) %></th>

data/app/views/spree/admin/dashboard/_store_preview.html.erb

@@ -1,5 +1,5 @@
 <% if current_store.default_theme %>
-  <div class="card mb-4 bg-transparent">
+  <div class="card mb-4">
     <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'd-block border rounded mx-2 mt-2 mb-0 overflow-auto bg-light position-relative store-preview-link' do %>
       <div class="position-absolute w-100 h-100 align-items-center justify-content-center overlay-background store-preview-actions">
         <button class="btn btn-primary">

data/app/views/spree/admin/dashboard/_top_products.html.erb

@@ -5,7 +5,9 @@
     <h5 class="card-title">
       <%= Spree.t('admin.dashboard.top_products') %>
     </h5>
-    <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' } %>
+    <% if can?(:manage, Spree::Report) %>
+      <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' } %>
+    <% end %>
   </div>
   <div class="card-body m-0 p-0">
     <div class="table-responsive">
@@ -72,7 +74,7 @@
       </tbody>
     </table>
   </div>
-  <% if @top_products.any? %>
+  <% if @top_products.any? && can?(:manage, Spree::Report) %>
     <p class="text-center mt-0 border-top py-2 mb-0">
       <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>
     </p>

data/app/views/spree/admin/digital_assets/_table.html.erb

@@ -1,5 +1,5 @@
 <table class="table">
-  <thead class="text-muted">
+  <thead>
     <tr>
       <% if @product.has_variants? %>
         <th><%= Spree.t(:variant) %></th>

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

@@ -1,6 +1,5 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_product_path(@product) %>
-  <span class="mr-3"><%= @product.name %></span>
   <span><%= Spree.t("digital_assets") %></span>
 <% end %>
 

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

@@ -4,7 +4,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:number) %></th>
             <th class="text-center"><%= Spree.t(:kind) %></th>

data/app/views/spree/admin/integrations/_integration.html.erb

@@ -0,0 +1,36 @@
+<% integration_name = integration_class.integration_name %>
+<% integration = store_integration(integration_class.integration_key) %>
+
+<% integration_description ||= Spree.t("admin.integrations.#{integration_class.integration_key}.description") %>
+
+<div id="integration-<%= integration_class.integration_key %>" class="col mb-4 d-flex align-items-stretch">
+  <div class="card w-full">
+    <div class="card-header border-bottom d-flex align-items-center justify-content-between h-auto pr-3 <% if integration.present? %>bg-success<% end %>">
+      <div style="height: 36px" class="d-flex align-items-center">
+        <%= image_tag integration_class.icon_path, alt: integration_name, height: 36 if integration_class.icon_path.present? %>
+      </div>
+
+      <% if integration.present? %>
+        <span class="badge badge-success small">
+          <%= icon('check', class: 'mr-1') %>
+          <%= Spree.t(:active) %>
+        </span>
+      <% end %>
+    </div>
+
+    <div class="card-body">
+      <p><%= integration_description %></p>
+    </div>
+
+    <div class="card-footer d-flex <% if integration.present? %>align-items-baseline justify-content-between<% else %>flex-column<% end %>">
+      <% if integration.present? %>
+        <%= link_to spree.edit_admin_integration_path(integration), class: 'card-link btn btn-sm btn-light' do %>
+          <%= icon 'settings' %>
+          <%= Spree.t(:settings) %>
+        <% end if can?(:update, integration) %>
+      <% else %>
+        <%= link_to_with_icon 'plus', "#{Spree.t('actions.connect')} #{integration_class.integration_name}", spree.new_admin_integration_path(integration: { type: integration_class.name }), class: 'btn btn-primary' if can?(:create, Spree::Integration) %>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_integrations_path %>
+  <%= @integration.name %> <%= Spree.t(:settings) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %>
+
+<%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration) do |form| %>
+  <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>
+  <%= render 'spree/admin/shared/edit_resource_links', f: form %>
+<% end %>

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

@@ -0,0 +1,23 @@
+<%= content_for(:page_title) do %>
+  <%= Spree.t(:integrations) %>
+<% end %>
+
+<%= content_for(:page_alerts) do %>
+  <div class="alert alert-info">
+    <%= Spree.t('admin.integrations.page_subtitle') %>
+  </div>
+<% end %>
+
+<div class="container px-lg-0 mt-2">
+  <% grouped_available_store_integrations.each do |group, integrations| %>
+    <% if group.present? %>
+      <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
+    <% end %>
+
+    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 mb-4">
+      <% integrations.each do |integration| %>
+        <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,14 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_integrations_path %>
+  <%= Spree.t('actions.connect') %> <%= @integration.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %>
+
+<%= form_for @integration, as: :integration, url: spree.admin_integrations_path do |form| %>
+  <%= form.hidden_field :type %>
+  <%= form.hidden_field :active, value: true %>
+
+  <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>
+  <%= render 'spree/admin/shared/new_resource_links' %>
+<% end %>

data/app/views/spree/admin/invitations/_invitation.html.erb

@@ -0,0 +1,52 @@
+<tr id="<%= spree_dom_id invitation %>">
+  <td class="w-30">
+    <%= invitation.email %>
+  </td>
+  <td class="w-10">
+    <% if can?(:read, invitation.inviter) %>
+      <%= link_to invitation.inviter.name, spree.admin_admin_user_path(invitation.inviter) %>
+    <% else %>
+      <%= invitation.inviter.name %>
+    <% end %>
+  </td>
+  <td class="w-20">
+    <span class="badge badge-light"><%= invitation.role.name %></span>
+  </td>
+  <td class="w-20">
+    <% if invitation.accepted? %>
+      <span class="badge badge-success"><%= Spree.t(:accepted) %></span>
+    <% elsif invitation.deleted? %>
+      <span class="badge badge-danger"><%= Spree.t(:deleted) %></span>
+    <% elsif invitation.expired? %>
+      <span class="badge badge-warning"><%= Spree.t(:expired) %></span>
+    <% else %>
+      <span class="badge badge-light"><%= Spree.t(:pending) %></span>
+      <p class="text-muted font-size-sm mb-0 mt-2 pl-1">Expires at: <%= local_time(invitation.expires_at) %></p>
+    <% end %>
+  </td>
+  <td class="w-10">
+    <%= local_time(invitation.created_at) %>
+  </td>
+  <td class="w-10 actions">
+    <% if invitation.pending? && !invitation.expired? %>
+      <div class="dropdown" data-controller="clipboard">
+        <%= hidden_field_tag nil, spree.admin_invitation_url(invitation, token: invitation.token),  data: { clipboard_target: "source" } %>
+
+        <button class="btn btn-sm btn-light" type="button" id="dropdownMenuButton-<%= invitation.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <%= icon('dots-vertical', class: 'mr-0') %>
+        </button>
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= invitation.id %>">
+          <%= link_to_with_icon 'copy', Spree.t(:copy_link), '#', 
+              class: "dropdown-item", 
+              data: { action: "clipboard#copy" } %>
+          <%= link_to_with_icon 'send', Spree.t('actions.resend'), spree.resend_admin_invitation_path(invitation), 
+              class: "dropdown-item", 
+              data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>
+          <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_invitation_path(invitation), 
+              class: "dropdown-item btn-danger", 
+              data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } if can?(:destroy, invitation) %>
+        </div>
+      </div>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,4 @@
+<%= turbo_render_alerts %>
+<%= turbo_close_modal %>
+
+<%= turbo_stream.prepend 'invitations', partial: 'spree/admin/invitations/invitation', locals: { invitation: @invitation } %>

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

@@ -0,0 +1,21 @@
+<%= render 'spree/admin/shared/team_nav' %>
+
+<div class="card-lg">
+  <div class="table-responsive">
+    <table class="table">
+      <thead>
+      <tr>
+        <th class="rounded-lg-top-left"><%= Spree.t(:email) %></th>
+        <th><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th>
+        <th><%= Spree.t(:role_id) %></th>
+        <th><%= Spree.t(:status) %></th>
+        <th class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+        <th></th>
+      </tr>
+      </thead>
+      <tbody id="invitations">
+        <%= render collection: @collection, partial: 'spree/admin/invitations/invitation', as: :invitation %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,32 @@
+<%= turbo_frame_tag :dialog_modal do %>
+  <%= form_for @invitation,
+    url: spree.admin_invitations_path,
+    data: { controller: "enable-button" } do |f| %>
+    <div class="modal-content">
+      <%= modal_header Spree.t('actions.send_invitation') %>
+      <div class="modal-body">
+        <%= render 'spree/admin/shared/error_messages', target: @invitation %>
+        <div class="form-group">
+          <%= f.label :email, Spree.t(:email) %>
+          <%= f.email_field :email, class: 'form-control', required: :required, data: { 'enable-button-target': 'input' }, placeholder: 'eg. steve@apple.com', autofocus: true %>
+        </div>
+        <% if @roles.any? %>
+          <div class="form-group">
+            <%= f.label :role, Spree.t(:role_id) %>
+            <%= f.select :role_id, @roles.map { |role| [role.name, role.id] }, {}, { data: { controller: 'autocomplete-select', 'enable-button-target': 'input' }, required: true } %>
+          </div>
+        <% end %>
+        <div class="form-group">
+          <%= f.label :expires_at %>
+          <%= f.date_field :expires_at, class: 'form-control', required: true, data: { 'enable-button-target': 'input' } %>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <%= turbo_save_button_tag nil, class: 'btn btn-primary', data: { 'enable-button-target': 'button' } do %>
+          <%= icon 'send' %>
+          <%= Spree.t('actions.send_invitation') %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="d-flex align-items-center gap-2">
+  <div>
+    <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
+  </div>
+  <div>
+    <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>
+  </div>
+</div>
+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>

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

@@ -17,8 +17,8 @@
           </p>
         </div>
       </div>
-      <div class="modal-footer border-top">
-        <div class="d-flex gap-2 m-0 align-items-center">
+      <div class="modal-footer">
+        <div class="d-flex gap-2 m-0 align-items-center mr-auto">
           <%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
           <%= form.number_field :quantity, class: "form-control", min: 1 %>
         </div>

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

@@ -19,7 +19,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th>Client ID</th>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_option_types_url %>
-  <%= @option_type.name %>
+  <%= @option_type.presentation %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>

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

@@ -18,7 +18,7 @@
   <% if @option_types.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_option_types">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:internal_name) %></th>

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

@@ -5,7 +5,7 @@
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
       <div class="dropdown ml-auto" id="customer-edit-dropdown">
-        <%= link_to_with_icon 'dots', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>
+        <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>
         <div class="dropdown-menu dropdown-menu-right" >
           <div data-toggle="modal" data-target="#modal">
             <% if can?(:update_customer, @order) && !@order.user.present? %>
@@ -17,7 +17,6 @@
             <% end %>
           </div>
           <% if can?(:update_customer, @order) %>
-            <div class="dropdown-divider"></div>
             <% 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 } %>
             <% else %>

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

@@ -23,28 +23,24 @@
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
 
-    <div class="d-flex align-items-center justify-content-between">
-      <div class="mr-2 h-100">
-        <% if controller_name == 'checkouts' %>
-          <%= render "spree/admin/shared/calendar_range_picker",
-          date_from_input_name: "q[created_at_gt]",
-          date_to_input_name: "q[created_at_lt]",
-          date_from_value: params.dig(:q, :created_at_gt),
-          date_to_value: params.dig(:q, :created_at_lt),
-          dropdown_direction: "right" %>
-        <% else %>
-          <%= render "spree/admin/shared/calendar_range_picker",
-          date_from_input_name: "q[completed_at_gt]",
-          date_to_input_name: "q[completed_at_lt]",
-          date_from_value: params.dig(:q, :completed_at_gt),
-          date_to_value: params.dig(:q, :completed_at_lt),
-          dropdown_direction: "right" %>
-        <% end %>
-      </div>
+    <% if controller_name == 'checkouts' %>
+      <%= render "spree/admin/shared/calendar_range_picker",
+      date_from_input_name: "q[created_at_gt]",
+      date_to_input_name: "q[created_at_lt]",
+      date_from_value: params.dig(:q, :created_at_gt),
+      date_to_value: params.dig(:q, :created_at_lt),
+      dropdown_direction: "right" %>
+    <% else %>
+      <%= render "spree/admin/shared/calendar_range_picker",
+      date_from_input_name: "q[completed_at_gt]",
+      date_to_input_name: "q[completed_at_lt]",
+      date_from_value: params.dig(:q, :completed_at_gt),
+      date_to_value: params.dig(:q, :completed_at_lt),
+      dropdown_direction: "right" %>
+    <% end %>
 
-      <%= render "spree/admin/orders/table_filter_dropdown" %>
-      <%= render 'spree/admin/shared/filters_button' %>
-    </div>
+    <%= 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) %>

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

@@ -1,7 +1,7 @@
 <% if @orders.any? %>
   <div class="table-responsive">
     <table class="table position-relative" id="listing_orders">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
           <% if controller_name == 'orders' %>

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

@@ -10,7 +10,7 @@
     <div class="card-body p-0">
       <div class="table-responsive">
         <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
-          <thead class="text-muted">
+          <thead>
             <tr data-hook="refunds_header" class="border-bottom">
               <th><%= Spree.t(:amount) %></th>
               <th><%= Spree.t(:status) %></th>

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

@@ -65,7 +65,7 @@
           <strong><%= Spree.t(:tracking) %>: </strong>
           <% if shipment.tracked? %>
             <% if shipment.tracking_url.present? %>
-              <span><%= link_to shipment.tracking, shipment.tracking_url, target: '_blank', rel: "noopener noreferrer" %></span>
+              <span><%= link_to ERB::Util.html_escape(shipment.tracking), ERB::Util.html_escape(shipment.tracking_url), target: '_blank', rel: "noopener noreferrer" %></span>
             <% elsif shipment.tracking.present? %>
               <span><%= shipment.tracking %></span>
             <% end %>

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

@@ -1,6 +1,6 @@
 <% if controller_name == 'orders' %>
-  <div class="dropdown h-100 mr-2">
-    <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+  <div class="dropdown">
+    <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
       <span class="text-muted font-weight-normal mr-1">
         <%= Spree.t(:show) %>
       </span>

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

@@ -35,7 +35,7 @@
             data-toggle="dropdown"
             aria-expanded="false"
           >
-            <%= icon("dots", class: "mr-0") %>
+            <%= icon('dots-vertical', class: "mr-0") %>
           </button>
           <div class="dropdown-menu">
             <%= link_to_edit(

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

@@ -1,5 +1,5 @@
 <table class="show return-items-table table table-condensed index">
-  <thead class="text-muted">
+  <thead>
     <tr>
       <th><%= Spree.t(:product) %></th>
       <th><%= Spree.t(:pre_tax_amount) %></th>

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

@@ -3,7 +3,7 @@
 <div data-controller="return-items">
   <div class="table-responsive card-lg mb-4">
     <table class="table table-condensed return-items-table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th>
             <% if allow_return_item_changes %>