spree_admin 5.1.7 → 5.2.0.rc1

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

@@ -0,0 +1,41 @@
+<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters" } do |f| %>
+  <div class="d-flex flex-column flex-lg-row gap-2">
+    <%= render 'spree/admin/shared/filters_search_bar', param: :email_cont, label: Spree.t(:email) %>
+
+    <%= dropdown do %>
+      <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
+        <span class="text-muted font-weight-normal mr-1">
+          <%= Spree.t(:show) %>
+        </span>
+        <%# Show current filter value %>
+        <% current_value =
+          if params.dig(:q, :verified).to_s == 'true'
+            Spree.t('admin.newsletter_subscribers.verified')
+          elsif params.dig(:q, :unverified).to_s == 'true'
+            Spree.t('admin.newsletter_subscribers.unverified')
+          else
+            Spree.t('admin.newsletter_subscribers.all')
+          end
+        %>
+        <%= current_value %>
+      <% end %>
+      <%= dropdown_menu do %>
+        <%= active_link_to Spree.t('admin.newsletter_subscribers.all'),
+          params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: nil }),
+          class: 'dropdown-item',
+          active: params.dig(:q, :verified).blank? && params.dig(:q, :unverified).blank? %>
+        <%= active_link_to Spree.t('admin.newsletter_subscribers.verified'),
+          params.to_unsafe_h.deep_merge(q: { verified: true, unverified: nil }),
+          class: 'dropdown-item',
+          active: params.dig(:q, :verified).to_s == 'true' %>
+        <%= active_link_to Spree.t('admin.newsletter_subscribers.unverified'),
+          params.to_unsafe_h.deep_merge(q: { verified: nil, unverified: true }),
+          class: 'dropdown-item',
+          active: params.dig(:q, :unverified).to_s == 'true' %>
+      <% end %>
+    <% end %>
+  </div>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :email, Spree.t(:email) %></th>
+  <th scope="col"><%= Spree.t(:customer) %></th>
+  <th scope="col"><%= Spree.t(:verified) %>?</th>
+  <th scope="col"><%= Spree.t(:verified_at) %></th>
+  <th scope="col"><%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>
+  <th scope="col"></th>
+</tr>

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

@@ -0,0 +1,36 @@
+<tr id="<%= spree_dom_id newsletter_subscriber %>">
+  <td class="w-30">
+    <%= newsletter_subscriber.email %>
+    <%= clipboard_component(newsletter_subscriber.email) %>
+  </td>
+  <td class="w-25">
+    <% if newsletter_subscriber.user.present? %>
+      <%= link_to newsletter_subscriber.user.full_name, spree.admin_user_path(newsletter_subscriber.user) %>
+    <% else %>
+      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+    <% end %>
+  </td>
+  <td class="w-10">
+    <%= active_badge(newsletter_subscriber.verified?) %>
+  </td>
+  <td class="w-15">
+    <% if newsletter_subscriber.verified_at.present? %>
+      <%= spree_date(newsletter_subscriber.verified_at) %>
+    <% else %>
+      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+    <% end %>
+  </td>
+  <td class="w-15">
+    <%= spree_date(newsletter_subscriber.created_at) %>
+  </td>
+  <td class="w-5">
+    <%= dropdown do %>
+      <%= dropdown_toggle class: 'btn-light btn-sm' do %>
+        <%= icon('dots-vertical', class: 'mr-0') %>
+      <% end %>
+      <%= dropdown_menu do %>
+        <%= link_to_delete(newsletter_subscriber, icon: 'trash', class: 'dropdown-item text-danger') %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:newsletter_subscribers) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= link_to_export_modal %>
+<% end %>
+
+<%= render 'spree/admin/shared/index_table', new_object_url: nil, export_type: Spree::Exports::NewsletterSubscribers %>

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

