spree_backend 4.4.1 → 4.5.0

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

@@ -1,64 +1,62 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:products), admin_products_path %> /
+  <%= page_header_back_button spree.admin_products_path %>
   <%= @product.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <ul class="nav flex-column nav-pills" data-hook="admin_product_tabs">
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'edit.svg',
-        Spree.t(:details),
-        edit_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :details}" %>
+<% content_for(:page_tabs) do %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'edit.svg',
+      Spree.t(:details),
+      edit_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :details}" %>
 
-    <% end if can?(:admin, Spree::Product) %>
+  <% end if can?(:admin, Spree::Product) %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'images.svg',
-        Spree.t(:images),
-        spree.admin_product_images_url(@product),
-        class: "nav-link #{'active' if current == :images}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'images.svg',
+      Spree.t(:images),
+      spree.admin_product_images_url(@product),
+      class: "nav-link #{'active' if current == :images}" %>
 
-    <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'adjust.svg',
-        Spree.t(:variants),
-        spree.admin_product_variants_url(@product),
-        class: "nav-link #{'active' if current == :variants}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'adjust.svg',
+      Spree.t(:variants),
+      spree.admin_product_variants_url(@product),
+      class: "nav-link #{'active' if current == :variants}" %>
 
-    <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'list.svg',
-        Spree.t(:properties),
-        spree.admin_product_product_properties_url(@product),
-        class: "nav-link #{'active' if current == :properties}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'list.svg',
+      Spree.t(:properties),
+      spree.admin_product_product_properties_url(@product),
+      class: "nav-link #{'active' if current == :properties}" %>
 
-    <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'items.svg',
-        Spree.t(:stock),
-        stock_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :stock}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'box-seam.svg',
+      Spree.t(:stock),
+      stock_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :stock}" %>
 
-    <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'money.svg',
-        Spree.t(:prices),
-        admin_product_prices_path(@product),
-        class: "nav-link #{'active' if current == :prices}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'currency-exchange.svg',
+      Spree.t(:prices),
+      admin_product_prices_path(@product),
+      class: "nav-link #{'active' if current == :prices}" %>
 
-    <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'hdd.svg',
-        Spree.t('admin.digitals.digital_assets'),
-        admin_product_digitals_path(@product),
-        class: "nav-link #{'active' if current == :digitals} #{current}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'download.svg',
+      Spree.t('admin.digitals.digital_assets'),
+      admin_product_digitals_path(@product),
+      class: "nav-link #{'active' if current == :digitals} #{current}" %>
 
-    <% end if can?(:admin, Spree::Digital) && !@product.deleted? %>
-  </ul>
+  <% end if can?(:admin, Spree::Digital) && !@product.deleted? %>
 <% end %>

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

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded" id='refunds' data-order-id='<%= @order.number %>'>
+    <thead class="text-muted">
       <tr data-hook="refunds_header">
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
         <th><%= Spree.t(:payment_identifier) %></th>
@@ -25,7 +25,7 @@
           <% if show_actions %>
             <td class="actions">
               <span class="d-flex justify-content-end">
-                <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
+                <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-light btn-sm") if can?(:edit, refund) %>
               </span>
             </td>
           <% end %>

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

@@ -8,7 +8,7 @@
              data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
              data-max-date="<%= params[:q][:completed_at_lt] %>">
           <%= s.text_field :completed_at_gt,
-                           class: 'form-control shadow-none',
+                           class: 'form-control',
                            placeholder: Spree.t(:starting_from),
                            value: datepicker_field_value(params[:q][:completed_at_gt]),
                            'data-input':'' %>
@@ -24,7 +24,7 @@
              data-min-date="<%= params[:q][:completed_at_gt] %>">
 
           <%= s.text_field :completed_at_lt,
-                           class: 'form-control shadow-none',
+                           class: 'form-control',
                            placeholder: Spree.t(:ending_at),
                            value: datepicker_field_value(params[:q][:completed_at_lt]),
                            'data-input':'' %>

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

