spree_admin 5.1.8 → 5.2.0.rc2

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

@@ -6,15 +6,14 @@
 <% content_for :page_actions do %>
   <%= render_admin_partials(:digital_assets_actions_partials) %>
   <% if can?(:create, Spree::Digital.new(variant: @product.default_variant)) %>
-    <span data-toggle="modal" data-target="#modal">
-      <%= link_to_with_icon "plus",
-      Spree.t(:new_digital_asset),
-      spree.new_admin_product_digital_asset_path(@product),
-      class: "btn btn-primary",
-      data: {
-        turbo_frame: "dialog_modal",
-      } %>
-    </span>
+    <%= link_to_with_icon "plus",
+    Spree.t(:new_digital_asset),
+    spree.new_admin_product_digital_asset_path(@product),
+    class: "btn btn-primary",
+    data: {
+      turbo_frame: "dialog",
+      action: 'dialog#open',
+    } %>
   <% end %>
 <% end %>
 

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

@@ -1,14 +1,12 @@
-<%= turbo_frame_tag :dialog_modal do %>
+<%= turbo_frame_tag :dialog do %>
   <%= form_for :digital_asset, url: spree.admin_product_digital_assets_path(@product) do |f| %>
-    <div class="modal-content">
-      <%= modal_header(Spree.t(:new_digital_asset)) %>
-      <div class="modal-body">
-        <%= render "spree/admin/digital_assets/form", f: f %>
-      </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag Spree.t("actions.save"), data: { turbo_frame: :_top } %>
-      </div>
+    <%= dialog_header(Spree.t(:new_digital_asset)) %>
+    <div class="dialog-body">
+      <%= render "spree/admin/digital_assets/form", f: f %>
+    </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag Spree.t("actions.save"), data: { turbo_frame: :_top } %>
     </div>
   <% end %>
 <% end %>

data/app/views/spree/admin/digital_assets/update.turbo_stream.erb

@@ -1,2 +1,2 @@
 <%= turbo_render_alerts %>
-<%= turbo_close_modal %>
+<%= turbo_close_dialog %>

data/app/views/spree/admin/errors/403.html.erb

@@ -0,0 +1,14 @@
+<%= content_for :title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<div class="page-container py-12">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-4 text-primary">403</h1>
+    <p class="display-5"><%= Spree.t(:forbidden) %></p>
+    <p class="display-6"><%= Spree.t(:forbidden_message) %></p>
+    <%= link_to Spree.t("admin.back_to_dashboard"),
+    spree.admin_dashboard_path,
+    class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/admin/errors/404.html.erb

@@ -0,0 +1,14 @@
+<%= content_for :title do %>
+  <%= Spree.t(:page_not_found) %>
+<% end %>
+
+<div class="page-container py-12">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-4 text-primary">404</h1>
+    <p class="display-5"><%= Spree.t(:page_not_found) %></p>
+    <p class="display-6"><%= Spree.t(:page_not_found_message) %></p>
+    <%= link_to Spree.t("admin.back_to_dashboard"),
+    spree.admin_dashboard_path,
+    class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/admin/errors/422.html.erb

@@ -0,0 +1,14 @@
+<%= content_for :title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<div class="page-container py-12">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-4 text-primary">422</h1>
+    <p class="display-5"><%= Spree.t(:unprocessable_entity) %></p>
+    <p class="display-6"><%= Spree.t(:unprocessable_entity_message) %></p>
+    <%= link_to Spree.t("admin.back_to_dashboard"),
+    spree.admin_dashboard_path,
+    class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/admin/errors/500.html.erb

@@ -0,0 +1,14 @@
+<%= content_for :title do %>
+  <%= Spree.t(:internal_server_error) %>
+<% end %>
+
+<div class="page-container py-12">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-4 text-primary">500</h1>
+    <p class="display-5"><%= Spree.t(:internal_server_error) %></p>
+    <p class="display-6"><%= Spree.t(:internal_server_error_message) %></p>
+    <%= link_to Spree.t("admin.back_to_dashboard"),
+    spree.admin_dashboard_path,
+    class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/admin/errors/503.html.erb