@@ -1,11 +1,6 @@
-<div class="form-group">
-  <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-  <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-  <%= f.error_message_on :name %>
-</div>
-
-<div class="form-group">
-  <%= f.label :scopes, raw(Spree.t(:scopes) + required_span_tag) %>
-  <%= f.select :scopes, [['Read Only', 'admin read'], ['Read & Write', 'admin write']], { selected: @oauth_application.scopes.to_s }, { class: 'custom-select' } %>
-  <%= f.error_message_on :scopes %>
+<div class="card mb-4">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_select :scopes, [['Read Only', 'admin read'], ['Read & Write', 'admin write']], { selected: @oauth_application.scopes.to_s }, { required: true } %>
+  </div>
 </div>

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

@@ -0,0 +1,7 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t('admin.oauth_applications.client_id') %></th>
+  <th scope="col"><%= Spree.t('admin.oauth_applications.scopes') %></th>
+  <th scope="col"><%= Spree.t('admin.oauth_applications.last_used') %></th>
+  <th scope="col"></th>
+</tr>

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

@@ -0,0 +1,34 @@
+<tr id="<%= spree_dom_id oauth_application %>">
+  <td class="w-20"><code><%= oauth_application.name %></code></td>
+  <td class="w-40">
+    <div class="d-flex gap-2 align-items-center" data-controller="password-toggle">
+      <%= button_tag class: 'btn btn-light btn-sm px-1', data: { action: 'click->password-toggle#password' } do %>
+        <%= icon 'eye', class: 'mr-0' %>
+      <% end %>
+      <%= password_field_tag :password, oauth_application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
+    </div>
+  </td>
+  <td class="w-15">
+    <% if oauth_application.scopes.include?('write') %>
+      <span class="badge badge-warning">
+        <%= icon('pencil', class: 'mr-1') %>
+        <%= Spree.t('admin.oauth_applications.read_and_write') %>
+      </span>
+    <% else %>
+      <span class="badge badge-light">
+        <%= icon('eye', class: 'mr-1') %>
+        <%= Spree.t('admin.oauth_applications.read_only') %>
+      </span>
+    <% end %>
+  </td>
+  <td class="w-15">
+    <% if oauth_application.last_used_at %>
+      <%= spree_time(oauth_application.last_used_at) %>
+    <% else %>
+      <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
+    <% end %>
+  </td>
+  <td class="actions w-10">
+    <%= link_to_edit(oauth_application, no_text: true, data: { turbo_frame: '_top' }) if can? :edit, oauth_application %>
+  </td>
+</tr>

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

@@ -1,41 +1,31 @@
 <%= turbo_stream.replace "new_oauth_application" do %>
-  <div class="card">
-    <div class="card-body">
-      <div data-controller="clipboard" class="mb-3">
-        <div class="form-group">
-          <%= label_tag :client_id, 'Client ID' %>
-          <div class="input-group">
-            <%= text_area_tag :client_id, @object.uid, class: 'form-control', rows: 1, data: { clipboard_target: 'source', action: 'clipboard#copy' }, readonly: true %>
-            <div class="input-append">
-              <button data-action="clipboard#copy" class="btn btn-light">
-                <%= icon 'clone.svg', class: 'mr-2' %>
-                <%= Spree.t('admin.copy_to_clipboard') %>
-              </button>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card">
+        <div class="card-body">
+          <div class="form-group">
+            <%= label_tag :client_id, Spree.t('admin.oauth_applications.client_id') %>
+            <div class="d-flex gap-2 align-items-center">
+              <%= text_field_tag :client_id, @object.uid, class: 'form-control-plaintext bg-light rounded', readonly: true %>
+              <%= clipboard_component(@object.uid) %>
             </div>
           </div>
-        </div>
-      </div>
 
-      <div data-controller="clipboard" class="mb-3">
-        <div class="form-group">
-          <%= label_tag :client_secret, 'Client Secret' %>
-          <div class="input-group">
-            <%= text_area_tag :client_secret, @object.plaintext_secret, class: 'form-control', rows: 1, data: { clipboard_target: 'source', action: 'clipboard#copy' }, readonly: true %>
-            <div class="input-append">
-              <button data-action="clipboard#copy" class="btn btn-light">
-                <%= icon 'clone.svg', class: 'mr-2' %>
-                <%= Spree.t('admin.copy_to_clipboard') %>
-              </button>
+          <div class="form-group">
+            <%= label_tag :client_secret, Spree.t('admin.oauth_applications.client_secret') %>
+            <div class="d-flex gap-2 align-items-center">
+              <%= text_field_tag :client_secret, @object.plaintext_secret, class: 'form-control-plaintext bg-light rounded', readonly: true %>
+              <%= clipboard_component(@object.plaintext_secret) %>
+            </div>
+            <div class="alert alert-warning mt-3">
+              This is your application's secret token, copy it now and keep it safe. It won't be shown again.
             </div>
           </div>
