spree_backend 4.1.1 → 4.5.0

data/app/views/spree/admin/shared/sortable_tree/_menu.html.erb

@@ -0,0 +1,33 @@
+<% menu = parent_resource %>
+<% item = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
+  <div class="move-handle d-flex align-items-center p-3">
+    <%= svg_icon(name: 'grip-vertical.svg', width: '20', height: '20') %>
+  </div>
+
+  <div class="d-flex align-items-center overflow-hidden w-100">
+    <div class="overflow-hidden">
+      <%= item.name %>
+      <% if item.link.present? %>
+        <span class="badge badge-pill badge-light badge-light-muted-text">-> <%= item.link %></span>
+      <% end %>
+      <small class="form-text text-muted mt-0">
+        <%= "#{Spree.t('admin.navigation.type')}: #{item.item_type}" %>
+        <%= "| #{Spree.t('admin.navigation.code')}: #{item.code}" if item.code.present? %>
+      </small>
+    </div>
+    <% if item.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.cdn_image_url(item.icon.attachment) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center space-buttons px-2">
+    <%= link_to_edit(item, no_text: true, url: spree.edit_admin_menu_menu_item_path(menu, item)) %>
+    <%= link_to_delete(item, no_text: true, url: spree.admin_menu_menu_item_path(menu, item)) if can?(:destroy, item) %>
+  </div>
+</div>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -0,0 +1,34 @@
+<% taxonomy = parent_resource %>
+<% taxon = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
+  <div class="move-handle d-flex align-items-center p-3">
+    <%= svg_icon(name: 'grip-vertical.svg', width: '20', height: '20') %>
+  </div>
+
+  <div class="d-flex align-items-center overflow-hidden w-100">
+    <div class="overflow-hidden">
+      <%= taxon.name %>
+      <!-- TODO: Taxon Paths do not update in view, fix with Turbo Frames.
+        <h6 class="form-text text-muted mt-0 mb-1">
+          <span class="badge badge-pill badge-light badge-light-muted-text"><%#= svg_icon(name: 'link.svg', width: '16', height: '16') %> <%= taxon.permalink %></span>
+        </h6>
+      -->
+      <small class="form-text text-muted mt-0 mb-1">
+        <%= Spree.t('admin.taxonomies.submenu') %>: <%= active_badge(!taxon.hide_from_nav) %>
+      </small>
+    </div>
+    <% if taxon.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.cdn_image_url(taxon.icon.attachment) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center space-buttons px-2">
+    <%= link_to_edit(taxon, no_text: true, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)) %>
+    <%= link_to_delete(taxon, no_text: true, url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id)) if can?(:destroy, taxon) %>
+  </div>
+</div>

data/app/views/spree/admin/shared/sub_menu/_apps.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-apps" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_apps">
+  <%= tab :oauth_applications, match_path: '/oauth_applications', label: 'oAuth Applications', do_not_titleize: true %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -1,20 +1,16 @@
-<ul data-hook="admin_configurations_sidebar_menu" class="border-top bg-white collapse nav nav-pills nav-stacked" id="sidebar-configuration">
-  <%= configurations_sidebar_menu_item(Spree.t(:general_settings), spree.edit_admin_general_settings_path) if can? :manage, Spree::Config %>
-  <%= configurations_sidebar_menu_item(Spree.t(:stores), spree.admin_stores_path) if can? :manage, Spree::Store %>
+<ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
+  <%= configurations_sidebar_menu_item(Spree.t(:store), spree.edit_admin_store_path(current_store), { is_selected: controller_name == 'stores' }) if can? :manage, current_store %>
   <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
   <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
   <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
 
-  <% if country = Spree::Country.find_by(id: Spree::Config[:default_country_id]) || Spree::Country.first %>
+  <% if country = current_store.default_country %>
     <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
   <% end %>
 
-  <%= configurations_sidebar_menu_item(Spree.t(:payment_methods), spree.admin_payment_methods_path) if can? :manage, Spree::PaymentMethod %>
   <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
   <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
-  <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
   <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
   <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>

data/app/views/spree/admin/shared/sub_menu/_content.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-content" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_content">
+  <%= tab :menus, match_path: '/menus', label: Spree.t('admin.tab.navigation') %>
+  <%= tab :cms_pages, match_path: '/cms_pages', label: Spree.t('admin.tab.pages') %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_integrations.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-integrations" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_integrations">
+  <%= tab :payment_methods, match_path: '/payment_methods', label: 'Payment Methods' if can? :manage, Spree::PaymentMethod %>
+  <%= tab :webhooks_subscribers, match_path: '/webhooks_subscribers', label: 'Webhooks' if can? :manage, Spree::Webhooks::Subscriber %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_orders.html.erb

