spree_backend 4.1.1 → 4.5.0

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

@@ -6,10 +6,10 @@
           <%= label :new_variant, option_type.presentation %>
           <% if option_type.name == 'color' %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}" } %>
           <% else %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}"  } %>
           <% end %>
         </div>
       <% end %>
@@ -24,6 +24,11 @@
         <%= f.text_field :price, value: number_to_currency(@variant.price, unit: ''), class: 'form-control' %>
       </div>
 
+      <div class="form-group" data-hook="compare_at_price">
+        <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
+        <%= f.text_field :compare_at_price, value: number_to_currency(@variant.compare_at_price, unit: ''), class: 'form-control' %>
+      </div>
+
       <div class="form-group" data-hook="cost_price">
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, value: number_to_currency(@variant.cost_price, unit: ''), class: 'form-control' %>
@@ -35,10 +40,19 @@
       </div>
 
       <div class="form-group" data-hook="discontinue_on">
-
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
-          <%= f.text_field :discontinue_on, value: datepicker_field_value(@variant.discontinue_on), class: 'datepicker form-control' %>
+          <div class="input-group datepicker"
+               data-wrap="true"
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>">
+            <%= f.text_field :discontinue_on,
+                             value: datepicker_field_value(@variant.discontinue_on),
+                             placeholder: Spree.t(:select_a_date),
+                             class: 'form-control',
+                             'data-input':'' %>
+
+            <%= render partial: 'spree/admin/shared/cal_close' %>
+          </div>
       </div>
     </div>
   </div>

data/app/views/spree/admin/variants/_split.js.erb

@@ -13,7 +13,7 @@
       </optgroup>
       <optgroup label="<%=Spree.t('new_shipment_at_location')%>">
         {{#each variant.stock_items}}
-          <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}&nbsp({{this.count_on_hand}} on hand)</option>
+          <option data-new-shipment='true' value='{{this.stock_location.id}}'>{{this.stock_location.name}}&nbsp({{this.count_on_hand}} on hand)</option>
         {{/each}}
       </optgroup>
       </select>
@@ -21,13 +21,15 @@
     <td>
       <input class="quantity form-control" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
     </td>
-    <td class='actions text-center'>
-      <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
-        <span class="icon icon-arrow-left"></span>
-      </a>
-      <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
-        <span class="icon icon-save"></span>
-      </a>
+    <td class='actions'>
+      <span class='d-flex justify-content-center'>
+        <a href='#' class='cancel-split with-tip btn btn-sm btn-light' title='Cancel'>
+          <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
+        </a>
+        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
+          <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
+        </a>
+      </span>
     </td>
   </tr>
 </script>

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

@@ -3,11 +3,15 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <fieldset>
-    <div data-hook="admin_variant_edit_form">
+  <div class="card mb-0">
+    <div class="card-header">
+      <h5 class="mb-0"><%= @variant.sku || @variant.options_text %></h5>
+    </div>
+    <div class="card-body" data-hook="admin_variant_edit_form">
       <%= render partial: 'form', locals: { f: f } %>
     </div>
-
-    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+    <div class="card-body">
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+    </div>
+  </div>
 <% end %>

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

@@ -4,29 +4,33 @@
 <div id="new_variant" data-hook></div>
 
 <% if @variants.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
-    <thead data-hook="variants_header">
+    <thead data-hook="variants_header" class="text-muted">
       <tr>
-        <th colspan="2"><%= Spree.t(:options) %></th>
+        <th></th>
+        <th><%= sort_link @search, :sku, Spree.t(:sku) %></th>
+        <th><%= Spree.t(:options) %></th>
         <th><%= Spree.t(:price) %></th>
-        <th><%= Spree.t(:sku) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody id="sortVert">
     <% @variants.each do |variant| %>
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <span class="icon icon-move handle"></span>
+            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
           <% end %>
         </td>
-        <td><%= variant.options_text %></td>
-        <td><%= variant.display_price.to_html %></td>
         <td><%= variant.sku %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
-          <%= link_to_delete(variant, no_text: true) if can?(:destroy, variant) && !variant.deleted? %>
+        <td><%= variant.options_text %></td>
+        <td><%= display_price(variant) %></td>
+        <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
+            <%= link_to_delete(variant, no_text: true) if can?(:destroy, variant) && !variant.deleted? %>
+          </span>
         </td>
       </tr>
       <% end %>
@@ -37,18 +41,19 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
-  <div class="no-objects-found alert alert-info">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Variant)) %>
-    <% if can?(:create, Spree::Variant) && !@product.empty_option_values? %>
-      - <%= link_to(Spree.t(:add_one), spree.new_admin_product_variant_path(@product)) %>!
+    <% if can?(:create, Spree::Variant) && !@product.empty_option_values? && params.dig(:q, :deleted_at_null).nil? %>
+      - <%= link_to(Spree.t(:add_one), spree.new_admin_product_variant_path(@product)) %>
     <% end %>
   </div>
 <% end %>
 
 <% if @product.empty_option_values? %>
   <% if can?(:modify, Spree::ProductOptionType) %>