-          <div class="alert alert-warning mt-3">
-            This is your application's secret token, copy it now and keep it safe. It won't be shown again.
-          </div>
+        </div>
+        <div class="card-footer border-top">
+          <%= link_to 'Back to list', spree.admin_oauth_applications_url, class: 'btn btn-light' %>
         </div>
       </div>
     </div>
-    <div class="card-footer">
-      <%= link_to 'Back to list', spree.admin_oauth_applications_url, class: 'btn btn-light' %>
-    </div>
   </div>
 <% end %>

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

@@ -1,18 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_oauth_applications_url %>
-  <%= @oauth_application.name.capitalize %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @oauth_application] do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>
-      <div class="card mb-4">
-        <div class="card-body">
-          <%= render 'form', f: f %>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -4,11 +4,11 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:oauth_applications_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::OauthApplication %>
+  <%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" if can? :create, Spree::OauthApplication %>
+<% end %>
 
 <%= content_for :page_alerts do %>
-  <div class="alert alert-info mb-3">
+  <div class="alert alert-info">
     <p>
       Here you can manage API keys to access the <%= link_to 'Platform API', 'https://spreecommerce.org/docs/api-reference/platform/authentication', target: '_blank' %>.
       For headless storefronts you don't need an API key, please use the <%= link_to 'Storefront API', 'https://spreecommerce.org/docs/api-reference/storefront/authentication', target: '_blank' %>.
@@ -18,60 +18,4 @@
 
 <%= render_admin_partials(:oauth_applications_header_partials) %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th>Client ID</th>
-            <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
-            <th><%= Spree.t('admin.oauth_applications.last_used') %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @collection.each do |application| %>
-            <tr id="<%= spree_dom_id application %>">
-              <td class="w-20"><code><%= application.name %></code></td>
-              <td class="w-40">
-                <div class="input-group" data-controller="password-toggle">
-                  <%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
-                    <%= icon 'eye', class: 'mr-0' %>
-                  <% end %>
-                  <%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
-                </div>
-              </td>
-              <td class="w-15">
-                <% if application.scopes.include?('write') %>
-                  <span class="badge badge-warning">
-                    <%= icon('pencil', class: 'mr-1') %>
-                    <%= Spree.t('admin.oauth_applications.read_and_write') %>
-                  </span>
-                <% else %>
-                  <span class="badge badge-light">
-                    <%= icon('eye', class: 'mr-1') %>
-                    <%= Spree.t('admin.oauth_applications.read_only') %>
-                  </span>
-                <% end %>
-              </td>
-              <td class="w-15">
-                <% if application.last_used_at %>
-                  <%= local_time(application.last_used_at) %>
-                <% else %>
-                  <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
-                <% end %>
-              </td>
-              <td class="actions w-10">
-                <%= link_to_edit(application, no_text: true) if can? :edit, application %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found', resource_name: 'API keys' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,24 +1 @@
-<%= content_for :title do %>
-  <%= Spree.t('admin.oauth_applications.new') %>
-<% end %>
-
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_oauth_applications_url %>
-  <%= Spree.t('admin.oauth_applications.new') %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @oauth_application } %>
-    <%= turbo_frame_tag 'new_oauth_application' do %>
-      <%= form_for [:admin, @oauth_application] do |f| %>
-        <div class="card mb-4">
-          <div class="card-body">
-            <%= render 'form', f: f %>
-          </div>
-        </div>
-        <%= render 'spree/admin/shared/new_resource_links' %>
-      <% end %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/option_types/{_filter.html.erb → _filters.html.erb}

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
   <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -5,38 +5,16 @@
     <div class="card-body" data-controller="slug-form">
       <div class="row mb-3">
         <div class="col-md-6">
