spree_backend 4.3.0 → 4.5.0

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -17,14 +17,9 @@
           order: order,
           title: Spree.t(:order_adjustments) %>
 
-  <% if order.line_items.exists? %>
-    <div class="alert alert-success" id="order-total" data-hook="order_details_total">
-      <%= Spree.t(:order_total) %>: <strong class="order-total"><%= order.display_total %></strong>
-    </div>
-  <% end %>
-
   <script>
     var order_number = '<%= @order.number %>';
+    var order_id = '<%= @order.id %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>

data/app/views/spree/admin/orders/_order_actions.html.erb

@@ -6,6 +6,13 @@
     <%= button_link_to Spree.t(:resend, scope: 'admin.order.events', default: Spree.t(:resend)),
           resend_admin_order_url(order),
           method: :post,
-          icon: 'envelope.svg' %>
+          icon: 'envelope.svg', class: 'btn-secondary' %>
+  <% end %>
+
+  <% if (can? :update, @order) && @order.some_digital? %>
+    <%= button_link_to Spree.t('admin.digitals.reset_download_links'),
+        reset_digitals_admin_order_url(@order),
+        method: :put,
+        icon: 'hdd.svg' %>
   <% end %>
 <% end %>

data/app/views/spree/admin/orders/_risk_analysis.html.erb

@@ -1,8 +1,8 @@
 <fieldset id="risk_analysis">
   <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered">
-      <thead>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded">
+      <thead class="text-muted">
         <th><%= Spree.t('risk') %></th>
         <th><%= Spree.t('status') %></th>
       </thead>
@@ -12,7 +12,7 @@
             <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
           </td>
           <td>
-            <span class="badge badge-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
+            <span class="badge badge-pill badge-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
               <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.size, default: pluralize(@order.payments.failed.size, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
             </span>
           </td>
@@ -21,7 +21,7 @@
         <tr>
           <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
           <td>
-            <span class="badge badge-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
+            <span class="badge badge-pill badge-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
               <% if latest_payment.is_avs_risky? %>
                 <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
               <% else %>
@@ -34,7 +34,7 @@
         <tr>
           <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
           <td>
-            <span class="badge badge-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
+            <span class="badge badge-pill badge-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
               <% if latest_payment.is_cvv_risky? %>
                 <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
               <% else %>

data/app/views/spree/admin/orders/_search.html.erb

@@ -0,0 +1,135 @@
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+
+    <%= search_form_for [:admin, @search] do |f| %>
+    <div class="row">
+
+      <div class="date-range-filter col-12 col-lg-8">
+        <div class="form-group">
+          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+          <div class="row pb-0">
+            <div class="col-12 col-md-6 mb-3 mb-md-0">
+              <div class="input-group datePickerFrom"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-max-date="<%= params[:q][:created_at_lt] %>">
+                <%= f.text_field :created_at_gt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:created_at_gt],
+                    placeholder: Spree.t(:starting_from),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+              </div>
+            </div>
+            <div class="col-12 col-md-6 mt-3 mt-md-0">
+              <div class="input-group datePickerTo"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-min-date="<%= params[:q][:created_at_gt] %>">
+
+                <%= f.text_field :created_at_lt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:created_at_lt],
+                    placeholder: Spree.t(:ending_at),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+                </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
+          <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_state_eq, Spree.t(:status) %>
+          <%= f.select :state_eq,
+            Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
+            { include_blank: true },
+            class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
+          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+          <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+          <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_email_cont, Spree.t(:email) %>
+          <%= f.email_field :email_cont, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="row">
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+          <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-lg-4">
+        <div class="form-group">
+          <%= label_tag :q_channel_eq, Spree.t(:channel) %>
+          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
+        </div>
+      </div>
+    </div>
+
+    <div data-hook="admin_orders_index_search_buttons" class="form-actions">
+      <%= button Spree.t(:filter_results), 'search.svg' %>
+    </div>
+
+    <% end %>
+
+  </div>
+
+<% end %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -3,7 +3,7 @@
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
   <div class="card-header stock-location no-borderb" data-hook="stock-location">
