spree_admin 5.0.0 → 5.0.2

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

@@ -3,28 +3,30 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_tax_categories_link' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_tax_category), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::TaxCategory %>
 
-<%= render partial: 'spree/admin/shared/tax_nav' %>
+<%= render 'spree/admin/shared/tax_nav' %>
 
-<% if @tax_categories.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_tax_categories'>
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:tax_code) %></th>
-          <th><%= Spree.t(:description) %></th>
-          <th><%= Spree.t(:default) %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render collection: @tax_categories, partial: 'spree/admin/tax_categories/tax_category', cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:tax_code) %></th>
+            <th><%= Spree.t(:description) %></th>
+            <th><%= Spree.t(:default) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render collection: @collection, partial: 'spree/admin/tax_categories/tax_category', cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -3,30 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_tax_rate), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::TaxRate %>
 
-<%= render partial: 'spree/admin/shared/tax_nav' %>
+<%= render 'spree/admin/shared/tax_nav' %>
 
-<% if @tax_rates.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_tax_rates'>
-      <thead class="text-muted">
-        <tr data-hook="rate_header">
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:tax_category) %></th>
-          <th><%= Spree.t(:zone) %></th>
-          <th><%= Spree.t(:amount) %></th>
-          <th><%= Spree.t(:included_in_price) %></th>
-          <th><%= Spree.t(:show_rate_in_label) %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/tax_rates/tax_rate', collection: @tax_rates, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr data-hook="rate_header">
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:tax_category) %></th>
+            <th><%= Spree.t(:zone) %></th>
+            <th><%= Spree.t(:amount) %></th>
+            <th><%= Spree.t(:included_in_price) %></th>
+            <th><%= Spree.t(:show_rate_in_label) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render partial: 'spree/admin/tax_rates/tax_rate', collection: @collection, cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -3,11 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, { class: "btn-primary", icon: "plus" } %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_taxonomy), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Taxonomy) %>
 
-<div class="card-lg p-0">
-  <%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<div class="card-lg">
+  <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
 
     <%= render "spree/admin/shared/filter_badge_template" %>
@@ -22,7 +22,7 @@
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:taxons) %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody

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

@@ -4,8 +4,8 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxon), spree.new_admin_taxonomy_taxon_path(@taxonomy), icon: 'plus', class: 'no-wrap btn btn-primary align-self-center' %>
-<% end %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_taxon), spree.new_admin_taxonomy_taxon_path(@taxonomy), class: 'btn btn-primary' %>
+<% end if can?(:create, Spree::Taxon) %>
 
 <% content_for :page_actions_dropdown do %>
   <%= link_to_edit(@taxonomy.root, url: spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), class: 'text-left dropdown-item') %>

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

@@ -2,16 +2,7 @@
 <% height ||= 72 %>
 
 <% if theme.screenshot.attached? && theme.screenshot.variable? %>