@@ -0,0 +1,14 @@
+<%= content_for :title do %>
+  <%= Spree.t(:service_unavailable) %>
+<% end %>
+
+<div class="page-container py-12">
+  <div class="not-found-page text-center pt-5">
+    <h1 class="display-4 text-primary">503</h1>
+    <p class="display-5"><%= Spree.t(:service_unavailable) %></p>
+    <p class="display-6"><%= Spree.t(:service_unavailable_message) %></p>
+    <%= link_to Spree.t("admin.back_to_dashboard"),
+    spree.admin_dashboard_path,
+    class: "btn btn-primary" %>
+  </div>
+</div>

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

@@ -29,7 +29,7 @@
   <td>
     <%= export.attachment.filename if export.done? %>
   </td>
-  <td class="w-15"><%= local_time_ago(export.created_at, class: 'with-tip') %></td>
+  <td class="w-15"><%= spree_time_ago(export.created_at) %></td>
   <td>
     <%= number_to_human_size(export.attachment.byte_size) if export.done? %>
   </td>

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

@@ -1,2 +1,5 @@
 <%= turbo_render_alerts %>
-<%= turbo_close_modal %>
+
+<%= turbo_stream.replace 'export-dialog' do %>
+  <%= render 'spree/admin/shared/export_modal', export_type: @export.type %>
+<% end %>

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

@@ -12,13 +12,13 @@
       <table class="table">
         <thead>
           <tr>
-            <th><%= Spree.t(:number) %></th>
+            <th scope="col"><%= Spree.t(:number) %></th>
             <th class="text-center"><%= Spree.t(:kind) %></th>
             <th class="text-center"><%= Spree.t(:status) %></th>
-            <th><%= Spree.t(:user) %></th>
-            <th><%= Spree.t(:filename) %></th>
-            <th><%= Spree.t(:date) %></th>
-            <th><%= Spree.t(:size) %></th>
+            <th scope="col"><%= Spree.t(:user) %></th>
+            <th scope="col"><%= Spree.t(:filename) %></th>
+            <th scope="col"><%= Spree.t(:date) %></th>
+            <th scope="col"><%= Spree.t(:size) %></th>
             <th class="text-center"><%= Spree.t(:download) %></th>
           </tr>
         </thead>

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

@@ -1,36 +1,41 @@
-<%= turbo_frame_tag :dialog_modal do %>
+<%= turbo_frame_tag :export_dialog do %>
   <%= form_for @export, url: spree.admin_exports_path do |f| %>
     <%= f.hidden_field :type %>
     <%= f.hidden_field :search_params %>
-    <div class="modal-content">
-      <%= modal_header(Spree.t(:export) + ' ' + plural_resource_name(@export.model_class)) %>
-      <div class="modal-body">
-        <%= render 'spree/admin/shared/error_messages', target: @export %>
-        <div class="custom-control custom-radio">
-          <%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %>
-          <%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label' do %>
-            <%= Spree.t(:filtered_records) %>
-            <br />
-            <span class="text-muted font-weight-normal mr-1">
-              <%= Spree.t('admin.export_only_filtered_records') %>
-            </span>
-          <% end %>
-        </div>
-        <div class="custom-control custom-radio mt-3">
-          <%= f.radio_button :record_selection, 'all', class: 'custom-control-input' %>
-          <%= f.label :record_selection, for: :export_record_selection_all, class: 'custom-control-label' do %>
-            <%= Spree.t(:all) %>
-            <br />
-            <span class="text-muted font-weight-normal mr-1">
-              <%= Spree.t('admin.export_all') %>
-            </span>
-          <% end %>
-        </div>
+    <div class="dialog-header">
+      <h5 class="dialog-title">
+        <%= Spree.t(:export) + ' ' + plural_resource_name(@export.model_class) %>
+      </h5>
+      <button type="button" class="btn-close" data-action="click->export-dialog#close" aria-label="Close"></button>
+    </div>
+    <div class="dialog-body">
+      <%= render 'spree/admin/shared/error_messages', target: @export %>
+      <div class="custom-control custom-radio">
+        <%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %>
+        <%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label' do %>
+          <%= Spree.t(:filtered_records) %>
+          <br />
+          <span class="text-muted font-weight-normal mr-1">
+            <%= Spree.t('admin.export_only_filtered_records') %>
+          </span>
+        <% end %>
       </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag Spree.t(:export), class: 'btn btn-primary' %>