-    <h1 class="flex-wrap align-items-center card-title mb-0 h5">
+    <h5 class="flex-wrap align-items-center card-title mb-0 h6">
       <span class="shipment-number"><%= shipment.number %></span>
       -
       <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
@@ -15,12 +15,12 @@
         <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
       <% end %>
-    </h1>
+    </h5>
   </div>
 
-  <div class="table-responsive">
-    <table class="table table-bordered stock-contents" data-hook="stock-contents">
-      <thead>
+  <div class="table-responsive bg-white">
+    <table class="table stock-contents" data-hook="stock-contents">
+      <thead class="text-muted">
         <tr>
           <th colspan="2"><%= Spree.t(:item_description) %></th>
           <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
@@ -46,7 +46,7 @@
             <td class="actions">
               <span class="d-flex justify-content-center">
                 <% if can? :update, shipment %>
-                  <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                  <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
                   <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
                 <% end %>
               </span>
@@ -69,7 +69,7 @@
             <td class="actions">
               <span class="d-flex justify-content-center">
                 <% if( (can? :update, shipment) and !shipment.shipped?) %>
-                  <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-outline-secondary', data: {action: 'edit'}, no_text: true %>
+                  <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-light', data: {action: 'edit'}, no_text: true %>
                 <% end %>
               </span>
             </td>
@@ -83,7 +83,7 @@
           <td class="actions">
             <span class="d-flex justify-content-center">
               <% if can? :update, shipment %>
-                <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
                 <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
               <% end %>
             </span>
@@ -109,7 +109,7 @@
           <td class="actions">
             <span class="d-flex justify-content-center">
               <% if can? :update, shipment %>
-                <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-tracking btn btn-outline-secondary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+                <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "#", class: 'edit-tracking btn btn-light btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
               <% end %>
             </span>
           </td>

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -34,10 +34,10 @@
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <span class="d-flex justify-content-center">
         <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
-          <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-outline-secondary btn-sm', title: Spree.t('actions.edit'), no_text: true %>
-          <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-outline-secondary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+          <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-light btn-sm', title: Spree.t('actions.edit'), no_text: true %>
+          <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-light btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
           <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
-          <%= link_to_with_icon 'split.svg', Spree.t('split'), "#", class: 'split-item btn btn-outline-secondary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
+          <%= link_to_with_icon 'split.svg', Spree.t('split'), "#", class: 'split-item btn btn-light btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
           <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
         <% end %>
       </span>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -3,9 +3,9 @@
   <div class="card mb-3" data-hook="customer_guest">
 
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:account) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">
@@ -27,7 +27,7 @@
 
             <% if @order.completed? %>
               <div>
-                <span class="badge badge-secondary">
+                <span class="badge badge-pill badge-secondary">
                   <%= guest ? Spree.t(:say_yes) : Spree.t(:say_no) %>
                   <%= hidden_field_tag :guest_checkout, guest %>
                 </span>
@@ -58,7 +58,7 @@
     <div data-hook="bill_address_wrapper" class="col-12 col-lg-6">
       <div class="card mb-3">
         <div class="card-header">
-          <h1 class="card-title mb-0 h5"><%= Spree.t(:billing_address) %></h1>
+          <h5 class="card-title mb-0 h6"><%= Spree.t(:billing_address) %></h5>
         </div>
 
         <div class="card-body">
@@ -76,7 +76,7 @@
     <div class="col-12 col-lg-6" data-hook="ship_address_wrapper">
       <div class="card mb-3">
         <div class="card-header">
-          <h1 class="card-title mb-0 h5"><%= Spree.t(:shipping_address) %></h1>
+          <h5 class="card-title mb-0 h6"><%= Spree.t(:shipping_address) %></h5>
         </div>
         <div class="card-body">
           <% if can? :edit, @order.user %>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -1,15 +1,11 @@
 <%= render 'spree/admin/shared/order_tabs', current: :customer_details %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:customer_details) %>
-<% end %>
-
 <% if can? :edit, @order.user %>
   <div id="select-customer" class="card mb-3" data-hook>
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:customer_search) %>
-      </h1>
+      </h5>
     </div>
     <div class="card-body" id="customer-search-field">
       <%= select_tag :customer_search, nil, class: 'd-block w-100' %>

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

