spree_admin 5.1.8 → 5.2.0.rc2

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

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

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

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

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

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

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

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

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

@@ -1,17 +1,15 @@
-<%= turbo_frame_tag :dialog_modal do %>
+<%= turbo_frame_tag :dialog do %>
   <%= form_for @order, url: spree.admin_order_contact_information_path(@order), method: :put, data: { turbo_frame: :_top } do |f| %>
-    <div class="modal-content">
-      <%= modal_header(Spree.t(:update_contact_information)) %>
-      <div class="modal-body">
-        <div class="form-group">
-          <%= f.label :email, Spree.t(:email) %>
-          <%= f.email_field :email, class: 'form-control', required: true %>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag Spree.t('actions.update') %>
+    <%= dialog_header(Spree.t(:update_contact_information)) %>
+    <div class="dialog-body">
+      <div class="form-group">
+        <%= f.label :email, Spree.t(:email) %>
+        <%= f.email_field :email, class: 'form-control', required: true %>
       </div>
     </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag Spree.t('actions.update') %>
+    </div>
   <% end %>
 <% end %>

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

@@ -25,19 +25,14 @@
       <% end %>
     </td>
     <td data-action="click->row-link#openLink"><%= customer_return.display_pre_tax_total.to_html %></td>
-    <td data-action="click->row-link#openLink"><%= local_time(customer_return.created_at) %></td>
+    <td data-action="click->row-link#openLink"><%= spree_time(customer_return.created_at) %></td>
     <td class="text-right">
       <% if can_create_reimbursement %>