+      <div class="custom-control custom-radio mt-3">
+        <%= f.radio_button :record_selection, 'all', class: 'custom-control-input' %>
+        <%= f.label :record_selection, for: :export_record_selection_all, class: 'custom-control-label' do %>
+          <%= Spree.t(:all) %>
+          <br />
+          <span class="text-muted font-weight-normal mr-1">
+            <%= Spree.t('admin.export_all') %>
+          </span>
+        <% end %>
       </div>
     </div>
+    <div class="dialog-footer">
+      <button type="button" class="btn btn-light" data-action="click->export-dialog#close" aria-label="Close">
+        <%= Spree.t('actions.discard') %>
+      </button>
+      <%= turbo_save_button_tag Spree.t(:export), class: 'btn btn-primary' %>
+    </div>
   <% end %>
 <% end %>

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

@@ -6,25 +6,10 @@
   </div>
 
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :prefix, raw(Spree.t('admin.gift_card_batches.prefix') + required_span_tag)%>
-      <%= f.text_field :prefix, class: 'form-control', disabled: f.object.persisted? %>
-      <%= f.error_message_on :prefix %>
-    </div>
-    <div class="form-group">
-      <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
-      <%= f.number_field :amount, class: 'form-control', disabled: f.object.persisted?, required: true %>
-      <%= f.error_message_on :amount %>
-    </div>
-    <div class="form-group">
-      <%= f.label :codes_count, raw(Spree.t('admin.gift_card_batches.codes_count') + required_span_tag) %>
-      <%= f.number_field :codes_count, class: 'form-control', disabled: f.object.persisted?, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit] %>
-      <%= f.error_message_on :codes_count %>
-    </div>
-    <div class="form-group">
-      <%= f.label :expires_at, Spree.t(:expires_at) %>
-      <%= f.date_field :expires_at, class: 'form-control', disabled: f.object.persisted? %>
-      <%= f.error_message_on :expires_at %>
-    </div>
+    <%= f.spree_text_field :prefix, disabled: f.object.persisted?, label: Spree.t('admin.gift_card_batches.prefix') %>
+    <%= f.spree_number_field :amount, required: true, disabled: f.object.persisted? %>
+    <%= f.spree_select :currency, options_for_select(supported_currency_options, f.object.currency), { label: Spree.t(:currency), autocomplete: true } %>
+    <%= f.spree_number_field :codes_count, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit], label: Spree.t('admin.gift_card_batches.codes_count') %>
+    <%= f.spree_date_field :expires_at, disabled: f.object.persisted?, help: 'Gift cards will expire after this date.' %>
   </div>
 </div>

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

@@ -1,15 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_gift_cards_path %>
-  <%= Spree.t('admin.gift_card_batches.new_gift_card_batch') %>
-<% end %>
-
-<%= form_for [:admin, @object] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-
-      <%= render 'form', f: f %>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/new_resource', form_url: spree.admin_gift_card_batches_path %>

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

@@ -5,18 +5,17 @@
   url: filter_form_url,
   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? %>
 
   <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :code_eq, label: Spree.t(:code) %>
+    <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
     <%= render "table_filter_dropdown" %>
     <%= render "spree/admin/shared/filters_button" %>
   </div>
-  <div data-reveal-target="item" class="d-none" id="table-filter">
+  <div data-dropdown-target="menu" id="table-filter" class="hidden">
     <% if params[:user_id].blank? %>
       <div class="form-group">
         <%= f.label :users_email_eq, Spree.t(:email) %>

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

@@ -1,30 +1,20 @@
-<% unless f.object.persisted? %>
-  <div class="form-group">
-    <%= f.label :code do %>
-      <%= Spree.t(:code) %>
-      <%= help_bubble(Spree.t('admin.gift_cards.code_help_text')) %>
+<div class="card mb-4">
+  <div class="card-body">
+    <% unless f.object.persisted? %>
+      <%= f.spree_text_field :code, required: true, help_bubble: Spree.t('admin.gift_cards.code_help_text') %>
     <% end %>