@@ -8,15 +8,15 @@
      <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
     </a>
 
-    <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-lg-2 mt-2 py-0" aria-labelledby="storeSelectorDropdown">
+    <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-2" aria-labelledby="storeSelectorDropdown">
       <% @stores.each do |store| %>
         <%= store_switcher_link(store) %>
       <% end %>
 
       <% if can?(:create, Spree::Store) %>
         <div class="dropdown-divider m-0"></div>
-        <%= link_to spree.new_admin_store_path, class: 'text-dark p-3 dropdown-item', id: 'addNewStoreLink' do %>
-          <%= svg_icon name: "add.svg", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <%= link_to spree.new_admin_store_path, class: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "plus-circle", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
         <% end %>
       <% end %>
     </div>

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

@@ -1,19 +1,18 @@
 <% if content_for?(:table_filter) %>
-  <div class="filter-wrap pb-1">
+  <div class="filter-wrap mb-4">
     <div class="col-12 px-0">
       <div class="input-group index-filter-button flex-nowrap">
-        <span class="input-group-btn">
-          <button class="btn js-show-index-filters m-0" type="button">
-            <%= svg_icon name: "chevron-right.svg", width: '12', height: '12' %>
-            <span class="d-none d-sm-inline"><%= Spree.t(:filter) %></span>
-          </button>
-        </span>
-        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1' do %>
+        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1 mr-3' do %>
           <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:search_by) %>
         <% end %>
+
+        <button class="btn btn-light js-show-index-filters m-0 rounded-sm" type="button">
+          <%= svg_icon name: "filter.svg", width: '16', height: '16' %>
+          <span class="d-none d-sm-inline"><%= Spree.t('admin.filters') %></span>
+        </button>
       </div>
       <% unless defined?(simple) %>