-    <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
+    <p class='text-center no-objects-found m-5 first_add_option_types' data-hook="first_add_option_types">
       <%= Spree.t(:to_add_variants_you_must_first_define) %>
       <%= link_to(Spree.t(:option_types), spree.admin_product_url(@product)) %>
       <% if can?(:read, Spree::OptionType) && can?([:create, :read], Spree::OptionValue) %>
@@ -59,8 +64,9 @@
   <% end %>
 <% else %>
   <% content_for :page_actions do %>
-    <%= product_preview_link(@product) %>
-    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
+    <%= external_page_preview_link(@product) %>
+    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add.svg', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
+    <%= button_link_to (@deleted == '1' ? Spree.t(:show_active) : Spree.t(:show_deleted)), spree.admin_product_variants_url(@product, { q: { deleted_at_null: @deleted == '1' ? "0" : "1" } }), { class: 'btn-light', icon: 'filter.svg' } %>
   <% end %>
 <% end %>
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>

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

@@ -3,13 +3,15 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <div class="card mb-3 bg-light">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h5 class="mb-0"><%= Spree.t(:new_variant) %></h5>
+    </div>
     <div class="card-body">
-      <fieldset data-hook="admin_variant_new_form">
-        <legend class="border-bottom"><%= Spree.t(:new_variant) %></legend>
+      <div data-hook="admin_variant_new_form">
         <%= render partial: 'form', locals: { f: f } %>
         <%= render partial: 'spree/admin/shared/new_resource_links' %>
-      </fieldset>
+      </div>
     </div>
   </div>
 <% end %>

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