@@ -0,0 +1,5 @@
+<ul id="sidebar-orders" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_orders">
+  <%= tab :orders, match_path: /completed_at_not_null\%5D\=1/, url: spree.admin_orders_path(q: { completed_at_not_null: '1' }), label: Spree.t('admin.orders.all_orders') %>
+<%= tab :draft_orders, match_path: /cart/, url: spree.admin_orders_path(q: { completed_at_not_null: false, state_eq: :cart}), label: Spree.t('admin.orders.draft_orders') %>
+  <%= tab :abandoned_checkouts, match_path: /state_in/, url: spree.admin_orders_path(q: { completed_at_not_null: false, state_in: %i[address delivery payment confirm]}), label: Spree.t('admin.orders.abandoned_checkouts') %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_organizations.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-organizations" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_organizations">
+  <%= tab :vendors, match_path: '/vendors', label: Spree.t(:vendors) %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_product.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-product" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_product_sub_tabs">
+<ul id="sidebar-product" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_product_sub_tabs">
   <%= tab :products, match_path: '/products' %>
   <%= tab :option_types, match_path: '/option_types' %>
   <%= tab :properties %>

data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-promotions" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_promotion_sub_tabs">
+<ul id="sidebar-promotions" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_promotion_sub_tabs">
   <%= tab :promotions %>
   <%= tab :promotion_categories %>
 </ul>

data/app/views/spree/admin/shared/sub_menu/_returns.html.erb

@@ -1,4 +1,4 @@
-<ul id="sidebar-returns" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_returns_sub_tabs">
+<ul id="sidebar-returns" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_returns_sub_tabs">
   <%= tab :return_authorizations, url: spree.admin_return_authorizations_path, match_path: '/return_authorizations' if can?(:admin, Spree::ReturnAuthorization) %>
   <%= tab :customer_returns, url: spree.admin_customer_returns_path, match_path: '/customer_returns' if can?(:admin, Spree::CustomerReturn) %>
 </ul>

data/app/views/spree/admin/shared/sub_menu/_stock.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-stock" class="collapse nav nav-pills nav-stacked pb-2" data-hook="admin_stock_sub_tabs">
+  <%= tab(:stock_transfers, spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
+  <%= tab(:stock_locations, spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
+</ul>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_category_form_fields">
   <div data-hook="name" class="form-group">
-    <%= f.field_container :name, class: ["form-group"] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>

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

@@ -3,31 +3,35 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add.svg' %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="categories_header">
         <th><%= Spree.t(:name) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
-      <% @shipping_categories.each do |shipping_category|%>
+      <% @shipping_categories.each do |shipping_category| %>
       <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
         <td><%= shipping_category.name %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(shipping_category, no_text: true) if can? :edit, shipping_category %>
-          <%= link_to_delete(shipping_category, no_text: true) if can? :edit, shipping_category %>
+        <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(shipping_category, no_text: true) if can? :edit, shipping_category %>
+            <%= link_to_delete(shipping_category, no_text: true) if can? :edit, shipping_category %>
+          </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::ShippingCategory)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::ShippingCategory %>!
   </div>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
     <div data-hook="admin_shipping_method_form_name_field" class="col-12 col-lg-6">
-      <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.field_container :name do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, class: 'form-control' %>
         <%= f.error_message_on :name %>
@@ -9,9 +9,9 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
-      <%= f.field_container :display_on, class: ['form-group'] do %>
+      <%= f.field_container :display_on do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t("admin.display_on.#{display}"), display.to_s] }, { selected: :both, include_blank: true }, { class: 'select2-clear' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>
@@ -19,7 +19,7 @@
 
   <div class="row">
     <div data-hook="admin_shipping_method_form_internal_name_field" class="col-12 col-lg-4">
-      <%= f.field_container :admin_name, class: ['form-group'] do %>
+      <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <%= f.error_message_on :admin_name %>
@@ -27,7 +27,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_code" class="col-12 col-lg-4">
-      <%= f.field_container :code, class: ['form-group'] do %>
+      <%= f.field_container :code do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, class: 'form-control', label: false %>
         <%= f.error_message_on :code %>
@@ -35,7 +35,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-12 col-lg-4">
-      <%= f.field_container :tracking_url, class: ['form-group'] do %>
+      <%= f.field_container :tracking_url do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
         <%= f.error_message_on :tracking_url %>
@@ -48,13 +48,13 @@
   <div data-hook="admin_shipping_method_form_availability_fields" class="col-12 col-lg-6">
     <div class="card mb-3 categories">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5">
+        <h5 class="card-title mb-0 h6">
           <%= Spree.t(:shipping_categories) %>
-        </h1>
+        </h5>
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
+        <%= f.field_container :categories do %>
           <% Spree::ShippingCategory.all.each do |category| %>
             <div class="checkbox">
               <%= label_tag do %>
@@ -72,19 +72,23 @@
   <div class="col-12 col-lg-6">
     <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(:zones) %>
-        </h1>
+        </h5>
       </div>
 
       <div class="card-body">
-        <%= f.field_container :zones, class: ['form-group'] do %>
+        <%= f.field_container :zones do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
             <div class="checkbox">
               <%= label_tag do %>
                 <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
-                <%= zone.name %>
+                <span class="text-uppercase"><%= zone.name %></span>
+                <br />
+                <% zone.zone_members.each do |zone_member| %>
+                  <small class="badge badge-pill badge-info"><%= zone_member.zoneable.name %></small>
+                <% end %>
               <% end %>
             </div>
           <% end %>
@@ -103,14 +107,14 @@
   <div class="col-12 col-lg-6">
     <div class="card mb-3 tax_categories">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5">
+        <h5 class="card-title mb-0 h6">
           <%= Spree.t(:tax_category) %>
-        </h1>
+        </h5>
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
+        <%= f.field_container :categories do %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2-clear" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>
       </div>

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

@@ -3,38 +3,72 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add', id: 'admin_new_shipping_method_link' %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_shipping_methods'>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="admin_shipping_methods_index_headers">
         <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:zone) %></th>