-        <div id="table-filter" data-hook class="card bg-light filter-well">
+        <div id="table-filter" data-hook class="card filter-well mt-4">
           <div class="card-body">
             <%= yield :table_filter %>
           </div>

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -1,11 +1,11 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
-$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
+$('#order_tab_summary #order_status').html('<%= j Spree.t(@order.state, scope: :order_state) %>');
+$('#order_tab_summary #order_total').html('<%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
   <% if @order.payment_state.present? %>
-    $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
+    $('#order_tab_summary #payment_status').html('<%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
   <% end %>
   <% if @order.shipment_state.present? %>
-    $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+    $('#order_tab_summary #shipment_status').html('<%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
   <% end %>
 <% end %>

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

@@ -1,7 +1,9 @@
 <% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
-  <small
-    class="spree-version font-weight-bold ml-3 my-3 text-muted"
+  <p
+    class="spree-version ml-3 my-3"
     aria-label="Spree Commerce version">
+    <span class="badge badge-pill badge-info">
     <%= Spree.version %>
-  </small>
+    </span>
+  </p>
 <% end %>

data/app/views/spree/admin/shared/linkables/_spree_linkable_uri.html.erb

@@ -0,0 +1,16 @@
+<%= f.field_container :destination do %>
+  <%= f.label :destination, Spree.t(:url) %>
+  <%= f.text_field :destination, class: 'form-control' %>
+  <%= f.error_message_on :destination %>
+  <small class="form-text text-muted">
+    <%= raw Spree.t('admin.navigation.url_info') %>
+  </small>
+<% end %>
+
+<%= f.field_container :new_window do %>
+  <div class="custom-control custom-checkbox">
+    <%= f.check_box :new_window, class: 'custom-control-input' %>
+    <%= f.label :new_window, Spree.t('admin.navigation.open_link_in_new_window'), class: 'custom-control-label' %>
+    <%= f.error_message_on :new_window %>
+  </div>
+<% end %>

data/app/views/spree/admin/shared/linkables/_url.html.erb

@@ -1,3 +1,5 @@
+<!-- When using rails 7 compatible version of Spree this view is replaced by _spree_linkable_uri.html.erb -->
+
 <%= f.field_container :destination do %>
   <%= f.label :destination, Spree.t(:url) %>
   <%= f.text_field :destination, class: 'form-control' %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_named_type_form_fields">
   <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -7,9 +7,9 @@
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_named_types' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:status) %></th>
@@ -39,7 +39,7 @@
   </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: resource_name) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, resource %>!
   </div>

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

@@ -3,14 +3,14 @@
 
 <div class="sortable-tree-item-row d-flex flex-nowrap">
   <div class="move-handle d-flex align-items-center p-3">
-    <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
+    <%= 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-light badge-light-muted-text">-> <%= item.link %></span>
+        <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}" %>
@@ -20,7 +20,7 @@
     <% if item.icon.present? %>
       <div class="ml-2">
         <div class="item_image_holder">
-          <%= image_tag main_app.url_for(item.icon.attachment) %>
+          <%= image_tag main_app.cdn_image_url(item.icon.attachment) %>
         </div>
       </div>
     <% end %>

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

@@ -3,7 +3,7 @@
 
 <div class="sortable-tree-item-row d-flex flex-nowrap">
   <div class="move-handle d-flex align-items-center p-3">
-    <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
+    <%= svg_icon(name: 'grip-vertical.svg', width: '20', height: '20') %>
   </div>
 
   <div class="d-flex align-items-center overflow-hidden w-100">
@@ -11,7 +11,7 @@
       <%= 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-light badge-light-muted-text"><%#= svg_icon(name: 'link.svg', width: '16', height: '16') %> <%= taxon.permalink %></span>
+          <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">
@@ -21,7 +21,7 @@
     <% if taxon.icon.present? %>
       <div class="ml-2">
         <div class="item_image_holder">
-          <%= image_tag main_app.url_for(taxon.icon.attachment) %>
+          <%= image_tag main_app.cdn_image_url(taxon.icon.attachment) %>
         </div>
       </div>
     <% end %>

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

@@ -1,3 +1,3 @@
-<ul id="sidebar-apps" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_apps">
+<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,6 +1,5 @@
-<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 %>
@@ -10,7 +9,6 @@
     <%= 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(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>

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

@@ -1,4 +1,4 @@
-<ul id="sidebar-content" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_content">
+<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

@@ -1,3 +1,4 @@
-<ul id="sidebar-integrations" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_integrations">
-  <%= tab :webhooks_subscribers, match_path: '/webhooks_subscribers', label: 'Webhooks' %>
+<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

@@ -1,4 +1,4 @@
-<ul id="sidebar-stock" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_stock_sub_tabs">
+<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/index.html.erb

@@ -7,9 +7,9 @@
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
-<div class="table-responsive">
+<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>
@@ -31,7 +31,7 @@
   </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

@@ -11,7 +11,7 @@
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
       <%= 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-clear' }) %>
+        <%= 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>
@@ -48,9 +48,9 @@
   <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">
@@ -72,9 +72,9 @@
   <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">
@@ -84,7 +84,11 @@
             <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,9 +107,9 @@
   <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">

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

@@ -7,13 +7,16 @@
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
-<div class="table-responsive">
+<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>
@@ -21,14 +24,37 @@
     <tbody>
       <% @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.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) %>
+              <%= link_to zone.name, spree.edit_admin_zone_path(zone), class: 'badge badge-pill badge-secondary' %>
             <% end %>
           </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 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 %>
@@ -41,8 +67,8 @@
   </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,13 +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">
+<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>
@@ -42,7 +38,9 @@
   </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/_state_list.html.erb

@@ -1,7 +1,7 @@
 <div id="new_state" data-hook></div>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_states' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="states_header">
         <th><%= Spree.t(:name) %></th>
         <th class="text-center"><%= Spree.t(:abbreviation) %></th>