@@ -2,10 +2,6 @@
 
 <%= render 'spree/admin/shared/order_tabs', current: :shipments %>
 
-<% content_for :page_title do %>
-  / <%= plural_resource_name(Spree::Shipment) %>
-<% end %>
-
 <div data-hook="admin_order_edit_header">
   <%= render 'spree/admin/shared/error_messages', target: @order %>
 </div>

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

@@ -10,177 +10,45 @@
       id: 'admin_new_order' %>
 <% end if can? :create, Spree::Order %>
 
-<% content_for :table_filter do %>
-  <div data-hook="admin_orders_index_search">
-
-    <%= search_form_for [:admin, @search] do |f| %>
-    <div class="row">
-
-      <div class="date-range-filter col-12 col-lg-8">
-        <div class="form-group">
-          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-          <div class="row pb-0">
-            <div class="col-12 col-md-6 mb-3 mb-md-0">
-              <div class="input-group datePickerFrom"
-                   data-wrap="true"
-                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-                   data-max-date="<%= params[:q][:created_at_lt] %>">
-                <%= f.text_field :created_at_gt,
-                  class: 'form-control js-filterable shadow-none',
-                    value: params[:q][:created_at_gt],
-                    placeholder: Spree.t(:starting_from),
-                    'data-input':'' %>
-                <%= render partial: 'spree/admin/shared/cal_close' %>
-              </div>
-            </div>
-            <div class="col-12 col-md-6 mt-3 mt-md-0">
-              <div class="input-group datePickerTo"
-                   data-wrap="true"
-                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-                   data-min-date="<%= params[:q][:created_at_gt] %>">
-
-                <%= f.text_field :created_at_lt,
-                  class: 'form-control js-filterable shadow-none',
-                    value: params[:q][:created_at_lt],
-                    placeholder: Spree.t(:ending_at),
-                    'data-input':'' %>
-                <%= render partial: 'spree/admin/shared/cal_close' %>
-                </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_number_cont, Spree.t(:search_order_number) %>
-          <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_state_eq, Spree.t(:status) %>
-          <%= f.select :state_eq,
-            Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
-            { include_blank: true },
-            class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-          <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-          <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_email_cont, Spree.t(:email) %>
-          <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="row">
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
-          <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-4">
-        <div class="form-group">
-          <%= label_tag :q_channel_eq, Spree.t(:channel) %>
-          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
-        </div>
-      </div>
-
-      <div class="col-12">
-        <%= f.field_container :completed_at_not_null do %>
-          <div class="custom-control custom-checkbox">
-            <%= f.check_box :completed_at_not_null, {checked: @show_only_completed, class: 'custom-control-input'}, '1', '0' %>
-            <%= f.label :completed_at_not_null, Spree.t(:show_only_complete_orders), class: 'custom-control-label' %>
-          </div>
-        <% end %>
-
-        <%= f.field_container :considered_risky_eq do %>
-          <div class="custom-control custom-checkbox">
-            <%= f.check_box :considered_risky_eq, {checked: params[:q][:considered_risky_eq] == '1', class: 'custom-control-input'}, '1', '' %>
-            <%= f.label :considered_risky_eq, Spree.t(:show_only_considered_risky), class: 'custom-control-label' %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-
-    <div data-hook="admin_orders_index_search_buttons" class="form-actions">
-      <%= button Spree.t(:filter_results), 'search.svg' %>
-    </div>
-
-    <% end %>
-
-  </div>
-
-<% end %>
+<% content_for :page_tabs do %>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.orders.all'),
+      spree.admin_orders_path(q: { completed_at_not_null: 1 }),
+      class: "nav-link #{'active' if params[:q][:payment_state_not_eq].blank? && params[:q][:shipment_state_not_eq].blank?}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.orders.unpaid'),
+      params.merge({q: {payment_state_not_eq: :paid, completed_at_not_null: 1}}).permit!,
+      class: "nav-link #{'active' if params[:q][:payment_state_not_eq] == 'paid'}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.orders.unfulfilled'),
+      params.merge({q: {shipment_state_not_eq: :shipped, completed_at_not_null: 1}}).permit!,
+      class: "nav-link #{'active' if params[:q][:shipment_state_not_eq] == 'shipped'}" %>
+  </li>
+<% end if @show_only_completed %>
+
+<%= render "search" if @orders.any? || params[:q].present? %>
 
 <% if @orders.any? %>