-        <th><%= Spree.t(:calculator) %></th>
+        <% if defined?(Spree::Vendor) %>
+          <th class="text-center"><%= Spree.t(:vendor) %></th>
+        <% end %>
+        <th class="text-center"><%= Spree.t(:zone) %></th>
+        <th class="text-center"><%= Spree.t(:calculator) %></th>
         <th class="text-center"><%= Spree.t(:display) %></th>
         <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method| %>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
-          <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
-          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
-          <td><%= shipping_method.calculator.description %></td>
-          <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:none) : Spree.t(shipping_method.display_on) %></td>
-          <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
-            <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>
+          <td>
+            <%= shipping_method.name %>
+            <% if shipping_method.admin_name.present? %>
+              <small class="badge badge-pill badge-light ml-2">
+                <%= shipping_method.admin_name %>
+              </small>
+            <% end %>
+          </td>
+          <% if defined?(Spree::Vendor) %>
+             <td class="text-center">
+              <% if shipping_method.vendor.present? %>
+                <%= link_to shipping_method.vendor.name, spree.admin_vendor_path(shipping_method.vendor_id) %>
+              <% end %>
+             </td>
+          <% end %>
+          <td class="text-center">
+            <% shipping_method.zones.each do |zone| %>
+              <%= link_to zone.name, spree.edit_admin_zone_path(zone), class: 'badge badge-pill badge-secondary' %>
+            <% end %>
+          </td>
+          <td class="text-center"><%= shipping_method.calculator.description %></td>
+          <td class="text-center">
+            <% if shipping_method.display_on.blank? %>
+              <span class="badge badge-pill badge-danger">
+                <%= Spree.t(:none) %>
+              </span>
+            <% else %>
+              <span class="badge badge-pill badge-success">
+                <%= Spree.t("admin.display_on.#{shipping_method.display_on}") %>
+              </span>
+            <% end %>
+          <td class="actions" data-hook="admin_shipping_methods_index_row_actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
+              <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>
+            </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::ShippingMethod)) %>,
-    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::PaymentMethod %>!
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::ShippingMethod %>!
   </div>
 <% end %>

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

@@ -1,12 +1,9 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :state_changes } %>
 
-<% content_for :page_title do %>
-  / <%= plural_resource_name(Spree::StateChange) %>
-<% end %>
-
 <% if @state_changes.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table" id="listing_order_state_changes" data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="admin_orders_state_changes_headers">
         <th><%= Spree::StateChange.human_attribute_name(:type) %></th>
         <th><%= Spree::StateChange.human_attribute_name(:state_from) %></th>
