spree_backend 4.3.0 → 4.5.0

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

@@ -24,9 +24,9 @@
 <% end %>
 
 <% if @payment_methods.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table sortable" id='listing_payment_methods' data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="admin_payment_methods_index_headers">
         <th></th>
         <th><%= Spree.t(:name) %></th>
@@ -41,12 +41,12 @@
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>
-              <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+              <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
             <% end %>
           </td>
           <td><%= method.name %></td>
           <td><%= method.type.split('::', 3).last %></td>
-          <td class="text-center"><%= Spree.t(method.display_on) %></td>
+          <td class="text-center"><%= Spree.t("admin.display_on.#{method.display_on}") %></td>
           <td class="text-center"><%= active_badge(method.active) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">
             <span class="d-flex justify-content-end">
@@ -60,7 +60,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::PaymentMethod)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::PaymentMethod %>!
   </div>

data/app/views/spree/admin/payments/_capture_events.html.erb

@@ -1,8 +1,8 @@
 <% if @payment.capture_events.exists? %>
   <h3><%= Spree.t(:capture_events) %></h3>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered" id="capture_events">
-      <thead>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded" id="capture_events">
+      <thead class="text-muted">
         <tr data-hook="payments_header">
           <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
           <th><%= Spree.t(:amount) %></th>

data/app/views/spree/admin/payments/_list.html.erb

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-bordered" id='payments' data-order-id='<%= @order.number %>'>
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table border rounded" id='payments' data-order-id='<%= @order.number %>'>
+    <thead class="text-muted">
       <tr data-hook="payments_header">
         <th><%= Spree::Payment.human_attribute_name(:number) %></th>
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
@@ -13,14 +13,14 @@
     </thead>
     <tbody>
       <% payments.each do |payment| %>
-        <tr id="<%= dom_id(payment) %>" data-hook="payments_row" data-number="<%= payment.number %>">
+        <tr id="<%= dom_id(payment) %>" data-hook="payments_row" data-number="<%= payment.number %>" data-id="<%= payment.id %>">
           <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
           <td><%= pretty_time(payment.created_at) %></td>
           <td class="amount text-center"><%= payment.display_amount %></td>
           <td class="text-center"><%= payment_method_name(payment) %></td>
           <td class="text-center"><%= payment.transaction_id %></td>
           <td class="text-center">
-            <span class="badge badge-<%= payment.state %>">
+            <span class="badge badge-pill badge-<%= payment.state %>">
               <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
             </span>
           </td>
@@ -28,9 +28,9 @@
             <span class="d-flex justify-content-center payment-action-buttons">
               <% payment.actions.each do |action| %>
                 <% if action == 'credit' %>
-                  <%= link_to_with_icon('exit.svg', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:create, Spree::Refund) %>
+                  <%= link_to_with_icon('exit.svg', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-light btn-sm") if can?(:create, Spree::Refund) %>
                 <% else %>
-                  <%= link_to_with_icon(action + '.svg', Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-outline-secondary btn-sm") if can?(action.to_sym, payment) %>
+                  <%= link_to_with_icon(action + '.svg', Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-light btn-sm") if can?(action.to_sym, payment) %>
                 <% end %>
               <% end %>
             </span>

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

@@ -8,10 +8,6 @@
   <% end %>
 <% end %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:payments) %>
-<% end %>
-
 <% if @order.outstanding_balance? %>
   <div class="alert alert-info outstanding-balance">
     <%= @order.outstanding_balance < 0 ? Spree.t(:credit_owed) : Spree.t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong>
@@ -31,7 +27,7 @@
   <% end %>
 
 <% else %>
-  <div class="alert alert-info no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
+  <div class="text-center no-objects-found m-5"><%= Spree.t(:order_has_no_payments) %></div>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/order_summary' %>

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

@@ -1,9 +1,5 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:new_payment) %>
-<% end %>
-
 <% if @payment_methods.any? %>
   <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment } %>
 
@@ -18,8 +14,9 @@
   <% end %>
 
 <% else %>
