spree_backend 4.1.15 → 4.2.0.beta

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

@@ -3,29 +3,31 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_role_link' %>
+  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::Role %>
 
 <% if @roles.any? %>
-  <table class="table">
-    <thead>
-      <tr data-hook="admin_roles_index_headers">
-        <th><%= Spree.t(:role_id) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @roles.each do |role|%>
-        <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
-          <td><%= role.name %></td>
-          <td class="actions text-right">
-            <%= link_to_edit(role, no_text: true) if can? :edit, role %>
-            <%= link_to_delete(role, no_text: true) if can? :destroy, role %>
-          </td>
+  <div class="table-responsive">
+    <table class="table">
+      <thead>
+        <tr data-hook="admin_roles_index_headers">
+          <th><%= Spree.t(:role_id) %></th>
+          <th class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @roles.each do |role|%>
+          <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
+            <td><%= role.name %></td>
+            <td class="actions text-right">
+              <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+              <%= link_to_delete(role, no_text: true) if can? :destroy, role %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% else %>
   <div class="alert alert-warning">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Role)) %>,

data/app/views/spree/admin/shared/_account_nav.html.erb

@@ -1,73 +1,59 @@
 <% if try_spree_current_user %>
-  <ul class="nav navbar-nav align-items-end h-100 justify-content-center">
-    <li class="dropdown user user-menu h-100">
-      <div class="dropdown d-flex align-items-center h-100">
-        <button class="dropdown-toggle btn btn-link text-white h-100" data-toggle="dropdown">
-          <i class="glyphicon glyphicon-user"></i>
-          <span>
-            <%= try_spree_current_user.email %> <i class="caret"></i>
-          </span>
-        </button>
+  <div class="btn-group">
 
-        <ul class="dropdown-menu position-absolute mt-0 rounded-0 border-top-0">
-          <% if spree.respond_to? :root_path %>
-            <li class="dropdown-item p-0">
-              <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-2 px-4' do %>
-                <i class="glyphicon glyphicon-new-window"></i>
-                &nbsp;
-                <%= Spree.t(:back_to_store) %>
-              <% end %>
-            </li>
-          <% end %>
+    <button id="accountNav" type="button" class="btn text-light" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <%= svg_icon name: "user.svg", width: '24', height: '24' %>
+    </button>
 
-          <% if can?(:manage, try_spree_current_user) %>
-            <li class="dropdown-item p-0">
-              <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block text-dark py-2 px-4' do %>
-                <i class="glyphicon glyphicon-user"></i>
-                &nbsp;
-                <%= Spree.t(:account) %>
-              <% end %>
-            </li>
-          <% end %>
+    <div class="dropdown-menu dropdown-menu-right mt-2 p-0 mr-2">
+      <div class="dropdown-item px-0 text-center bg-light">
+        <span class="d-block text-dark py-2 px-4"><%= try_spree_current_user.email %></span>
+      </div>
+      <div class="dropdown-divider m-0"></div>
 
-          <% if defined?(spree_logout_path) %>
-            <li class="dropdown-item p-0">
-              <%= link_to spree_logout_path, class: 'd-block text-dark py-2 px-4' do %>
-                <i class="glyphicon glyphicon-log-out"></i>
-                &nbsp;
-                <%= Spree.t(:logout) %>
-              <% end %>
-            </li>
+      <% if spree.respond_to? :root_path %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+            <%= svg_icon name: "store.svg", width: '18', height: '18' %>
+            &nbsp;
+            <%= Spree.t(:back_to_store) %>
           <% end %>
+      <% end %>
 
-          <div class="dropdown-divider"></div>
-
-          <li class="dropdown-item p-0">
-            <%= link_to 'http://guides.spreecommerce.org', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
-              <i class="glyphicon glyphicon-info-sign"></i>
-              &nbsp;
-              <%= Spree.t(:help_center) %>
-            <% end %>
-          </li>
-
-          <li class="dropdown-item p-0">
-            <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
-              <i class="glyphicon glyphicon-comment"></i>
-              &nbsp;
-              <%= Spree.t(:join_slack) %>
-            <% end %>
-          </li>
-
-          <li class="dropdown-item p-0">
-            <%= link_to 'https://github.com/spree-contrib', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
-              <i class="glyphicon glyphicon-download"></i>
-              &nbsp;
-              <%= Spree.t(:extensions_directory) %>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if can?(:manage, try_spree_current_user) %>
+          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+            <%= svg_icon name: "user.svg", width: '18', height: '18' %>
+            &nbsp;
+            <%= Spree.t(:account) %>
+          <% end %>
+      <% end %>
 
