spree_admin 5.0.2 → 5.1.0.beta

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

@@ -9,12 +9,14 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:country) %></th>
             <th><%= Spree.t(:active) %>?</th>
-            <th><%= Spree.t(:default) %>?</th>
+            <% if can?(:mark_as_default, Spree::StockLocation) %>
+              <th><%= Spree.t(:default) %>?</th>
+            <% end %>
             <th></th>
           </tr>
         </thead>

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

@@ -15,7 +15,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_products">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th scope="col"><%= Spree.t(:number) %></th>
             <th scope="col"><%= Spree.t(:reference) %></th>

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

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

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

@@ -1,7 +1,7 @@
 <% if @store_credits.any? %>
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <th><%= Spree.t(:currency) %></th>
         <th><%= Spree.t('store_credit.allocated') %></th>
         <th><%= Spree.t('store_credit.authorized') %></th>

data/app/views/spree/admin/stores/edit_emails.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :set_customer_support_email, class: 'w-100' do %>
   <%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %>
     <div class="form-group">
-      <%= f.label :customer_support_email, 'Customer support email' %>
+      <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
       <%= f.email_field :customer_support_email, class: 'form-control', required: true %>
     </div>
     <div class="d-flex justify-content-between">

data/app/views/spree/admin/stores/form/_basic.html.erb

@@ -157,4 +157,4 @@
   </div>
 </div>
 
-<%= render_admin_partials(:store_form_partials, f: f) %>
+<%= render_admin_partials(:store_form_partials, f: f, store: @store) %>

data/app/views/spree/admin/stores/form/_emails.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:page_title) do %>
-  Email settings
+  <%= Spree.t(:emails) %>
 <% end %>
 
 <div class="row">

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

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

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

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

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

@@ -17,7 +17,7 @@
   <% if @taxonomies.present? %>
     <div class="table-responsive">
       <table class="table" id='listing_taxonomies'>
-        <thead class="text-muted">
+        <thead>
           <tr data-hook="listing_taxonomies_header">
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:name) %></th>

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

@@ -44,7 +44,7 @@
           </div>
         </div>
         <div class="card-body border-top pt-4 d-none" data-reveal-target="item">
-          <h6><%= Spree.t(:conditions) %></h6>
+          <h6><%= Spree.t(:rules) %></h6>
           <%= render 'spree/admin/taxons/rules_form', f: f %>
         </div>
       </div>
@@ -52,7 +52,7 @@
       <% if @taxon.automatic? %>
         <div class="card mb-4">
           <div class="card-header">
-            <h5 class="card-title"><%= Spree.t(:conditions) %></h5>
+            <h5 class="card-title"><%= Spree.t(:rules) %></h5>
           </div>
           <div class="card-body">
             <div class="alert alert-info mb-3"><%= Spree.t('admin.taxon_types.automatic_info') %></div>

data/app/views/spree/admin/themes/_theme.html.erb

@@ -1,13 +1,15 @@
 <tr id="<%= spree_dom_id theme %>">
   <td class="w-70 p-0">
     <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3' do %>
-      <%= render 'spree/admin/themes/theme_preview_image', theme: theme %>
+      <div class="w-20">
+        <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'img-thumbnail w-100' %>
+      </div>
 
-      <div class="d-flex flex-column ml-3">
+      <div class="d-flex flex-column ml-3 w-80">
         <strong><%= theme.name %></strong>
         <p class="mb-0 mt-1">
           <span class="text-muted">
-            <%= Spree.t(:updated) %>: 
+            <%= Spree.t(:updated_at) %>: 
             <%= local_time_ago(theme.updated_at, class: 'with-tip') %>
           </span>
         </p>
@@ -38,7 +40,7 @@
         <%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %>
         <div class="dropdown">
           <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= icon('dots', class: 'mr-0') %>
+            <%= icon('dots-vertical', class: 'mr-0') %>
           </button>
           <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
             <%= link_to_edit theme, class: 'dropdown-item' %>

data/app/views/spree/admin/themes/_theme_preview_image.html.erb

@@ -1,15 +1,17 @@
 <% width ||= 120 %>
 <% height ||= 72 %>
+<% css_class ||= 'img-thumbnail border-0' %>
 
 <% if theme.screenshot.attached? && theme.screenshot.variable? %>