-        <span class="dropdown">
-          <button
-            class="btn btn-light btn-sm"
-            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">
+          <% end %>
+          <%= dropdown_menu do %>
             <%= link_to_edit(
               customer_return,
               data: {
@@ -53,8 +48,8 @@
                 <%= Spree.t(:create_reimbursement) %>
               <% end %>
             <% end %>
-          </div>
-        </span>
+          <% end %>
+        <% end %>
       <% else %>
         <%= link_to_edit(
           customer_return,

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

@@ -1,10 +1,10 @@
 <table class="table table-condensed">
   <thead>
     <tr>
-      <th><%= Spree.t(:number) %></th>
-      <th><%= Spree.t(:total) %></th>
-      <th><%= Spree.t(:status) %></th>
-      <th><%= Spree.t(:date) %></th>
+      <th scope="col"><%= Spree.t(:number) %></th>
+      <th scope="col"><%= Spree.t(:total) %></th>
+      <th scope="col"><%= Spree.t(:status) %></th>
+      <th scope="col"><%= Spree.t(:date) %></th>
     </tr>
   </thead>
   <tbody>
@@ -33,7 +33,7 @@
             <%= reimbursement.reimbursement_status %>
           </span>
         </td>
-        <td data-action="click->row-link#openLink"><%= local_time(reimbursement.created_at) %></td>
+        <td data-action="click->row-link#openLink"><%= spree_time(reimbursement.created_at) %></td>
       </tr>
     <% end %>
   </tbody>

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

@@ -1,13 +1,13 @@
 <table class="show return-items-table table table-condensed index">
   <thead>
     <tr>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:acceptance_errors) %></th>
+      <th scope="col"><%= Spree.t(:product) %></th>
+      <th scope="col"><%= Spree.t(:pre_tax_amount) %></th>
+      <th scope="col"><%= Spree.t(:preferred_reimbursement_type) %></th>
+      <th scope="col"><%= Spree.t(:exchange_for) %></th>
+      <th scope="col"><%= Spree.t(:acceptance_errors) %></th>
       <% if show_decision %>
-        <th></th>
+        <th scope="col"></th>
       <% end %>
     </tr>
   </thead>

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

@@ -2,7 +2,7 @@
   <table class="table">
     <thead class="border-bottom">
       <tr>
-        <th>
+        <th scope="col">
           <div class="custom-control custom-checkbox ml-1">
             <input
               type="checkbox"
@@ -13,11 +13,11 @@
             <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
           </div>
         </th>
-        <th><%= Spree.t(:product) %></th>
-        <th><%= Spree.t(:sku) %></th>
-        <th><%= Spree.t(:pre_tax_amount) %></th>
-        <th><%= Spree.t(:exchange_for) %></th>
-        <th><%= Spree.t(:resellable) %></th>
+        <th scope="col"><%= Spree.t(:product) %></th>
+        <th scope="col"><%= Spree.t(:sku) %></th>
+        <th scope="col"><%= Spree.t(:pre_tax_amount) %></th>
+        <th scope="col"><%= Spree.t(:exchange_for) %></th>
+        <th scope="col"><%= Spree.t(:resellable) %></th>
       </tr>
     </thead>
     <tbody>

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

@@ -36,14 +36,10 @@
 
     <div class="card mb-4">
       <div class="card-body">
-        <div class="form-group">
-          <%= f.label :stock_location, raw(Spree.t(:stock_location) + required_span_tag) %>
-          <%= f.select :stock_location_id,
+        <%= f.spree_select :stock_location_id,
                    available_stock_locations_list,
                    { include_blank: Spree.t(:select_a_stock_location) },
-                   class: "custom-select" %>
-          <%= f.error_message_on :stock_location %>
-        </div>
+                   { label: Spree.t(:stock_location), required: true } %>
       </div>
     </div>
 

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

@@ -8,7 +8,8 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:orders_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order)  %>
+  <%= link_to_export_modal %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.new_admin_order_path, class: "btn btn-primary" if can?(:create, Spree::Order)  %>
 <% end %>
 
 <%= render_admin_partials(:orders_header_partials) %>
@@ -20,7 +21,10 @@
       <%= render 'spree/admin/orders/list' %>
     <% end %>
   <% else %>
-    <%= render 'spree/admin/orders/filters' %>
-    <%= render 'spree/admin/orders/list' %>
+    <%= turbo_frame_tag "orders", autoscroll: true, data: { autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
+      <%= render 'spree/admin/shared/export_modal', export_type: Spree::Exports::Orders %>
+      <%= render 'spree/admin/orders/filters' %>
+      <%= render 'spree/admin/orders/list' %>
+    <% end %>
   <% end %>
 </div>

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

@@ -0,0 +1,22 @@
+<% content_for :title do %>
+  <%= Spree.t(:orders) %>
+<% end %>
+
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_orders_path %>
+  <%= Spree.t(:new_order) %>
+<% end %>
+
+<%= form_for @order, url: spree.admin_orders_path do |f| %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_orders_path } %>
+    </div>
+  </div>
+<% end %>

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

@@ -5,7 +5,7 @@
     <table class="table table-condensed return-items-table">
       <thead>
         <tr>
-          <th>
+          <th scope="col">
             <% if allow_return_item_changes %>
               <div class="custom-control custom-checkbox ml-1">
                 <input
@@ -18,14 +18,14 @@
               </div>
             <% end %>
           </th>
-          <th><%= Spree.t(:product) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:charged) %></th>
-          <th><%= Spree.t(:purchased_quantity) %></th>
+          <th scope="col"><%= Spree.t(:product) %></th>
+          <th scope="col"><%= Spree.t(:status) %></th>
+          <th scope="col"><%= Spree.t(:charged) %></th>
+          <th scope="col"><%= Spree.t(:purchased_quantity) %></th>
           <th style="min-width:130px;"><%= Spree.t(:return_quantity) %></th>
           <th style="min-width:150px;"><%= Spree.t(:pre_tax_refund_amount) %></th>
-          <th><%= Spree.t(:reimbursement_type) %></th>
-          <th><%= Spree.t(:exchange_for) %></th>
+          <th scope="col"><%= Spree.t(:reimbursement_type) %></th>
+          <th scope="col"><%= Spree.t(:exchange_for) %></th>
         </tr>
       </thead>
       <tbody>
@@ -143,29 +143,15 @@
 
   <div class="card mb-4">
     <div class="card-body">
-      <div class="form-group">
-        <%= f.label :stock_location, raw(Spree.t(:stock_location) + required_span_tag) %>
-        <%= f.select :stock_location_id,
-                 available_stock_locations_list,
-                 { include_blank: Spree.t(:select_a_stock_location) },
-                 { class: "custom-select" } %>
-        <%= f.error_message_on :stock_location %>
-      </div>
+      <%= f.spree_select :stock_location_id,
+               available_stock_locations_list,
+               { include_blank: Spree.t(:select_a_stock_location), label: Spree.t(:stock_location), required: true } %>
 
-      <div class="form-group">
-        <%= f.label :reason, raw(Spree.t(:reason) + required_span_tag) %>
-        <%= f.select :return_authorization_reason_id,
-                 @reasons.collect { |r| [r.name, r.id] },
-                 { include_blank: Spree.t(:select_a_return_authorization_reason) },
-                 { class: "custom-select" } %>
-        <%= f.error_message_on :reason %>
-      </div>
+      <%= f.spree_select :return_authorization_reason_id,
+               @reasons.collect { |r| [r.name, r.id] },
+               { include_blank: Spree.t(:select_a_return_authorization_reason), label: Spree.t(:reason), required: true } %>
 