-  <%= image_tag(
-        main_app.cdn_image_url(
-          theme.screenshot.variant(
-            spree_image_variant_options(resize_to_fill: [width * 2, height * 2])
-          )
-        ),
-        class: 'img-thumbnail',
-        style: "width: #{width}px; height: #{height}px",
-        loading: :lazy
-  ) %>
+  <%= spree_image_tag(theme.screenshot, width: width, height: height, class: 'img-thumbnail', style: "width: #{width}px; height: #{height}px", loading: :lazy) %>
 <% elsif theme.class.preview_image_url.present? %>
   <%= image_tag(
   theme.class.preview_image_url,

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

@@ -26,7 +26,7 @@
   <% end %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <div class="table-responsive rounded-lg">
     <table class="table">
       <thead class="text-muted">
@@ -44,7 +44,7 @@
 </div>
 
 <% if available_themes.any? %>
-  <div class="card-lg p-0">
+  <div class="card-lg">
     <div class="card-header">
       <h5 class="card-title">Add a new theme</h5>
     </div>

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

@@ -1,10 +1,8 @@
-<div class="container">
-  <div class="card">
-    <div class="card-body">
-      <p>To use translations, configure more than one locale for the store.</p>
-      <% if can?(:edit, current_store) %>
-        <%= button_link_to('Configure store', spree.edit_admin_store_path(current_store)) %>
-      <% end %>
-    </div>
+<div class="card">
+  <div class="card-body">
+    <p>To use translations, configure more than one locale for the store.</p>
+    <% if can?(:edit, current_store) %>
+      <%= link_to_with_icon 'settings', 'Configure store', spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-light' %>
+    <% end %>
   </div>
 </div>

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

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
 
@@ -71,12 +71,7 @@
         </div>  
       </div>
     </div>
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -43,7 +43,7 @@
 
       <div class="col-lg-4">
         <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
-          <span class="text-muted"><%= Spree.t('admin.member_since') %></span>
+          <span class="text-muted"><%= Spree.t(:created_at) %></span>
           <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
             <%= local_time(@user.created_at) %>
           </span>

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

@@ -36,7 +36,7 @@
 
   <% if can?(:read, Spree::Order) %>
     <div class="tab-pane fade <%= 'show active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2">
-      <div class="card-lg p-0">
+      <div class="card-lg">
         <%= turbo_frame_tag :orders_list, src: spree.admin_user_orders_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
           <%= render 'spree/admin/shared/spinner' %>
         <% end %>
@@ -44,7 +44,7 @@
     </div>
 
     <div class="tab-pane fade" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts">
-      <div class="card-lg p-0">
+      <div class="card-lg">
         <%= turbo_frame_tag :orders_list, src: spree.admin_user_checkouts_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
           <%= render 'spree/admin/shared/spinner' %>
         <% end %>
@@ -54,7 +54,7 @@
 
   <% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>
     <div class="tab-pane fade" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards">
-      <div class="card-lg p-0">
+      <div class="card-lg">
         <%= turbo_frame_tag :gift_cards_list, src: spree.admin_user_gift_cards_path(@user, frame_name: :gift_cards_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
           <%= render 'spree/admin/shared/spinner' %>
         <% end %>
@@ -64,7 +64,7 @@
 
   <% if can?(:read, Spree::StoreCredit) %>
     <div class="tab-pane fade" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits">
-      <div class="card-lg p-0">
+      <div class="card-lg">
         <%= turbo_frame_tag :store_credits_list, src: spree.admin_user_store_credits_path(@user, frame_name: :store_credits_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
           <%= render 'spree/admin/shared/spinner' %>
         <% end %>

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

@@ -1,9 +1,6 @@
 <tr id="<%= spree_dom_id user %>">
   <td class="pr-0 w-5">
-    <div class="custom-control custom-checkbox ml-1">
-      <%= check_box_tag "ids[]", user.id, false, class: "custom-control-input", id: "ids_#{user.id}", data: { bulk_operation_target: "checkbox" } %>
-      <label class="custom-control-label" for="ids_<%= user.id %>"><span></span></label>
-    </div>
+    <%= bulk_operations_checkbox(user) %>
   </td>
   <td class='user_name w-50 no-wrap py-0 pl-1 pr-0'>
     <%= render 'spree/admin/shared/user', user: user %>

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

@@ -1,11 +1,6 @@
 <%= turbo_frame_tag :bulk_modal do %>
   <div class="modal-content">
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel">
-        <%= @title %>
-      </h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(@title) %>
     <div class="modal-body">
       <p><%= @body %></p>
 
@@ -13,8 +8,8 @@
         <%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>
       <% end %>
     </div>
-    <div class="modal-footer d-flex justify-content-between">
-      <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+    <div class="modal-footer">
+      <%= modal_discard_button %>
       <%= turbo_save_button_tag %>
     </div>
   </div>

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

@@ -7,61 +7,37 @@
     <%= icon 'table-export', class: 'mr-2' %>
     <%= Spree.t(:export) %>
   <% end if can?(:export, Spree::Export) %>
+  
   <%= render 'extra_actions' %>
-  <%= button_link_to Spree.t(:create_customer), spree.new_admin_user_path, class: "btn-primary", icon: 'plus', id: 'admin_new_user_link' %>
-<% end if can? :create, Spree::user_class %>
 
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
-<% end %>
+  <%= 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 %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/users/filters" %>
 
-  <% if @users.any? %>
+  <% if @collection.any? %>
     <div data-controller="bulk-operation" data-action="keydown.esc->bulk-operation#cancel" tabindex="0">
       <%= form_tag spree.admin_users_path, data: { 'bulk-operation-target': 'form' } do %>
         <%= render 'spree/admin/shared/bulk_modal' %>
         <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
-          <div class="bulk-panel-container animate__animated animate__bounceInUp animate__faster">
-            <div data-toggle="modal" data-target="#bulk-modal">
-              <% if can?(:manage_tags, Spree.user_class) %>
-                <a
-                  href="<%= spree.bulk_modal_admin_users_path(kind: :add_tags) %>"
-                  data-turbo-frame="bulk_modal"
-                  class="btn btn-light mr-2"
-                  data-action="click->bulk-operation#setBulkAction"
-                  data-url="<%= spree.bulk_add_tags_admin_users_path %>"
-                >
-                  <%= icon("tag-plus") %>
-                  <%= Spree.t("admin.bulk_ops.users.title.add_tags") %>
-                </a>
-
-                <a
-                  href="<%= spree.bulk_modal_admin_users_path(kind: :remove_tags) %>"
-                  data-turbo-frame="bulk_modal"
-                  class="btn btn-light mr-3"
-                  data-action="click->bulk-operation#setBulkAction"
-                  data-url="<%= spree.bulk_remove_tags_admin_users_path %>"
-                >
-                  <%= icon("tag-minus") %>
-                  <%= Spree.t("admin.bulk_ops.users.title.remove_tags") %>
-                </a>
-              <% end %>
-            </div>
-
-            <span>
-              <strong data-bulk-operation-target="counter"></strong>
-              customers selected
-            </span>
-
-            <button
-              type="button"
-              class="btn-close ml-2"
-              data-dismiss="modal"
-              aria-label="<%= Spree.t(:close) %>"
-              data-action="bulk-operation#cancel"
-            />
+          <div class="bulk-panel-container">
+            <% if can?(:manage_tags, Spree.user_class) %>
+              <%= bulk_action_link(
+                Spree.t("admin.bulk_ops.users.title.add_tags"),
+                spree.bulk_modal_admin_users_path(kind: :add_tags),
+                icon: "tag-plus",
+                url: spree.bulk_add_tags_admin_users_path
+              ) %>
+              <%= bulk_action_link(
+                Spree.t("admin.bulk_ops.users.title.remove_tags"),
+                spree.bulk_modal_admin_users_path(kind: :remove_tags),
+                icon: "tag-minus",
+                url: spree.bulk_remove_tags_admin_users_path
+              ) %>
+            <% end %>
+            <%= bulk_operations_counter %>
+            <%= bulk_operations_close_button %>
           </div>
         </div>
 
@@ -70,15 +46,7 @@
             <thead class="text-muted">
               <tr data-hook="admin_users_index_headers">
                 <th scope="col" class="pr-0 w-5">
-                  <div class="custom-control custom-checkbox ml-1">
-                    <input
-                      type="checkbox"
-                      class="custom-control-input"
-                      id="checkAllMasterCheckbox"
-                      data-bulk-operation-target="checkboxAll"
-                    >
-                    <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
-                  </div>
+                  <%= bulk_operations_select_all_checkbox %>
                 </th>
                 <th><%= Spree.t(:name) %></th>
                 <th><%= Spree.t(:email_marketing) %></th>
@@ -88,15 +56,14 @@
               </tr>
             </thead>
             <tbody>
-              <%= render collection: @users, partial: "spree/admin/users/user", cached: spree_base_cache_scope %>
+              <%= render collection: @collection, partial: "spree/admin/users/user", cached: spree_base_cache_scope %>
             </tbody>
           </table>
         </div>
       <% end %>
     </div>
+    <%= render "spree/admin/shared/index_table_options", collection: @collection if @collection.any? %>
   <% else %>
     <%= render "spree/admin/shared/no_resource_found" %>
   <% end %>
-
-  <%= render "spree/admin/shared/index_table_options", collection: @users, simple: true if @users.any? %>
 </div>

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

@@ -9,13 +9,7 @@
 
   <div data-toggle="modal" data-target="#modal-lg">
     <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'dialog_modal_lg' } do %>
-      <%= image_tag(
-            main_app.cdn_image_url(
-              asset.attachment.variant(spree_image_variant_options(resize_to_fill: [400, 400]))
-            ),
-            alt: asset.alt,
-            class: 'w-100 d-block h-100 position-absolute'
-          ) %>
+      <%= spree_image_tag(asset.attachment, width: 200, height: 200, alt: asset.alt, class: 'w-100 d-block h-100 position-absolute') %>
     <% end %>
   </div>
 </div>

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

@@ -5,7 +5,7 @@
     </h5>
 
     <% if can?(:manage, Spree::Store) %>
-      <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_currencies'), spree.edit_admin_store_path, class: 'btn btn-sm btn-light' %>
+      <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_currencies'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-sm btn-light' %>
     <% end %>
   </div>
   <div class="card-body p-0">

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

@@ -9,7 +9,7 @@
       <div class="card-body">
         <div class="row">
           <div class="form-group col-12">
-            <%= f.label :url, raw(Spree.t('admin.url') + required_span_tag) %>
+            <%= f.label :url, raw(Spree.t(:url) + required_span_tag) %>
             <%= f.text_field :url, class: 'form-control', placeholder: 'https://example.com/endpoint' %>
             <%= f.error_message_on :url %>
           </div>

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

@@ -1,26 +1,29 @@
 <%= render 'spree/admin/shared/developers_nav' %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
+  <%= link_to_with_icon 'plus', Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Webhooks::Subscriber) %>
-<% if @webhooks_subscribers.any? %>
-  <div class="border rounded bg-white">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t('admin.url') %></th>
-          <th><%= Spree.t('admin.active') %></th>
-          <th><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></th>
-          <th><%= Spree.t('admin.webhooks_subscribers.time_of_last_event') %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/webhooks_subscribers/webhooks_subscriber', collection: @webhooks_subscribers, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-  </div>
-  <%= render 'spree/admin/shared/index_table_options', collection: @webhooks_subscribers, simple: true %>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:url) %></th>
+            <th><%= Spree.t(:active) %></th>
+            <th><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></th>
+            <th><%= Spree.t('admin.webhooks_subscribers.time_of_last_event') %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%= render partial: 'spree/admin/webhooks_subscribers/webhooks_subscriber', collection: @collection, cached: spree_base_cache_scope %>
+        </tbody>
+      </table>
+    </div>
+    <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -5,11 +5,11 @@
 <fieldset class="card mb-4">
   <table class="table card-body pb-0">
     <tr>