@@ -0,0 +1,102 @@
+<div data-hook="admin_webhooks_subscriber_form_fields">
+  <%= f.field_container :url, class: ['form-group'] do %>
+    <%= f.label :url, raw(Spree.t('admin.url') + required_span_tag) %>
+    <%= f.text_field :url, class: 'form-control', placeholder: 'https://example.com/endpoint' %>
+    <%= f.error_message_on :url %>
+  <% end %>
+  <div class="form-group">
+    <div class="custom-control custom-switch">
+      <%= f.check_box :active, class: 'custom-control-input' %>
+      <%= f.label :active, class: 'custom-control-label' %>
+    </div>
+  </div>
+
+  Events
+
+  <div data-controller="webhooks_subscriber_events">
+    <%= f.field_container :subscriptions, class: ['form-group'] do %>
+      <div>
+        <div class="radio my-2">
+          <%= 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') %>
+        </div>
+        <div class="radio my-2">
+          <%= 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">
+        <div class="row">
+          <%= event_checkbox_for(:address, f) %>
+          <%= event_checkbox_for(:asset, f) %>
+          <%= event_checkbox_for(:cms_page, f) %>
+          <%= event_checkbox_for(:credit_card, f) %>
+          <%= event_checkbox_for(:customer_return, f) %>
+          <%= event_checkbox_for(:digital_link, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:digital, f) %>
+          <%= event_checkbox_for(:inventory_unit, f) %>
+          <%= event_checkbox_for(:line_item, f) %>
+          <%= event_checkbox_for(:menu_item, f) %>
+          <%= event_checkbox_for(:menu, f) %>
+          <%= event_checkbox_for(:option_type, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:option_value, f) %>
+          <%= event_checkbox_for(:order, f) %>
+          <%= event_checkbox_for(:payment, f) %>
+          <%= event_checkbox_for(:payment_capture_event, f) %>
+          <%= event_checkbox_for(:price, f) %>
+          <%= event_checkbox_for(:product, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:promotion, f) %>
+          <%= event_checkbox_for(:property, f) %>
+          <%= event_checkbox_for(:prototype, f) %>
+          <%= event_checkbox_for(:refund, f) %>
+          <%= event_checkbox_for(:reimbursement, f) %>
+          <%= event_checkbox_for(:return_authorization, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:return_item, f) %>
+          <%= event_checkbox_for(:role, f) %>
+          <%= event_checkbox_for(:shipment, f) %>
+          <%= event_checkbox_for(:shipping_category, f) %>
+          <%= event_checkbox_for(:shipping_method, f) %>
+          <%= event_checkbox_for(:shipping_rate, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:stock_item, f) %>
+          <%= event_checkbox_for(:stock_location, f) %>
+          <%= event_checkbox_for(:stock_movement, f) %>
+          <%= event_checkbox_for(:stock_transfer, f) %>
+          <%= event_checkbox_for(:store_credit, f) %>
+          <%= event_checkbox_for(:store, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:tax_rate, f) %>
+          <%= event_checkbox_for(:taxonomy, f) %>
+          <%= event_checkbox_for(:taxon, f) %>
+          <%= event_checkbox_for(:variant, f) %>
+          <%= event_checkbox_for(:wished_item, f) %>
+          <%= event_checkbox_for(:wishlist, f) %>
+        </div>
+        <div class="row">
+          <%= event_checkbox_for(:zone, f) %>
+          <%= event_checkbox_for(:vendor, f) if defined?(Spree::Vendor) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.webhooks_subscribers.webhooks_subscribers'), spree.admin_webhooks_subscribers_path %> /
+  <%= @webhooks_subscriber.url %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @webhooks_subscriber } %>
+
+<%= form_for [:admin, @webhooks_subscriber] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,55 @@
+<% content_for :page_title do %>
+  <%= Spree.t('admin.webhooks_subscribers.webhooks_subscribers') %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
+<% end if can?(:create, Spree::Webhooks::Subscriber) %>
+
+<% if @webhooks_subscribers.any? %>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table">
+      <thead class="text-muted">
+      <tr>
+        <th><%= Spree.t('admin.url') %></th>
+        <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && !current_spree_vendor %>
+          <th><%= Spree.t(:vendor) %></th>
+        <% end %>
+        <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><%= Spree.t('admin.webhooks_subscribers.all_events') %></th>
+        <th></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @webhooks_subscribers.each do |webhooks_subscriber| %>
+        <tr id="<%= spree_dom_id webhooks_subscriber %>">
+          <td><code><%= webhooks_subscriber.url %></code></td>
+          <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && !current_spree_vendor %>
+            <td>
+              <%= link_to webhooks_subscriber.vendor.name, spree.admin_vendor_path(webhooks_subscriber.vendor) if webhooks_subscriber.vendor.present? %>
+            </td>
+          <% end %>
+          <td><%= active_badge(webhooks_subscriber.active) %></td>
+          <td><%= webhooks_subscriber.subscriptions&.join(', ') %></td>
+          <td><%= webhooks_subscriber.events.order(:created_at).last&.created_at %></td>
+          <td><%= link_to Spree.t(:view), admin_webhooks_subscriber_path(webhooks_subscriber) %></td>
+          <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(webhooks_subscriber, no_text: true) if can? :edit, webhooks_subscriber %>
+            <%= link_to_delete(webhooks_subscriber, no_text: true) if can? :delete, webhooks_subscriber %>
+          </span>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+  <%= render 'spree/admin/shared/index_table_options', collection: @webhooks_subscribers, simple: true %>
+<% else %>
+  <div class="text-center no-objects-found m-5">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Webhooks::Subscriber)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Webhooks::Subscriber %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.webhooks_subscribers.webhooks_subscribers'), spree.admin_webhooks_subscribers_path %> /
+  <%= Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber') %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @webhooks_subscriber } %>
+
+<%= form_for [:admin, @webhooks_subscriber] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,59 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.webhooks_subscribers.webhooks_subscribers'), spree.admin_webhooks_subscribers_path %> /
+  <%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>
+<% end %>
+
+<fieldset>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table border rounded">
+      <tr>
+        <td><strong><%= Spree.t('admin.url') %></strong></td>
+        <td><%= @webhooks_subscriber.url %></td>
+      </tr>
+      <tr>
+        <td><strong><%= Spree.t('admin.active') %></strong></td>
+        <td><%= active_badge(@webhooks_subscriber.active) %></td>
+      </tr>
+      <tr>
+        <td><strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong></td>
+        <td><%= @webhooks_subscriber.subscriptions&.join(', ') %></td>
+      </tr>
+    </table>
+  </div>
+</fieldset>
+
+<% if @events.any? %>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table">
+      <thead class="text-muted">
+      <tr>
+        <th><%= Spree.t('admin.name') %></th>
+        <th><%= Spree.t('admin.successful') %></th>
+        <th><%= Spree.t('admin.created_at') %></th>
+        <th><%= Spree.t('admin.response_code') %></th>
+        <th><%= Spree.t('admin.execution_time') %></th>
+        <th><%= Spree.t('admin.request_errors') %></th>
+        <th></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @events.each do |event| %>
+        <tr id="<%= spree_dom_id event %>">
+          <td><%= event.name %></td>
+          <td><%= active_badge(event.success) %></td>
+          <td><%= event.created_at %></td>
+          <td><%= event.response_code %></td>
+          <td><%= event.execution_time %></td>
+          <td><%= sanitize event.request_errors.gsub('[SPREE WEBHOOKS]', '') %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  </div>
+  <%= render 'spree/admin/shared/index_table_options', collection: @events, simple: true %>
+
+<% else %>
+  <div class="text-center no-objects-found m-5">
+    <%= Spree.t('admin.webhooks_subscribers.no_events') %>
+  </div>
+<% end %>

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