-  <div class="alert alert-info">
+  <div class="text-center m-5">
     <%= Spree.t(:cannot_create_payment_without_payment_methods) %>
+    <br />
     <%= link_to Spree.t(:please_define_payment_methods), spree.admin_payment_methods_url %>
   </div>
 <% end %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -2,7 +2,7 @@
 <% if previous_cards.any? %>
   <div class="card my-3">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5"><%= Spree.t(:previously_used_card) %></h1>
+      <h5 class="card-title mb-0 h6"><%= Spree.t(:previously_used_card) %></h5>
     </div>
       <div class="form-group previous_cards card-body mb-0" data-hook="previous_cards">
         <ul class="m-0 p-0">

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -1,7 +1,7 @@
 <fieldset data-hook="credit_card">
   <legend><%= Spree.t(:credit_card) %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered">
+  <div class="table-responsive border rounded bg-white mb-3">
+    <table class="table table-condensed">
       <tr>
         <th width="20%"><%= Spree.t(:name_on_card) %>:</th>
         <td><%= payment.source.name %></td>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -1,7 +1,7 @@
 <fieldset data-hook="store_credit">
   <legend><%= Spree.t(:store_credit_name) %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered">
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded">
       <tr>
         <th width="20%"><%= Spree.t(:used) %>:</th>
         <td><%= payment.source.display_amount_used %></td>

data/app/views/spree/admin/prices/_variant_prices.html.erb

@@ -1,13 +1,13 @@
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <div id="variant_prices-table-wrapper">
     <table class="table">
-      <thead>
+      <thead class="text-muted">
         <tr data-hook="variant_prices_header">
-          <th scope="col"><%= Spree.t(:options) %></th>
-          <th scope="col"><%= Spree.t(:sku) %></th>
-          <th scope="col"><%= Spree.t(:currency) %></th>
-          <th scope="col" style="min-width: 150px;"><%= Spree.t(:price) %></th>
-          <th scope="col" style="min-width: 150px;"><%= Spree.t(:compare_at_price) %></th>
+          <th scope="col" class="text-center"><%= Spree.t(:options) %></th>
+          <th scope="col" class="text-center"><%= Spree.t(:sku) %></th>
+          <th scope="col" class="text-center"><%= Spree.t(:currency) %></th>
+          <th scope="col" class="text-center" style="min-width: 150px;"><%= Spree.t(:price) %></th>
+          <th scope="col" class="text-center" style="min-width: 150px;"><%= Spree.t(:compare_at_price) %></th>
         </tr>
       </thead>
       <tbody id="variant-prices" data-hook="variant_prices_body">

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <%= yield :page_actions %>
-  <%= product_preview_link(@product) %>
+  <%= external_page_preview_link(@product) %>
 <% end %>
 
 <form>

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,22 +1,22 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <% if f.object.persisted? && can?(:edit, f.object) %>
   <td class="move-handle">
-    <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
   <% else %>
   <td style="opacity:0.2;">
-    <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
   <% end %>
   <td class='property_name'>
-    <%= f.text_field :property_name, class: 'autocomplete form-control' %>
+    <%= f.text_field :property_name, class: 'autocomplete form-control', required: true %>
   </td>
   <td class='value'>
-    <%= f.text_field :value, class: 'form-control' %>
+    <%= f.text_field :value, class: 'form-control', required: true %>
   </td>
-  <td class="show_property">
+  <td class="show_property text-center">
     <%= f.check_box :show_property %>
   </td>
   <td class="actions">

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

@@ -2,30 +2,31 @@
 <%= render 'spree/admin/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