-    <%= f.text_field :code, class: 'form-control'  %>
-    <%= f.error_message_on :code %>
-  </div>
-<% end %>
 
-<div class="form-group">
-  <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
-  <%= f.text_field :amount, class: 'form-control', required: true %>
-  <%= f.error_message_on :amount %>
-</div>
+    <%= f.spree_number_field :amount, required: true %>
+    <%= f.spree_select :currency, options_for_select(supported_currency_options, f.object.currency), { label: Spree.t(:currency), autocomplete: true }, { disabled: f.object.persisted? } %>
 
-<div class="form-group">
-  <%= f.label :user_id, Spree.t(:customer) %>
-  <%= tom_select_tag 'gift_card[user_id]',
-        active_option: @user&.id || @object.user_id,
-        include_blank: true,
-        options: users_for_select_options %>
-</div>
-<div class="form-group">
-  <%= f.label :expires_at, Spree.t(:expires_at) %>
-  <%= f.date_field :expires_at, class: 'form-control' %>
-  <%= f.error_message_on :expires_at %>
-</div>
+    <div class="form-group">
+      <%= f.label :user_id, Spree.t(:customer) %>
+      <%= tom_select_tag 'gift_card[user_id]',
+            active_option: @user&.id || @object.user_id,
+            include_blank: true,
+            options: users_for_select_options %>
+    </div>
 
+    <%= f.spree_date_field :expires_at %>
+  </div>
+</div>

data/app/views/spree/admin/gift_cards/_gift_card.html.erb

@@ -10,7 +10,7 @@
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= active_badge(gift_card.active?, label: gift_card.display_state) %></td>
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
     <% if gift_card.expires_at.present? %>
-      <%= local_date(gift_card.expires_at) %>
+      <%= spree_date(gift_card.expires_at) %>
     <% else %>
       <span class="text-muted">
         <%= Spree.t(:not_available) %>

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

@@ -3,13 +3,13 @@
     <table class="table">
       <thead class="text-muted">
         <tr>
-          <th><%= Spree.t(:code) %></th>
-          <th><%= Spree.t(:amount) %></th>
-          <th><%= Spree.t(:used) %></th>
-          <th><%= Spree.t(:currency) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:expires_at) %></th>
-          <th><%= Spree.t(:customer) %></th>
+          <th scope="col"><%= Spree.t(:code) %></th>
+          <th scope="col"><%= Spree.t(:amount) %></th>
+          <th scope="col"><%= Spree.t(:used) %></th>
+          <th scope="col"><%= Spree.t(:currency) %></th>
+          <th scope="col"><%= Spree.t(:status) %></th>
+          <th scope="col"><%= Spree.t(:expires_at) %></th>
+          <th scope="col"><%= Spree.t(:customer) %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -1,25 +1,25 @@
-<div class="dropdown">
-  <button class="btn btn-light dropdown-toggle" type="button" data-toggle="dropdown" data-display="static" data-flip="false" aria-expanded="false">
+<%= dropdown do %>
+  <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
     <span class="text-muted font-weight-normal">Show:</span>
     <%= gift_cards_filter_dropdown_value %>
-  </button>
-  <div class="dropdown-menu w-100" style="min-width: 200px">
+  <% end %>
+  <%= dropdown_menu do %>
 
-    <%= active_link_to Spree.t('admin.gift_cards.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>
+    <%= active_link_to Spree.t('admin.gift_cards.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil, redeemed: nil, partially_redeemed: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[active expired redeemed partially_redeemed] ).all?(&:blank?) %>
     
     <%= link_to Spree.t('admin.gift_cards.active'),
-      params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :active}}),
-      class: "dropdown-item #{'active' if params[:q] && params[:q][:status_eq] == 'active'}" %>
+      params.to_unsafe_h.deep_merge({page: nil, q: {active: true, expired: nil, redeemed: nil, partially_redeemed: nil}}),
+      class: "dropdown-item #{'active' if params[:q] && params[:q][:active].present?}" %>
     