-          <div class="form-group">
-            <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>
-            <%= f.text_field :presentation, class: "form-control", required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
-            <%= f.error_message_on :presentation %>
-            <p class="text-muted form-text mt-2 mb-0">
-              This is used to display the option type on the storefront.
-            </p>
-          </div>
+          <%= f.spree_text_field :presentation, required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' }, help_text: "This is used to display the option type on the storefront." %>
         </div>
 
         <div class="col-md-6">
-          <div class="form-group">
-            <%= f.label :name, Spree.t(:internal_name) %>
-            <%= f.text_field :name, class: "form-control", data: { slug_form_target: :url } %>
-            <%= f.error_message_on :name %>
-            <p class="text-muted form-text mt-2 mb-0">
-              This is used internally to identify the option type. <strong>It must be unique.</strong>
-            </p>
-          </div>
+          <%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: raw("This is used internally to identify the option type. <strong>It must be unique.</strong>") %>
         </div>
       </div>
       <div class="row">
         <div class="col-12 col-md-6">
-          <div class="form-group">
-            <div class="custom-control custom-checkbox mb-3">
-              <%= f.check_box :filterable, class: "custom-control-input", id: "option_type_filterable" %>
-              <%= f.label :filterable, Spree.t(:filterable), class: "custom-control-label", for: "option_type_filterable" %>
-            </div>
-            <small class="form-text text-muted">
-              <%= raw Spree.t('option_type_filterable_info') %>
-            </small>
-          </div>
+          <%= f.spree_check_box :filterable, help_text: raw(Spree.t('option_type_filterable_info')) %>
         </div>
       </div>
     </div>
@@ -57,10 +35,10 @@
         <table class="table">
           <thead>
             <tr class="border-bottom">
-              <th></th>
-              <th><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
-              <th><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>
-              <th></th>
+              <th scope="col"></th>
+              <th scope="col"><%= raw(Spree.t(:presentation) + required_span_tag) %></th>
+              <th scope="col"><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>
+              <th scope="col"></th>
             </tr>
           </thead>
           <tbody id="option_values" data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="option_value" data-sortable-response-kind-value="turbo-stream">
@@ -74,7 +52,7 @@
 
             <tr class="hover-none">
               <td colspan="4" class="text-center p-2">
-                <button type="button" data-action="nested-form#add" class="btn btn-link py-3 w-100" id="add_option_value_button">
+                <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-100" id="add_option_value_button">
                   <%= icon('plus') %>
                   <%= Spree.t(:add_one) %>
                 </button>

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

@@ -0,0 +1,19 @@
+<tr>
+  <th class="no-border handel-head"></th>
+  <th scope="col"><%= Spree.t(:internal_name) %></th>
+  <th scope="col">
+    <%= Spree.t(:presentation) %>
+    <%= help_bubble("How this option is presented to customers") %>
+  </th>
+  <th scope="col">
+    <%= Spree.t(:filterable) %>
+    <%= help_bubble("Whether this option can be used in product filters") %>
+  </th>
+  <th scope="col">
+    <%= Spree.t(:option_values) %>
+  </th>
+  <th scope="col">
+    <%= Spree.t(:products) %>
+  </th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/option_types/{_option_type.html.erb → _table_row.html.erb}

@@ -14,6 +14,6 @@
     <%= option_type.products.count %>
   </td>
   <td class="w-10 actions cursor-pointer">
-    <%= link_to_edit option_type, data: { row_link_target: :link } %>
+    <%= link_to_edit option_type, data: { row_link_target: :link, turbo_frame: '_top' } %>
   </td>
 </tr>

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

@@ -3,9 +3,6 @@
   <%= @option_type.presentation %>
 <% end %>
 
-<% content_for :page_actions_dropdown do %>
-  <%= link_to_edit_translations(@option_type) %>
-<% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
 

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

@@ -4,8 +4,8 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:option_types_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>
-<% end if can?(:create, Spree::OptionType) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::OptionType) %>
+<% end %>
 
 <%= content_for(:page_alerts) do %>
   <div class="alert alert-info">