@@ -18,10 +15,11 @@
 
     <tbody>
       <% @state_changes.each do |state_change| %>
+        <% scope = state_change.name == 'order'  ? "#{ state_change.name }_state" : "#{ state_change.name }_states" -%>
         <tr>
           <td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
-          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_state") : Spree.t(:previous_state_missing) %></td>
-          <td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name }_state") %></td>
+          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: scope) : Spree.t(:previous_state_missing) %></td>
+          <td><%= Spree.t(state_change.next_state, scope: scope) %></td>
           <td>
             <% if state_change.user %>
               <% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>
@@ -38,8 +36,11 @@
       <% 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_state_changes) %>
   </div>
 <% end %>
+
+<%= render partial: 'spree/admin/shared/order_summary' %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_state_form_fields" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :abbr, class: ['form-group'] do %>
+    <%= f.field_container :abbr do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
       <%= f.text_field :abbr, class: 'form-control' %>
     <% end %>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -1,26 +1,29 @@
 <div id="new_state" data-hook></div>
-
-<table class="table" id='listing_states' data-hook>
-  <thead>
-    <tr data-hook="states_header">
-      <th><%= Spree.t(:name) %></th>
-      <th class="text-center"><%= Spree.t(:abbreviation) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @states.each do |state| %>
-      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
-        <td><%= state.name %></td>
-        <td class="text-center"><%= state.abbr %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(state, no_text: true) if can? :edit, state %>
-          <%= link_to_delete(state, no_text: true) if can? :delete, state %>
-        </td>
+<div class="table-responsive border rounded bg-white">
+  <table class="table" id='listing_states' data-hook>
+    <thead class="text-muted">
+      <tr data-hook="states_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="text-center"><%= Spree.t(:abbreviation) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-    <% if @states.empty? %>
-      <tr><td colspan="3"><%= Spree.t(:none) %></td></tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @states.each do |state| %>
+        <tr id="<%= spree_dom_id state %>" data-hook="states_row">
+          <td><%= state.name %></td>
+          <td class="text-center"><%= state.abbr %></td>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(state, no_text: true) if can? :edit, state %>
+              <%= link_to_delete(state, no_text: true) if can? :delete, state %>
+            </span>
+          </td>
+        </tr>
+      <% end %>
+      <% if @states.empty? %>
+        <tr><td colspan="3"><%= Spree.t(:none) %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -3,16 +3,16 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add', id: 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add.svg', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">
   <%= label_tag :country, Spree.t(:country) %>
-  <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
+  <select id="country" class='observe_field select2' data-base-url="<%= admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
     <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
 </div>
 
 <div id="state-list" data-hook>
-  <%= render partial: 'state_list'%>
+  <%= render partial: 'state_list' %>
 </div>

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

@@ -2,14 +2,14 @@
   <div class="row">
     <div class="col-12 col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
-        <%= f.field_container :name, class: ['form-group']  do %>
-          <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+        <%= f.field_container :name  do %>
+          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
           <%= f.text_field :name, class: 'form-control', required: true %>
           <%= f.error_message_on :name %>
         <% end %>
       </div>
       <div data-hook="stock_location_admin_name">
-        <%= f.field_container :admin_name, class: ['form-group']  do %>
+        <%= f.field_container :admin_name  do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <% end %>
@@ -80,7 +80,7 @@
       <%= f.label :state_id, Spree.t(:state) %>
       <span id="state" class="region">
         <%= f.text_field :state_name, style: "#{f.object.country.states.empty? ? '' : 'display: none;'}", disabled: !f.object.country.states.empty?, class: 'state_name form-control' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2', style: "#{f.object.country.states.empty? ? 'display: none;' : '' };", disabled: f.object.country.states.empty?} %>
+        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2-clear', style: "#{f.object.country.states.empty? ? 'display: none;' : '' };", disabled: f.object.country.states.empty?} %>
       </span>
     <% end %>
   </div>

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

@@ -1,6 +1,6 @@
 <%= form_tag transfer_stock_admin_stock_locations_path do %>
   <fieldset>
-    <legend><%= Spree.t(:move_stock_between_locations)%></legend>
+    <legend><%= Spree.t(:move_stock_between_locations) %></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
       <div class="col-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_from_field">
@@ -31,9 +31,9 @@
     </div>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'plus' %>
+      <%= button Spree.t(:transfer_stock), 'add' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>