-    <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :expired}}),
-      class: "dropdown-item #{'active' if params[:q] && params[:q][:status_eq] == 'expired'}" do %>
+    <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {expired: true, active: nil, redeemed: nil, partially_redeemed: nil}}),
+      class: "dropdown-item #{'active' if params[:q] && params[:q][:expired].present?}" do %>
         <%= Spree.t(:expired) %>
     <% end %>
 
-    <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: :redeemed}}),
-      class: "dropdown-item #{'active' if params[:q] && params[:q][:status_eq] == 'redeemed'}" do %>
+    <%= link_to params.to_unsafe_h.deep_merge({page: nil, q: {redeemed: true, active: nil, expired: nil, partially_redeemed: nil}}),
+      class: "dropdown-item #{'active' if params[:q] && params[:q][:redeemed].present?}" do %>
         <%= Spree.t('admin.gift_cards.redeemed') %>
     <% end %>
 
-  </div>
-</div>
+  <% end %>
+<% end %>

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

@@ -5,14 +5,14 @@
 
   <% content_for :page_actions do %>
     <%= render_admin_partials(:gift_cards_actions_partials) %>
-    <%= link_to spree.admin_gift_cards_path(q: params[:q].to_unsafe_hash, per_page: params[:per_page], format: :csv), id: 'gift-card-batch-export-link', class: 'btn btn-light bg-transparent with-tip', title: 'Export gift cards to a CSV file' do %>
-      <%= icon 'table-export', class: 'mr-2' %>
-      <%= Spree.t(:export) %>
-    <% end %>
+    <%= link_to_export_modal %>
 
-    <div class="dropdown" id="page_actions_dropdown">
-      <%= link_to_with_icon 'plus', Spree.t(:new_gift_card), '#', class: 'text-nowrap btn btn-primary align-self-center', data: { toggle: 'dropdown' }, id: 'more-actions-link' %>
-      <div class="dropdown-menu dropdown-menu-right">
+    <%= dropdown id: 'page_actions_dropdown' do %>
+      <%= dropdown_toggle class: 'text-nowrap btn-primary align-self-center', id: 'more-actions-link' do %>
+        <%= icon 'plus' %>
+        <%= Spree.t(:new_gift_card) %>
+      <% end %>
+      <%= dropdown_menu class: 'dropdown-menu-right' do %>
         <%= link_to spree.new_admin_gift_card_path,
               class: 'text-left dropdown-item'  do %>
           <%= icon 'add' %>
@@ -24,8 +24,8 @@
           <%= icon 'add' %>
           <%= Spree.t(:gift_card_batch) %>
         <% end %>
-      </div>
-    </div>
+      <% end %>
+    <% end %>
   <% end %>
 <% end %>
 
@@ -38,7 +38,10 @@
       <%= render 'list' %>
     <% end %>
   <% else %>