@@ -16,46 +16,7 @@
 
 <%= render_admin_partials(:option_types_header_partials) %>
 
-<div class="card-lg">
-  <%= render partial: "spree/admin/option_types/filter" %>
-  <% if @option_types.any? %>
-    <div class="table-responsive">
-      <table class="table" id="listing_option_types">
-        <thead>
-          <tr>
-            <th class="no-border handel-head"></th>
-            <th><%= Spree.t(:internal_name) %></th>
-            <th>
-              <%= Spree.t(:presentation) %>
-              <%= help_bubble("How this option is presented to customers") %>
-            </th>
-            <th>
-              <%= Spree.t(:filterable) %>
-              <%= help_bubble("Whether this option can be used in product filters") %>
-            </th>
-            <th>
-              <%= Spree.t(:option_values) %>
-            </th>
-            <th>
-              <%= Spree.t(:products) %>
-            </th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody
-          data-controller="sortable"
-          data-sortable-handle-value=".move-handle"
-          data-sortable-resource-name-value="option_type"
-          data-sortable-response-kind-value="turbo-stream"
-        >
-          <%= render partial: "spree/admin/option_types/option_type", collection: @option_types %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render "spree/admin/shared/no_resource_found" %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table', sortable: true %>
 
 <p class="documentation-link-container">
   <%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>

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

@@ -4,18 +4,18 @@
       <%= Spree.t(:customer) %>
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
-      <div class="dropdown ml-auto" id="customer-edit-dropdown">
-        <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-1', 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? %>
-              <%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } %>
-            <% end %>
-            <% if can?(:update_addresses, @order) %>
-              <%= link_to Spree.t('admin.edit_shipping_address'), spree.edit_admin_order_shipping_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } if @order.shipping_address.present? %>
-              <%= link_to Spree.t('admin.edit_billing_address'), spree.edit_admin_order_billing_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } if @order.billing_address.present? %>
-            <% end %>
-          </div>
+      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>
+        <%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>
+          <%= icon 'dots-vertical' %>
+        <% end %>
+        <%= dropdown_menu class: 'dropdown-menu-right' do %>
+          <% if can?(:update_customer, @order) && !@order.user.present? %>
+            <%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+          <% end %>
+          <% if can?(:update_addresses, @order) %>
+            <%= link_to Spree.t('admin.edit_shipping_address'), spree.edit_admin_order_shipping_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } if @order.shipping_address.present? %>
+            <%= link_to Spree.t('admin.edit_billing_address'), spree.edit_admin_order_billing_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } if @order.billing_address.present? %>
+          <% 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 } %>
@@ -23,8 +23,8 @@
               <%= link_to Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: 'dropdown-item' %>
             <% end %>
           <% end %>
-        </div>
-      </div>
+        <% end %>
+      <% end %>
     <% end %>
   </div>
   <div class="card-body">
@@ -47,7 +47,7 @@
           </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-link 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-3" %>
         <% end %>
       </div>
     <% end %>
@@ -56,9 +56,7 @@
       <% if @order.ship_address.present? %>
         <%= render 'spree/admin/shared/address', address: @order.ship_address %>
       <% elsif can?(:update_addresses, @order) %>
-        <div data-toggle="modal" data-target="#modal">
-          <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-link w-100", data: { turbo_frame: 'dialog_modal' } %>
-        </div>
+        <%= 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' } %>
       <% else %>
         <span class="text-muted"><%= Spree.t(:no_shipping_address_available) %></span>
       <% end %>
@@ -70,9 +68,7 @@
       <% elsif @order.bill_address.present? %>
         <%= render 'spree/admin/shared/address', address: @order.bill_address %>
       <% elsif can?(:update_addresses, @order) %>
-        <div data-toggle="modal" data-target="#modal">
-          <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-link w-100", data: { turbo_frame: 'dialog_modal' } %>
-        </div>
+        <%= 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' } %>
       <% else %>
         <span class="text-muted"><%= Spree.t(:no_billing_address_available) %></span>
       <% end %>

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

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