-  <%= spree_image_tag(theme.screenshot, width: width, height: height, class: 'img-thumbnail', style: "width: #{width}px; height: #{height}px", loading: :lazy) %>
+  <%= image_tag(spree_image_url(theme.screenshot, width: width, height: height), class: css_class, loading: :lazy) %>
 <% elsif theme.class.preview_image_url.present? %>
   <%= image_tag(
   theme.class.preview_image_url,
-  class: 'img-thumbnail',
-  style: "width: #{width}px; height: #{height}px",
+  class: css_class,
   loading: :lazy
 ) %>
 <% else %>
-  <%= render 'spree/admin/shared/no_image', width: width, height: height %>
+  <div class="rounded bg-light text-muted d-flex align-items-center justify-content-center img-fluid" style="height: <%= height %>px">
+    <%= icon('camera-off', class: 'text-muted opacity-50') %>
+  </div>
 <% end %>

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

@@ -29,7 +29,7 @@
 <div class="card-lg">
   <div class="table-responsive rounded-lg">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th class="bg-transparent"><%= Spree.t(:theme) %></th>
           <th class="bg-transparent"><%= Spree.t(:status) %></th>

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

@@ -15,7 +15,7 @@
     <%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
       <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
             <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>

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

@@ -0,0 +1,21 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:change_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: resource } %>
+  <%= f.hidden_field :reset_password_token %>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password_confirmation, Spree.t(:confirm_password), required: true, class: 'form-label' %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,12 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:forgot_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), data: { turbo_frame: :_top }) do |f| %>
+  <div class="form-group mb-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@apple.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,16 @@
+<% content_for(:title, Spree.t(:login)) %>
+
+<h1 class="mb-3 font-weight-light">Welcome back</h1>
+<%= form_for resource, as: resource_name, url: session_path(resource_name), data: { controller: 'enable-button', turbo: false } do |f| %>
+  <div class="form-group mb-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@getvendo.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <%= f.password_field :password, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '********', autocomplete: 'current-password' %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>
-  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record?, required: true %>
+  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record? %>
   <%= f.error_message_on :email %>
 </div>
 <div class="form-group">
@@ -22,13 +22,15 @@
   <%= f.label :tag_list, Spree.t(:tags) %>
   <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>
 </div>