-    <%= render 'filters' %>
-    <%= render 'list' %>
+    <%= turbo_frame_tag "gift_cards", autoscroll: true, data: { autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
+      <%= render 'spree/admin/shared/export_modal', export_type: Spree::Exports::GiftCards %>
+      <%= render 'filters' %>
+      <%= render 'list' %>
+    <% end %>
   <% end %>
 </div>

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

@@ -1,30 +1 @@
-<% content_for :page_title do %>
-  <% if @user.present? %>
-    <%= page_header_back_button spree.admin_user_path(@user) %>
-  <% else %>
-    <%= page_header_back_button spree.admin_gift_cards_path %>
-  <% end %>
-
-  <%= Spree.t(:new_gift_card) %>
-<% end %>
-
-<% url = @user.present? ? spree.admin_user_gift_cards_path(@user) : spree.admin_gift_cards_path %>
-
-<%= form_for @object, url: url do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title">
-            <%= Spree.t(:new_gift_card) %>
-          </h5>
-        </div>
-        <div class="card-body">
-          <%= render 'form', f: f %>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -41,9 +41,9 @@
             <table class="table">
               <thead>
                 <tr>
-                  <th><%= Spree.t(:order) %></th>
-                  <th><%= Spree.t(:status) %></th>
-                  <th><%= Spree.t(:customer) %></th>
+                  <th scope="col"><%= Spree.t(:order) %></th>
+                  <th scope="col"><%= Spree.t(:status) %></th>
+                  <th scope="col"><%= Spree.t(:customer) %></th>
                   <th class="text-right"><%= I18n.t('activerecord.attributes.spree/gift_card.amount_used') %></th>
                   <th class="text-right"><%= Spree.t(:total) %></th>
                 </tr>
@@ -164,7 +164,7 @@
                 <%= Spree.t(:expires_at) %>
               </span>
               <% if @object.expires_at %>
-                <span><%= local_time(@object.expires_at) %></span>
+                <span><%= spree_time(@object.expires_at) %></span>
               <% else %>
                 <span class="text-muted"><%= Spree.t(:not_available) %></span>
               <% end %>
@@ -189,7 +189,7 @@
               <span class="text-muted">
                 <%= Spree.t(:created_at) %>
               </span>
-              <span><%= local_time(@object.created_at) %></span>
+              <span><%= spree_time(@object.created_at) %></span>
             </li>
           </ul>
         </div>

data/app/views/spree/admin/import_mappings/update.turbo_stream.erb

@@ -0,0 +1,15 @@
+<%= turbo_stream.replace 'footer' do %>
+  <%= render 'spree/admin/imports/mapping_footer', import: @import_mapping.import %>
+<% end %>
+
+<%= turbo_stream.replace "#{spree_dom_id(@import_mapping)}-icon" do %>
+  <%= render 'spree/admin/imports/mapping_icon', mapping: @import_mapping %>
+<% end %>
+
+<% options = @import.unmapped_file_columns.map { |file_column| [file_column, file_column] } %>
+
+<% @import.mappings.where.not(id: @import_mapping.id).each do |mapping| %>
+  <%= turbo_stream.replace spree_dom_id(mapping) + '_form' do %>
+    <%= render 'spree/admin/imports/mapping_form', import: @import, mapping: mapping, options: options %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/import_rows/_variant.html.erb

@@ -0,0 +1 @@
+<%= render "spree/admin/variants/variant", variant: item %>

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

@@ -0,0 +1,32 @@
+<%= turbo_frame_tag :drawer do %>
+  <%= drawer_header(Spree.t(:row) + ' ' + @import_row.row_number.to_s) %>
+
+  <div class="drawer-body" data-controller="highlight tabs">
+    <ul class="nav nav-pills mb-3">
+      <li class="nav-item">
+        <a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select">JSON</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select">Schema</a>
+      </li>
+    </ul>
+
+    <div data-tabs-target="panel" class="animate__animated animate__fadeIn">
+      <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= JSON.pretty_generate(@import_row.data_json) %></code></pre>
+    </div>
+    <div data-tabs-target="panel" hidden class="animate__animated animate__fadeIn">
+      <dl class="row rounded border p-2 overflow-auto" style="height: calc(100dvh - 11rem);">
+        <% @import_row.to_schema_hash.each do |field_name, value| %>
+          <dt class="col-sm-3"><%= field_name.humanize %></dt>
+          <dd class="col-sm-9">
+            <% if value.present? %>
+              <%= h(value) %>
+            <% else %>
+              <span class="text-muted">—</span>
+            <% end %>
+          </dd>
+        <% end %>
+      </dl>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/imports/_footer.html.erb

@@ -0,0 +1,15 @@
+<footer id="footer">
+  <% if import.rows.any? %>
+    <div class="flex-grow-1 d-flex flex-column">  
+      <%= progress_bar_component(import.rows.processed.count, min: 0, max: import.rows_count) %>
+    </div>
+
+    <div>
+      <%= import.rows.processed.count %> / <%= import.rows_count %> rows processed
+    </div>
+  <% elsif import.status != 'failed' %>
+    <div>
+      <%= Spree.t('admin.imports.waiting_for_file_to_be_processed') %>
+    </div>
+  <% end %>
+</footer>