-  <%= product_preview_link(@product) %>
-
-  <%= button_link_to(
-    Spree.t(:add_product_properties),
-    "javascript:;",
-    { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success spree_add_fields' }) %>
+  <%= external_page_preview_link(@product) %>
 
   <span class="js-new-ptype-link">
     <%= button_link_to Spree.t(:select_from_prototype),
       available_admin_prototypes_url,
-      { icon: 'list.svg', remote: true, 'data-update' => 'prototypes', class: 'btn-outline-secondary' } %>
+      { icon: 'list.svg', remote: true, 'data-update' => 'prototypes', class: 'btn-light' } %>
   </span>
+
+  <%= button_link_to(
+    Spree.t(:add_product_properties),
+    "javascript:;",
+    { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success spree_add_fields' }) %>
 <% end if can? :create, Spree::ProductProperty %>
 
 <%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
-    <div class=" table-responsive mb-3">
+    <div class="table-responsive border rounded mb-3 bg-white">
       <table id="product_properties" class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
-        <thead>
+        <thead class="text-muted">
           <tr data-hook="product_properties_header">
-            <th colspan="2"><%= Spree.t(:property) %></th>
+            <th></th>
+            <th><%= Spree.t(:property) %></th>
             <th><%= Spree.t(:value) %></th>
-            <th><%= Spree.t(:show_property) %></th>
+            <th class="text-center"><%= Spree.t(:show_property) %></th>
             <th class="actions"></th>
           </tr>
         </thead>

data/app/views/spree/admin/products/_add_stock_form.html.erb

@@ -1,10 +1,10 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:add_stock) %>
-  </h1>
+  </h5>
 </div>
 <% content_for :page_actions do %>
-  <%= product_preview_link(@product) %>
+  <%= external_page_preview_link(@product) %>
 <% end %>
 <div class="card-body">
   <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -5,11 +5,11 @@
         <a class=" sort-handle js-sort-handle">
           <%= svg_icon name: "move.svg", width: '22', height: '22' %>
         </a>
-        <div class="dropdown ">
-          <button class="btn btn-outline-secondary dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <div class="dropdown p-0">
+          <button class="btn btn-light dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= svg_icon name: "chevron-down.svg", width: '18', height: '18' %>
           </button>
-          <div class="dropdown-menu dropdown-menu-right p-0 mt-1" aria-labelledby="dropdownMenuButton">
+          <div class="dropdown-menu dropdown-menu-right p-2" aria-labelledby="dropdownMenuButton">
             <a href="{{ edit_product_url product.id }}" class="edit-product js-edit-product dropdown-item p-1"><%= Spree.t(:edit) %></a>
             <a href="javascript:;" class="delete-product js-delete-product dropdown-item p-1"><%= Spree.t(:remove) %></a>
           </div>
@@ -17,17 +17,17 @@
       </nav>
       <div class='image'>
         {{#if image }}
-          <div class="admin-product-image-container small-img">
+          <div class="admin-product-image-container">
             <img src='{{image}}' alt='{{ product.attributes.name }}' class='thumbnail rounded border border' />
           </div>
         {{ else }}
-          <div class="admin-product-image-container small-img">
+          <div class="admin-product-image-container">
             <%= inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%" %>
           </div>
         {{/if}}
       </div>
-      <div class="p-0 pt-1 text-center product-info">
-        <p class="name card-text">{{ product.attributes.name }}</p>
+      <div class="p-0 pt-3 text-center product-info">
+        <h6 class="name card-text">{{ product.attributes.name }}</h6>
         <p class="price card-text">{{ product.attributes.display_price }}</p>
       </div>
     </div>

data/app/views/spree/admin/products/_filters.html.erb

@@ -0,0 +1,31 @@
+<div data-hook="admin_products_sidebar">
+
+  <%= search_form_for [:admin, @search] do |f| %>
+    <div data-hook="admin_products_index_search" class="row">
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :search_by_name, Spree.t(:product_name) %>
+          <%= f.text_field :search_by_name, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+        </div>
+      </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
+          <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control js-filterable" %>
+        </div>
+      </div>
+      <div class="col-12">
+        <%= f.field_container :deleted_at_null do %>
+          <div class="custom-control custom-checkbox">
+            <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0', class: 'custom-control-input'}, '0', '1' %>
+            <%= f.label :deleted_at_null, Spree.t(:show_deleted), class: 'custom-control-label' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div data-hook="admin_products_index_search_buttons" class="form-actions">
+      <%= button Spree.t(:search), 'search.svg' %>
+    </div>
+  <% end %>
+
+</div>