-<div class="form-group">
-  <%= f.label :spree_role_ids, Spree.t(:roles) %>
-  <%= f.select :spree_role_ids,
-          options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
-          { prompt: false },
-          { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
-</div>
+<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>
+  <div class="form-group">
+    <%= f.label :spree_role_ids, Spree.t(:roles) %>
+    <%= f.select :spree_role_ids,
+            options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
+            { prompt: false },
+            { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
+  </div>
+<% end %>
 <div class="custom-control custom-checkbox mb-3">
   <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>
   <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>

data/app/views/spree/admin/users/_user.html.erb

@@ -1,17 +1,18 @@
-<tr id="<%= spree_dom_id user %>">
+<tr id="<%= spree_dom_id user %>" data-controller="row-link">
   <td class="pr-0 w-5">
     <%= bulk_operations_checkbox(user) %>
   </td>
-  <td class='user_name w-50 no-wrap py-0 pl-1 pr-0'>
+  <td class='w-50 text-nowrap py-0 pl-1 pr-0'>
     <%= render 'spree/admin/shared/user', user: user %>
   </td>
-  <td class="no-wrap">
+  <td class="cursor-pointer" data-action="click->row-link#openLink">
     <%= active_badge(user.accepts_email_marketing?) %>
   </td>
-  <td class="w-25 no-wrap">
+  <td class="w-25 cursor-pointer" data-action="click->row-link#openLink">
     <%= customer_location_flag(user) %>
     <%= customer_location(user) %>
   </td>
-  <td class='user_num_orders w-10 no-wrap'><%= user.completed_orders_for_store(current_store).count %></td>
-  <td class='user_amount_spent w-10 no-wrap'><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
 </tr>

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

@@ -3,15 +3,15 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip mr-2 d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
-    <%= icon 'table-export', class: 'mr-2' %>
+  <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
+    <%= icon 'table-export' %>
     <%= Spree.t(:export) %>
-  <% end if can?(:export, Spree::Export) %>
+  <% end if can?(:create, Spree::Export) %>
   
   <%= render 'extra_actions' %>
 
-  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" %>
-<% end if can? :create, Spree::user_class %>
+  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
+<% end %>
 
 <div class="card-lg">
   <%= render "spree/admin/users/filters" %>
@@ -43,7 +43,7 @@
 
         <div class="table-responsive">
           <table class="table" id="listing_users">
-            <thead class="text-muted">
+            <thead>
               <tr data-hook="admin_users_index_headers">
                 <th scope="col" class="pr-0 w-5">
                   <%= bulk_operations_select_all_checkbox %>
@@ -53,6 +53,7 @@
                 <th><%= Spree.t(:location) %></th>
                 <th><%= Spree.t('admin.num_orders') %></th>
                 <th><%= Spree.t('admin.amount_spent') %></th>
+                <th><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
               </tr>
             </thead>
             <tbody>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_users_path %>
-  <%= Spree.t(:new_user) %>
+  <%= Spree.t(:new_customer) %>
 <% end %>
 
 <%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>

data/app/views/spree/admin/variants/_search_result.html.erb

@@ -1,6 +1,6 @@
 <div class="search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">
   <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>
-  <label for="ids_<%= variant.id %>" class="pr-2">
+  <label for="ids_<%= variant.id %>" class="pr-2 <% unless variant.purchasable? %>cursor-not-allowed<% end %>">
     <div class="w-70 d-flex align-items-center">
       <div class="variant-image">
         <%= render 'spree/admin/shared/product_image', object: variant %>

data/app/views/spree/admin/variants/form/_media.html.erb

@@ -19,6 +19,7 @@
           asset_uploader_viewable_id_value: viewable&.id,
           asset_uploader_viewable_type_value: 'Spree::Variant',
           asset_uploader_allowed_file_types_value: allowed_file_types_for_upload,
+          asset_uploader_admin_assets_path_value: spree.admin_assets_path,
           action: 'asset-uploader#open',
           media_form_target: 'addButton'
         }  do %>

data/app/views/spree/admin/variants/form/_media_asset.html.erb

@@ -1,4 +1,4 @@
-<div id="<%= spree_dom_id(asset) %>" class="media-form__image border border-gray-200" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
+<div id="<%= spree_dom_id(asset) %>" class="media-form__image" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">
   <div class="custom-control custom-checkbox d-none">
     <%= check_box_tag "ids[]", asset.id, false, class: "custom-control-input", id: "#{asset.id}-checkbox", data: { media_form_target: "checkbox", action: 'media-form#showDeleteButton' } %>
     <label class="custom-control-label" for="<%= asset.id %>-checkbox"><span></span></label>

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

@@ -30,33 +30,51 @@
           <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
         </h5>
       </div>
-      <div class="card-body" data-controller="webhooks-subscriber-events">
+      <div class="card-body" data-controller="reveal">
         <div class="form-group">
           <div>
-            <div class="radio my-2">
+            <div class="custom-control custom-radio mb-3">
               <%= radio_button_tag :subscribe_to_all_events, true,
                                subscribe_to_all_events?,
                                {
-                                 'data-action' => 'webhooks-subscriber-events#hideCheckboxes',
-                                 'data-webhooks-subscriber-events-target' => 'subscribeToAll',
-                                  class: 'events' } %>
-              <%= label_tag :subscribe_to_all_events_true, Spree.t('admin.webhooks_subscribers.subscribe_to_all_events') %>
+                                 'data-action' => 'click->reveal#hide',
+                                  class: 'custom-control-input events' } %>
+              <%= label_tag :subscribe_to_all_events_true, Spree.t('admin.webhooks_subscribers.subscribe_to_all_events'), class: 'custom-control-label' %>
             </div>
-            <div class="radio my-2">
+            <div class="custom-control custom-radio">
               <%= radio_button_tag :subscribe_to_all_events, false,
                                !subscribe_to_all_events?,