+
 <div data-nav-x-wrapper>
   <div data-nav-x-container>
-    <table class="table" id="listing_orders" data-hook data-nav-x-content>
-      <thead>
+    <table class="table border rounded" id="listing_orders" data-hook data-nav-x-content>
+      <thead class="text-muted">
         <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :number,           I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+          <th><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
           <% if @show_only_completed %>
             <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order') %></th>
           <% else %>
             <th><%= sort_link @search, :created_at,     I18n.t(:created_at, scope: 'activerecord.attributes.spree/order') %></th>
           <% end %>
-          <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, scope: 'activerecord.attributes.spree/order') %></th>
-          <th><%= sort_link @search, :state,            I18n.t(:state, scope: 'activerecord.attributes.spree/order') %></th>
-          <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
+          <th><%= I18n.t(:considered_risky, scope: 'activerecord.attributes.spree/order') %></th>
+          <th><%= I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
            <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-            <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
+            <th><%= I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
            <% end %>
-          <th><%= sort_link @search, :email,            I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
+          <th><%= I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
           <th><%= sort_link @search, :total,            I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
           <th data-hook="admin_orders_index_header_actions" class="actions"></th>
         </tr>
@@ -193,21 +61,15 @@
             <%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
           </td>
           <td>
-            <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %> text-uppercase">
+            <span class="badge badge-pill badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
               <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
             </span>
           </td>
-          <td class="no-wrap">
-            <span class="badge badge-<%= order.state.downcase %> text-uppercase"><%= Spree.t("order_state.#{order.state}") %></span>
-            <span class="filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>">
-              <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
-            </span>
-          </td>
           <td class="no-wrap">
             <% if order.payment_state %>
               <%= link_to Spree.t("payment_states.#{order.payment_state}"),
                 admin_order_payments_path(order),
-                class: "badge badge-#{order.payment_state} text-uppercase" %>
+                class: "badge badge-pill badge-#{order.payment_state}" %>
 
               <span class="filterable js-add-filter"
                 data-ransack-field="q_payment_state_eq"
@@ -219,7 +81,7 @@
           <% if Spree::Order.checkout_step_names.include?(:delivery) %>
             <td class="no-wrap">
               <% if order.shipment_state %>
-                <span class="badge badge-<%= order.shipment_state %> text-uppercase"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+                <span class="badge badge-pill badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
                 <span class="filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>">
                   <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
                 </span>
@@ -262,10 +124,10 @@
   </button>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
-    <%= link_to(Spree.t(:add_one), new_admin_order_url) if can? :create, Spree::Order %>!
+  <div class="text-center no-objects-found m-5">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %><% if can? :create, Spree::Order %>,
+    <%= link_to(Spree.t(:add_one), new_admin_order_url) %>!<% end %>
   </div>
 <% end %>
 
-<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true if @orders.any? %>

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

@@ -13,13 +13,13 @@
             <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
           </div>
           <hr class="my-4">
-          <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
+          <%= field_container :payment_method, :name, 'data-hook' => 'name' do %>
             <%= label_tag :payment_method_name, Spree.t(:name) %>
             <%= text_field :payment_method, :name, class: 'form-control' %>
             <%= error_message_on :payment_method, :name %>
           <% end %>
 
-          <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
+          <%= field_container :payment_method, :description, 'data-hook' => 'description' do %>
             <%= label_tag :payment_method_description, Spree.t(:description) %>
             <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
           <% end %>
@@ -33,7 +33,7 @@
 
           <div data-hook="display" class="form-group">
             <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-            <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
+            <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t("admin.display_on.#{display}"), display.to_s] }, { selected: :both }, {class: 'select2'}) %>
           </div>
           <div data-hook="auto_capture" class="form-group">
             <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>