@@ -1,16 +1,16 @@
 <div id="country_members" data-hook="member">
   <div class="card mb-3">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:countries) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">
-      <%= zone_form.field_container :country_ids, class: ['form-group'] do %>
+      <%= zone_form.field_container :country_ids do %>
         <%= zone_form.label :country_ids, Spree.t(:countries) %>
         <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { multiple: true, class: "select2" } %>
       <% end %>
     </div>
-  </div>  
+  </div>
 </div>

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

@@ -2,17 +2,17 @@
   <div class="col-12 col-lg-6" data-hook="admin_zone_form_fields">
     <div class="card mb-3">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5"><%= Spree.t(:general_settings)%></h1>
+        <h5 class="card-title mb-0 h6"><%= Spree.t(:general_settings) %></h5>
       </div>
 
       <div class="card-body">
-        <%= zone_form.field_container :name, class: ['form-group'] do %>
+        <%= zone_form.field_container :name do %>
           <%= zone_form.label :name, Spree.t(:name) %>
           <%= zone_form.text_field :name, class: 'form-control' %>
           <%= zone_form.error_message_on :name %>
         <% end %>
 
-        <%= zone_form.field_container :description, class: ['form-group'] do %>
+        <%= zone_form.field_container :description do %>
           <%= zone_form.label :description, Spree.t(:description) %>
           <%= zone_form.text_field :description, class: 'form-control' %>
         <% end %>
@@ -43,7 +43,7 @@
     </div>
   </div>
   <div class="col-12 col-lg-6">
-    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 </div>

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

@@ -1,13 +1,13 @@
 <div id="state_members" data-hook="member">
   <div class="card mb-3">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:states) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">
-      <%= zone_form.field_container :state_ids, class: ['form-group'] do %>
+      <%= zone_form.field_container :state_ids do %>
         <%= zone_form.label :state_ids, Spree.t(:states) %>
         <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2" } %>
       <% end %>

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

@@ -3,14 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
-
 <% if @zones.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_zones' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="zones_header">
         <th><%= sort_link @search,:name, Spree.t(:name), title: 'zones_order_by_name_title' %></th>
         <th>
@@ -25,20 +24,23 @@
         <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
           <td><%= zone.name %></td>
           <td><%= zone.description %></td>
-          <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
-            <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
+          <td><%= active_badge(zone.default_tax?) %></td>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
+              <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
+            </span>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Zone)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Zone %>!
   </div>
 <% end %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
+<%= paginate @zones, theme: 'admin-twitter-bootstrap-4' %>

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

@@ -6,6 +6,6 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render partial: 'form', locals: { zone_form: zone_form } %>  
+  <%= render partial: 'form', locals: { zone_form: zone_form } %>
   <%= render partial: 'spree/admin/shared/new_resource_links' %>
 <% end %>