-                               { 'data-action' => 'webhooks-subscriber-events#showCheckboxes',
-                                 class: 'events' } %>
-              <%= label_tag :subscribe_to_all_events_false, Spree.t('admin.webhooks_subscribers.select_events') %>
-            </div>
-          </div>
-          <br/>
-          <div data-webhooks-subscriber-events-target="eventsCheckboxesContainer" class="<%= subscribe_to_all_events? ? 'd-none' : '' %>">
-            <div class="row" >
-              <% Spree::Webhooks::Subscriber.supported_events.each_with_index do |se, index| %>
-                <% record, _ = se %>
-                <%= event_checkbox_for(record, f) %>
-              <% end %>
+                               { 'data-action' => 'click->reveal#show',
+                                 class: 'custom-control-input events' } %>
+              <%= label_tag :subscribe_to_all_events_false, Spree.t('admin.webhooks_subscribers.select_events'), class: 'custom-control-label' %>
+
+              <div data-reveal-target="item" class="<%= subscribe_to_all_events? ? 'hidden' : '' %>">
+                <div class="bg-light rounded-lg p-3 mt-3">
+                  <% @supported_events.each do |event| %>
+                    <div class="form-group">
+                      <div class="custom-control custom-switch">
+                        <% resource_name = event.first %>                        
+                        <%= f.check_box resource_name, 
+                          { class: 'events-checkbox custom-control-input',
+                            checked: @webhooks_subscriber.subscriptions&.any? { |event| event.include? "#{resource_name}." } },
+                          true, 
+                          nil %>
+                          
+                        <%= f.label resource_name, class: 'custom-control-label w-100' do %> 
+                          <%= Spree.t("#{resource_name.to_s.pluralize}") %>
+                          <p class="gap-2 mb-0 mt-1">
+                            <% event.last.each do |event| %>
+                              <span class="badge badge-light">
+                                <%= event %>
+                              </span>
+                            <% end %>
+                          </p>
+                        <% end %>
+                      </div>
+                    </div>
+                  <% end %>
+                </div>
+              </div>
             </div>
           </div>
         </div>

data/app/views/spree/admin/webhooks_subscribers/_webhooks_subscriber.html.erb

@@ -1,16 +1,22 @@
 <tr id="<%= spree_dom_id webhooks_subscriber %>" data-controller="row-link" class="cursor-pointer">
-  <td data-action="click->row-link#openLink">
+  <td class="w-40 text-wrap" data-action="click->row-link#openLink">
     <%= webhooks_subscriber.url %>
   </td>
-  <td data-action="click->row-link#openLink"><%= active_badge(webhooks_subscriber.active) %></td>
-  <td class="w-20" data-action="click->row-link#openLink">
+  <td class="w-5" data-action="click->row-link#openLink"><%= active_badge(webhooks_subscriber.active) %></td>
+  <td class="w-30 text-wrap" data-action="click->row-link#openLink">
     <% webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>
       <span class="badge badge-light"><%= subscription %></span>
     <% end %>
   </td>
-  <td data-action="click->row-link#openLink"><%= local_time(webhooks_subscriber.latest_event_at) %></td>
-  <td class="actions">
-    <%= link_to_with_icon 'eye', Spree.t(:view), admin_webhooks_subscriber_path(webhooks_subscriber), class: "btn btn-light btn-sm", data: { row_link_target: 'link' } %>
+  <td class="w-10" data-action="click->row-link#openLink">
+    <% if webhooks_subscriber.latest_event_at %>
+      <%= local_time(webhooks_subscriber.latest_event_at) %>
+    <% else %>
+      <span class="text-muted"><%= Spree.t(:not_available) %></span>
+    <% end %>
+  </td>
+  <td class="w-15">
+    <%= link_to_with_icon 'eye', Spree.t(:view), spree.admin_webhooks_subscriber_path(webhooks_subscriber), class: "btn btn-light btn-sm", data: { row_link_target: 'link' } %>
     <%= link_to_edit(webhooks_subscriber) if can? :edit, webhooks_subscriber %>
   </td>
 </tr>

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

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_webhooks_subscribers_path %>
+  <%= page_header_back_button spree.admin_webhooks_subscriber_path(@webhooks_subscriber) %>
   <%= @webhooks_subscriber.url %>
 <% end %>
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @webhooks_subscriber } %>
-<%= form_for [:admin, @webhooks_subscriber] do |f| %>
+<%= form_for [:admin, @webhooks_subscriber], html: { id: "edit_subscriber_#{@webhooks_subscriber.id}" } do |f| %>
   <%= render 'form', f: f %>
   <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

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

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