-      <div class="form-group">
-        <%= f.label :memo, Spree.t(:memo) %>
-        <%= f.text_area :memo, class: "form-control" %>
-        <%= f.error_message_on :memo %>
-      </div>
+      <%= f.spree_text_area :memo %>
     </div>
   </div>
 </div>

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

@@ -22,7 +22,7 @@
     </small>
   </td>
   <td data-action="click->row-link#openLink"><%= return_authorization.display_pre_tax_total.to_html %></td>
-  <td data-action="click->row-link#openLink"><%= local_time(return_authorization.created_at) %></td>
+  <td data-action="click->row-link#openLink"><%= spree_time(return_authorization.created_at) %></td>
   <td data-action="click->row-link#openLink" class="text-right">
     <%= link_to_edit(
       return_authorization,

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

@@ -6,9 +6,9 @@
     <span class="badge badge-<%= @return_authorization.state %>">
       <%= Spree.t("return_authorization_states.#{@return_authorization.state}") %>
     </span>
-    <%= local_time(
+    <%= spree_time(
       @return_authorization.created_at,
-      class: "badge badge-light with-tip",
+      class: "badge badge-light",
     ) %>
   </div>
 <% end %>
@@ -29,14 +29,14 @@ locals: {
     <table class="table table-condensed return-items-table">
       <thead>
         <tr>
-          <th><%= Spree.t(:product) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:purchased_quantity) %></th>
-          <th><%= Spree.t(:return_quantity) %></th>
-          <th><%= Spree.t(:total) %></th>
-          <th><%= Spree.t(:refund_amount) %></th>
-          <th><%= Spree.t(:reimbursement_type) %></th>
-          <th><%= Spree.t(:exchange_for) %></th>
+          <th scope="col"><%= Spree.t(:product) %></th>
+          <th scope="col"><%= Spree.t(:status) %></th>
+          <th scope="col"><%= Spree.t(:purchased_quantity) %></th>
+          <th scope="col"><%= Spree.t(:return_quantity) %></th>
+          <th scope="col"><%= Spree.t(:total) %></th>
+          <th scope="col"><%= Spree.t(:refund_amount) %></th>
+          <th scope="col"><%= Spree.t(:reimbursement_type) %></th>
+          <th scope="col"><%= Spree.t(:exchange_for) %></th>
         </tr>
       </thead>
       <tbody>
@@ -104,10 +104,10 @@ locals: {
       <table class="table table-condensed">
         <thead>
           <tr>
-            <th><%= Spree.t(:reimbursement_type) %></th>
-            <th><%= Spree.t(:description) %></th>
-            <th><%= Spree.t(:status) %></th>
-            <th><%= Spree.t(:amount) %></th>
+            <th scope="col"><%= Spree.t(:reimbursement_type) %></th>
+            <th scope="col"><%= Spree.t(:description) %></th>
+            <th scope="col"><%= Spree.t(:status) %></th>
+            <th scope="col"><%= Spree.t(:amount) %></th>
           </tr>
         </thead>
         <tbody>

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

@@ -7,7 +7,9 @@
 <% if @order.user.present? && @order.user.addresses.many? %>
   <div>
     <div class="w-100 text-center mb-2"><%= Spree.t(:or_select_other_address) %></div>
-    <%= label_tag :shipping_address_id, Spree.t(:existing_address), class: "sr-only" %>
-    <%= tom_select_tag :shipping_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 :shipping_address_id, Spree.t(:existing_address), class: 'sr-only' %>
+    <%= select_tag :shipping_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 %>

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

@@ -1,14 +1,12 @@
-<%= turbo_stream.update :dialog_modal do %>
+<%= turbo_stream.update :dialog do %>
   <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
-    <div class="modal-content">
-      <%= modal_header(Spree.t(:new_shipping_address)) %>
-      <div class="modal-body d-flex flex-col gap-3">
-        <%= render 'form', address: @address, f: f%>
-      </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag Spree.t('actions.save') %>
-      </div>
+    <%= dialog_header(Spree.t(:new_shipping_address)) %>
+    <div class="dialog-body d-flex flex-col gap-3">
+      <%= render 'form', address: @address, f: f%>
+    </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag Spree.t('actions.save') %>
     </div>
   <% end %>
 <% end %>