-    </li>
-  </ul>
+      <% if defined?(spree_logout_path) %>
+          <%= link_to spree_logout_path, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+            <%= svg_icon name: "exit.svg", width: '18', height: '18' %>
+            &nbsp;
+            <%= Spree.t(:logout) %>
+          <% end %>
+      <% end %>
+
+      <div class="dropdown-divider m-0"></div>
+
+        <%= link_to 'http://guides.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= svg_icon name: "info.svg", width: '18', height: '18' %>
+          &nbsp;
+          <%= Spree.t(:help_center) %>
+        <% end %>
+
+        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= svg_icon name: "slack.svg", width: '18', height: '18' %>
+          &nbsp;
+          <%= Spree.t(:join_slack) %>
+        <% end %>
+
+        <%= link_to 'https://github.com/spree-contrib', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
+          &nbsp;
+          <%= Spree.t(:extensions_directory) %>
+        <% end %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -1,79 +1,37 @@
 <% s_or_b = type.chars.first %>
-
 <div id="<%= type %>" data-hook="address_fields">
-  <%= field_container f.object, :firstname, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :firstname, Spree.t(:first_name) %>
-    <%= f.text_field :firstname, class: 'form-control' %>
-    <%= error_message_on f.object, :firstname %>
-  <% end %>
-
-  <%= field_container f.object, :lastname, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :lastname, Spree.t(:last_name) %>
-    <%= f.text_field :lastname, class: 'form-control' %>
-    <%= error_message_on f.object, :lastname %>
-  <% end %>
-
-  <% if Spree::Config[:company] %>
-    <%= field_container f.object, :company, class: ["form-group", "#{type}-row"] do %>
-      <%= f.label :company, Spree.t(:company) %>
-      <%= f.text_field :company, class: 'form-control' %>
-      <%= error_message_on f.object, :company %>
-    <% end %>
-  <% end %>
-
-  <%= field_container f.object, :address1, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :address1, Spree.t(:street_address) %>
-    <%= f.text_field :address1, class: 'form-control' %>
-    <%= error_message_on f.object, :address1 %>
-  <% end %>
-
-  <%= field_container f.object, :address2, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :address2, Spree.t(:street_address_2) %>
-    <%= f.text_field :address2, class: 'form-control' %>
-    <%= error_message_on f.object, :address2 %>
-  <% end %>
-
-  <%= field_container f.object, :city, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :city, Spree.t(:city) %>
-    <%= f.text_field :city, class: 'form-control' %>
-    <%= error_message_on f.object, :city %>
-  <% end %>
-
-  <%= field_container f.object, :zipcode, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :zipcode, Spree.t(:zip) %>
-    <%= f.text_field :zipcode, class: 'form-control' %>
-    <%= error_message_on f.object, :zipcode %>
-  <% end %>
-
-  <div class="form-group <%= "#{type}-row" %>">
-    <%= f.label :country_id, Spree.t(:country) %>
-    <span id="<%= s_or_b %>country">
-      <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2' } %>
-    </span>
-  </div>
-
-  <%= field_container f.object, :state, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :state_id, Spree.t(:state) %>
-    <span id="<%= s_or_b %>state">
-      <% if f.object.country.try(:states) %>
-
-      <%= f.text_field :state_name,
-            style: "display: #{f.object.country.try(:states) && f.object.country.states.empty? ? 'block' : 'none' };",
-            disabled: !(f.object.country.try(:states) && f.object.country.states.empty?), class: 'form-control state_name' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{ f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
-      <% else %>
-        <div>
-          <em>No country set.</em>
-        </div>
+  <% Spree::Address::ADDRESS_FIELDS.each do |field| %>
+    <% if field == "country" %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+        <%= f.label :country_id, Spree.t(:country) %>
+        <span id="<%= s_or_b %>country">
+          <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2' } %>
+        </span>
       <% end %>
-      </span>
-    <%= error_message_on f.object, :state_id %>
-  <% end %>
-
-  <%= field_container f.object, :phone, class: ["form-group", "#{type}-row"] do %>
-    <%= f.label :phone, Spree.t(:phone) %>
-    <%= f.phone_field :phone, class: 'form-control' %>
-    <%= error_message_on f.object, :phone %>
+    <% elsif field == "state" %>
+      <%= field_container (s_or_b + '_' + field), :state, class: ["form-group", "#{type}-row"] do %>
+        <%= f.label :state_id, Spree.t(:state) %>
+        <span id="<%= s_or_b %>state">
+          <% if f.object.country.try(:states) %>
+            <%= f.text_field :state_name,
+                             style: "display: #{f.object.country.try(:states) && f.object.country.states.empty? ? 'block' : 'none' };",
+                             disabled: !(f.object.country.try(:states) && f.object.country.states.empty?), class: 'form-control state_name' %>
+            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{ f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
+          <% else %>
+            <div>
+              <em><%= Spree.t(:no_country) %></em>
+            </div>
+          <% end %>
+        </span>
+        <%= error_message_on f.object, :state_id %>
+      <% end %>
+    <% else %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+        <%= f.label field, Spree.t(field) %>
+        <%= f.text_field field, class: 'form-control' %>
+        <%= error_message_on f.object, field %>
+      <% end %>
+    <% end %>
   <% end %>
 </div>
 

data/app/views/spree/admin/shared/_cal_close.html.erb

@@ -0,0 +1,10 @@
+<div class="input-group-append append_over data-clear" data-clear>
+  <span class="input-group-text force-round">
+    <%= svg_icon name: "close.svg", width: '16', height: '16' %>
+  </span>
+</div>
+<div class="input-group-append append_under data-toggle" data-toggle>
+  <span class="input-group-text">
+    <%= svg_icon name: "calendar.svg", width: '16', height: '16' %>
+  </span>
+</div>

data/app/views/spree/admin/shared/_content_header.html.erb

@@ -1,26 +1,45 @@
-<% if content_for?(:page_title) || content_for?(:page_actions) %>
-  <div class="content-header <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
-    <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %> mb-4">
-      <% if content_for?(:page_title) %>
-        <h1 class="h4 pl-0 mb-0 col-<%= content_for?(:page_actions) ? '5' : '12'  %>">
-          <%= yield :page_title %>
-          <% if content_for?(:page_title_small) %>
-            <small><%= yield :page_title_small %></small>
-          <% end %>
-        </h1>
-      <% end %>
+<div id="contentHeader" class="row mb-3">
+  <% if content_for?(:page_title) || content_for?(:page_actions) %>
+    <div class="content-header col <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
+      <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %>">
 
-      <% if content_for?(:page_actions) %>
-        <div class="page-actions col-7 pr-0" data-hook="toolbar">
-          <%= yield :page_actions %>
-        </div>
-      <% end %>
+        <% if content_for?(:page_title) %>
+          <h1 class="contextual-title px-0 mb-0 col">
+            <%= yield :page_title %>
+            <% if content_for?(:page_title_small) %>
+              <small><%= yield :page_title_small %></small>
+            <% end %>
+          </h1>
+        <% end %>
+
+        <% if content_for?(:page_actions) %>
+          <div class="page-actions pl-0 pr-0 d-none d-lg-flex" data-hook="toolbar">
+            <%= yield :page_actions %>
+          </div>
+        <% end %>
+
+        <% if content_for?(:page_actions) || content_for?(:sidebar) %>
+          <div class="d-flex d-lg-none justify-content-end m-0 p-0">
+            <button type="button"
+                    id="contextual-menu-toggle"
+                    class="btn btn-outline-secondary shadow-none">
+                    <span class="d-none d-sm-inline">
+                      <%= Spree.t('more') %>
+                    </span>
+                    <%= svg_icon name: "chevron-down.svg", width: '16', height: '16' %>
+            </button>
+          </div>
+        <% end %>
+      </div>
 
       <% if content_for?(:page_tabs) %>
-        <ul class="nav nav-tabs w-100 mt-4">
-          <%= yield :page_tabs %>
-        </ul>
+        <div class="row">
+          <ul class="nav nav-tabs w-100 mt-4 px-0">
+            <%= yield :page_tabs %>
+          </ul>
+        </div>
       <% end %>
+
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/_edit_resource_links.html.erb

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <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>

data/app/views/spree/admin/shared/_header.html.erb

@@ -1,22 +1,25 @@
 <header class="header logged-in">
 
-  <nav class="navbar fixed-top navbar-dark align-items-stretch" role="navigation">
-    <div class="navbar-header col-3 col-md-2">
-      <%= link_to(
-        image_tag(Spree::Config[:admin_interface_logo], id: 'logo'),
-        spree.admin_path,
-        class: "logo navbar-brand"
-      ) %>
+  <nav class="navbar fixed-top navbar-dark align-items-middle">
+    <div class="col-3 col-sm-4 p-0 d-lg-none">
       <button
-        id="sidebar-toggle"
-        class="navbar-toggler h-100 position-absolute m-0 p-0"
+        id="sidebar-open"
+        class="navbar-toggler h-100 text-light"
         type="button"
         aria-expanded="false"
         aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
+        <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
       </button>
     </div>
-    <div class="col-9 col-md-10 pr-0">
+    <div class="col text-center text-lg-left">
+      <%= link_to(
+        image_tag(Spree::Config[:admin_interface_logo], id: 'logo', alt: current_store.name),
+        spree.admin_path,
+        class: "logo navbar-brand"
+      ) %>
+    </div>
+
+    <div class="col-3 col-sm-4 text-right p-0">
       <%= render partial: 'spree/admin/shared/account_nav' %>
     </div>
   </nav>

data/app/views/spree/admin/shared/_index_table_options.html.erb

@@ -4,15 +4,13 @@
   <% args[:action] = per_page_action %>
 <% end %>
 
-<div class="row index-pagination-row">
-  <div class="col-6">
-    <%= paginate collection, theme: 'twitter-bootstrap-4' %>
+<div class="row index-pagination-row mt-4">
+  <div class="col-12 col-sm-9 text-center text-sm-left">
+    <%= paginate collection, theme: 'admin-twitter-bootstrap-4' %>
   </div>
-  <div class="col-6 justify-content-end">
-    <div class="pagination-wrap">
-      <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline justify-content-end' }) do %>
+  <div class="col-12 col-sm-3 text-center text-sm-left">
+    <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline justify-content-center justify-content-sm-end' }) do %>
         <%= per_page_dropdown %>
       <% end %>
-    </div>
   </div>
 </div>

data/app/views/spree/admin/shared/_main_menu.html.erb

@@ -1,43 +1,54 @@
 <nav>
+  <div class="text-right d-lg-none p-2 border-bottom">
+    <button
+      id="sidebar-close"
+      class="btn btn-link"
+      type="button"
+      aria-expanded="false"
+      aria-label="Toggle navigation">
+      <%= svg_icon name: "cancel.svg", width: '20', height: '20' %>
+    </button>
+  </div>
+
   <% if can? :admin, Spree::Order %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarOrder">
+      <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'list.svg' %>
     </ul>
   <% end %>
 
   <% if can?(:admin, Spree::ReturnAuthorization) || can?(:admin, Spree::CustomerReturn) %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= main_menu_tree Spree.t(:returns), icon: "transfer", sub_menu: "returns", url: "#sidebar-returns" %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarReturn">
+      <%= main_menu_tree Spree.t(:returns), icon: "returns.svg", sub_menu: "returns", url: "#sidebar-returns" %>
     </ul>
   <% end %>
 
   <% if can? :admin, Spree::Product %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= main_menu_tree Spree.t(:products), icon: "th-large", sub_menu: "product", url: "#sidebar-product" %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarProduct">
+      <%= main_menu_tree Spree.t(:products), icon: "products.svg", sub_menu: "product", url: "#sidebar-product" %>
     </ul>
   <% end %>
 
   <% if can? :admin, Spree::Admin::ReportsController %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file'  %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarReport">
+      <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg'  %>
     </ul>
   <% end %>
 
   <% if can? :admin, Spree::Promotion %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= main_menu_tree Spree.t(:promotions), icon: "gift", sub_menu: "promotion", url: "#sidebar-promotions" %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarPromotion">
+      <%= main_menu_tree Spree.t(:promotions), icon: "promotion.svg", sub_menu: "promotion", url: "#sidebar-promotions" %>
     </ul>
   <% end %>
 
   <% if Spree.user_class && can?(:admin, Spree.user_class) %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarUser">
+      <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'users.svg' %>
     </ul>
   <% end %>
 
   <% if can? :admin, current_store %>
-    <ul class="nav nav-sidebar border-bottom">
-      <%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarConfiguration">
+      <%= main_menu_tree Spree.t(:configurations), icon: "settings.svg", sub_menu: "configuration", url: "#sidebar-configuration" %>
     </ul>
   <% end %>
 </nav>

data/app/views/spree/admin/shared/_new_resource_links.html.erb

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'ok', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'remove' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
 </div>

data/app/views/spree/admin/shared/_order_summary.html.erb

@@ -2,6 +2,7 @@
   <div class="card-header">
     <h3 class="card-title mb-0 h5"><%= Spree.t(:summary) %></h3>
   </div>
+  <div class="table-responsive">
   <table class="table table-condensed table-bordered" id="order_tab_summary" data-hook>
     <tbody class="additional-info">
       <tr>
@@ -123,4 +124,5 @@
       <% end %>
     </tbody>
   </table>
+  </div>
 </div>

data/app/views/spree/admin/shared/_order_tabs.html.erb

@@ -7,7 +7,7 @@
   <ul class="nav flex-column nav-pills" data-hook="admin_order_tabs">
     <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
       <li data-hook='admin_order_tabs_cart_details'>
-        <%= link_to_with_icon 'edit',
+        <%= link_to_with_icon 'cart.svg',
           Spree.t(:cart),
           cart_admin_order_url(@order),
           class: "#{'active' if current == :cart} nav-link" %>
@@ -16,7 +16,7 @@
 
     <% if ((can?(:update, @order) && can?(:read, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
       <li data-hook='admin_order_tabs_store_details'>
-        <%= link_to_with_icon 'home',
+        <%= link_to_with_icon 'store.svg',
           Spree.t(:store),
           store_admin_order_url(@order),
           class: "#{'active' if current == :store} nav-link" %>
@@ -25,7 +25,7 @@
 
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
       <li data-hook='admin_order_tabs_customer_details'>
-        <%= link_to_with_icon 'user',
+        <%= link_to_with_icon 'user.svg',
           Spree.t(:customer),
           spree.admin_order_customer_url(@order),
           class: "#{'active' if current == :customer_details} nav-link" %>
@@ -34,7 +34,7 @@
 
     <% if can? :update, @order %>
       <li data-hook='admin_order_tabs_shipment_details'>
-        <%= link_to_with_icon 'road',
+        <%= link_to_with_icon 'shipping.svg',
           Spree.t(:shipments),
           edit_admin_order_url(@order),
           class: "#{'active' if current == :shipments} nav-link" %>
@@ -43,7 +43,7 @@
 
     <% if can? :index, Spree::Adjustment %>
       <li data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'wrench',
+        <%= link_to_with_icon 'adjust.svg',
           Spree.t(:adjustments),
           spree.admin_order_adjustments_url(@order),
           class: "#{'active' if current == :adjustments} nav-link" %>
@@ -52,7 +52,7 @@
 
     <% if can?(:index, Spree::Payment) %>
       <li data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'credit-card',
+        <%= link_to_with_icon 'payments.svg',
           Spree.t(:payments),
           spree.admin_order_payments_url(@order),
           class: "#{'active' if current == :payments} nav-link" %>
@@ -62,7 +62,7 @@
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'transfer',
+          <%= link_to_with_icon 'enter.svg',
             Spree.t(:return_authorizations),
             spree.admin_order_return_authorizations_url(@order),
             class: "#{'active' if current == :return_authorizations} nav-link" %>
@@ -73,7 +73,7 @@
     <% if can? :index, Spree::CustomerReturn %>
       <% if @order.completed? %>
         <li>
-          <%= link_to_with_icon 'transfer',
+          <%= link_to_with_icon 'returns.svg',
             Spree.t(:customer_returns),
             spree.admin_order_customer_returns_url(@order),
             class: "#{'active' if current == :customer_returns} nav-link" %>
@@ -83,7 +83,7 @@
 
     <% if can? :update, @order %>
       <li data-hook='admin_order_tabs_state_changes'>
-        <%= link_to_with_icon 'refresh',
+        <%= link_to_with_icon 'save.svg',
           Spree::StateChange.human_attribute_name(:state_changes),
           spree.admin_order_state_changes_url(@order),
           class: "#{'active' if current == :state_changes} nav-link" %>