-      <td><strong class="text-uppercase"><%= Spree.t('admin.url') %></strong></td>
+      <td><strong class="text-uppercase"><%= Spree.t(:url) %></strong></td>
       <td><%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url %></td>
     </tr>
     <tr>
-      <td><strong><%= Spree.t('admin.active') %></strong></td>
+      <td><strong><%= Spree.t(:active) %></strong></td>
       <td><%= active_badge(@webhooks_subscriber.active) %></td>
     </tr>
     <tr>
@@ -45,7 +45,7 @@
         <%= render partial: 'spree/admin/webhook_events/webhook_event', collection: @events, cached: spree_base_cache_scope %>
       </tbody>
     </table>
-    <%= render 'spree/admin/shared/index_table_options', collection: @events, simple: true %>
+    <%= render 'spree/admin/shared/index_table_options', collection: @events %>
   </div>
 <% else %>
   <div class="text-center no-objects-found m-5">

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_zone), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::Zone %>
 
 <% content_for :page_alerts do %>
@@ -12,34 +12,36 @@
   </div>
 <% end %>
 
-<% if @zones.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_zones'>
-      <thead class="text-muted">
-      <tr>
-        <th><%= sort_link @search,:name, Spree.t(:name), title: 'zones_order_by_name_title' %></th>
-        <th>
-          <%= sort_link @search,:description, Spree.t(:description), {}, {title: 'zones_order_by_description_title'} %>
-        </th>
-        <th><%= Spree.t(:default_tax_zone) %></th>
-        <th class="actions"></th>
-      </tr>
-      </thead>
-      <tbody>
-        <% @zones.each do |zone| %>
-          <tr id="<%= spree_dom_id zone %>" class="cursor-pointer" data-controller="row-link">
-            <td class="w-25" data-action="click->row-link#openLink"><%= zone.name %></td>
-            <td class="w-40 text-muted text-wrap" data-action="click->row-link#openLink"><%= zone.description %></td>
-            <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(zone.default_tax?) %></td>
-            <td class="w-10 actions">
-              <%= link_to_edit(zone, data: { row_link_target: :link }) if can? :edit, zone %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-    <%= render 'spree/admin/shared/index_table_options', collection: @zones, simple: true %>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+        <tr>
+          <th><%= sort_link @search,:name, Spree.t(:name) %></th>
+          <th>
+            <%= sort_link @search,:description, Spree.t(:description) %>
+          </th>
+          <th><%= Spree.t(:default_tax_zone) %></th>
+          <th></th>
+        </tr>
+        </thead>
+        <tbody>
+          <% @collection.each do |zone| %>
+            <tr id="<%= spree_dom_id zone %>" class="cursor-pointer" data-controller="row-link">
+              <td class="w-25" data-action="click->row-link#openLink"><%= zone.name %></td>
+              <td class="w-40 text-muted text-wrap" data-action="click->row-link#openLink"><%= zone.description %></td>
+              <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(zone.default_tax?) %></td>
+              <td class="w-10 actions">
+                <%= link_to_edit(zone, data: { row_link_target: :link }) if can? :edit, zone %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/config/initializers/chartkick.rb

@@ -1,5 +1,5 @@
 Chartkick.options = {
-  colors: ["#007bff"],
+  colors: ["#0090FE"],
   zeros: true,
   points: false
 }