spree_backend 4.1.13 → 4.2.0.rc4

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

@@ -1,20 +1,21 @@
 <% content_for :page_title do %>
   <%= Spree.t(:reports) %>
 <% end %>
-
-<table class="table">
-  <thead>
-    <tr data-hook="reports_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:description) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @reports.each do |key, value| %>
-    <tr data-hook="reports_row">
-      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= value[:description] %></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="table-responsive">
+  <table class="table">
+    <thead>
+      <tr data-hook="reports_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:description) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @reports.each do |key, value| %>
+      <tr data-hook="reports_row">
+        <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
+        <td><%= value[:description] %></td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -8,24 +8,25 @@
     <%= render partial: 'spree/admin/shared/report_order_criteria' %>
   </div>
 </div>
-
-<table class="table table-bordered admin-report" data-hook="sales_total">
-  <thead>
-    <tr>
-      <th><%= Spree.t(:currency) %></th>
-      <th><%= Spree.t(:item_total) %></th>
-      <th><%= Spree.t(:adjustment_total) %></th>
-      <th><%= Spree.t(:sales_total) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @totals.each do |key, row| %>
+<div class="table-responsive">
+  <table class="table table-bordered admin-report" data-hook="sales_total">
+    <thead>
       <tr>
-        <td><%= key %></td>
-        <td><%= Spree::Money.new(row[:item_total], { currency: key }) %></td>
-        <td><%= Spree::Money.new(row[:adjustment_total], { currency: key }) %></td>
-        <td><%= Spree::Money.new(row[:sales_total], { currency: key }) %></td>
+        <th><%= Spree.t(:currency) %></th>
+        <th><%= Spree.t(:item_total) %></th>
+        <th><%= Spree.t(:adjustment_total) %></th>
+        <th><%= Spree.t(:sales_total) %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @totals.each do |key, row| %>
+        <tr>
+          <td><%= key %></td>
+          <td><%= Spree::Money.new(row[:item_total], { currency: key }) %></td>
+          <td><%= Spree::Money.new(row[:adjustment_total], { currency: key }) %></td>
+          <td><%= Spree::Money.new(row[:sales_total], { currency: key }) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -1,7 +1,8 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-hook="admin_return_authorization_form_fields">
-  <table class="table table-condensed table-bordered index return-items-table">
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered return-items-table">
     <thead>
       <tr data-hook="rma_header">
         <th>
@@ -32,7 +33,9 @@
             <% end %>
           </td>
           <td>
-            <div class="variant-name"><%= inventory_unit.variant.name %></div>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
             <div class="variant-options"><%= inventory_unit.variant.options_text %></div>
           </td>
           <td><%= inventory_unit.state.humanize %></td>
@@ -58,7 +61,7 @@
           </td>
           <td>
             <% if editable %>
-              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2'} %>
+              <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2-clear'} %>
             <% end %>
           </td>
           <td>
@@ -66,7 +69,7 @@
               <% if return_item.exchange_processed? %>
                 <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2-clear return-item-exchange-selection" } %>
               <% end %>
             <% end %>
           </td>
@@ -74,20 +77,20 @@
       <% end %>
     </tbody>
   </table>
-
+</div>
   <%= f.field_container :amount, class: ['alert alert-info'] do %>
     <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
   <% end %>
 
   <%= f.field_container :stock_location, class: ['form-group'] do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
-    <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+    <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location %>
   <% end %>
 
   <%= f.field_container :reason, class: ['form-group'] do %>
     <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
-    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
+    <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 

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

@@ -1,6 +1,6 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
-    <%= button_link_to Spree.t('actions.cancel'), cancel_admin_order_return_authorization_url(@order, @return_authorization), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete" %>
+    <%= button_link_to Spree.t('actions.cancel'), cancel_admin_order_return_authorization_url(@order, @return_authorization), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete.svg" %>
   <% end %>
 <% end %>
 
@@ -18,9 +18,9 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'repeat' %>
+      <%= button Spree.t('actions.update'), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::ReturnAuthorization) %>
-    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-success", icon: 'add' %>
+    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-success", icon: 'add.svg' %>
   <% end %>
 <% end %>
 
@@ -11,6 +11,7 @@
 <% end %>
 
 <% if @order.shipments.any?(&:shipped?) && @order.return_authorizations.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead data-hook="rma_header">
       <tr>
@@ -26,9 +27,9 @@
         <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
           <td><%= return_authorization.number %></td>
           <td>
-            <span class="badge badge-<%= return_authorization.state %>">
+            <strong class="badge badge-<%= return_authorization.state %> text-uppercase">
               <%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
-            </span>
+            </strong>
           </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
@@ -42,6 +43,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% elsif @order.shipments.any?(&:shipped?) %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>

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

@@ -10,9 +10,9 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'save' %>
+      <%= button Spree.t(:create), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -14,15 +14,14 @@
         </div>
       </div>
       <div data-hook="admin_return_authorisations_index_filters_buttons" class="form-actions">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search), 'search.svg' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :customer_returns } %>
-
 <% if @collection.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="rate_header">
@@ -37,14 +36,14 @@
     <tbody>
       <% @collection.each do |customer_return| %>
         <tr id="<%= spree_dom_id customer_return %>" data-hook="customer_return_row">
-          <td><%= customer_return.created_at.to_date %></td>
+          <td><%= customer_return.created_at.strftime('%F %T %Z') %></td>
           <td><%= link_to customer_return.number, spree.edit_admin_order_customer_return_path(customer_return.order, customer_return) %></td>
           <td><%= link_to customer_return.order.number, spree.edit_admin_order_path(customer_return.order) %></td>
           <td>
             <% if customer_return.fully_reimbursed? %>
-              <span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
+              <span class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></span>
             <% else %>
-              <span class="badge badge-info"><%= Spree.t(:incomplete) %></span>
+              <span class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></span>
             <% end %>
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>
@@ -55,6 +54,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CustomerReturn)) %>.  </div>

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -33,20 +33,19 @@
         <div class="col-12 col-lg-6">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2-clear js-filterable' %>
           </div>
         </div>
       </div>
       <div data-hook="admin_return_authorisations_index_filters_buttons" class="form-actions">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search), 'search.svg' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :return_authorizations } %>
-
 <% if @collection.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="rate_header">
@@ -60,11 +59,11 @@
     <tbody>
       <% @collection.each do |return_authorization| %>
         <tr id="<%= spree_dom_id return_authorization %>" data-hook="return_authorization_row">
-          <td><%= return_authorization.created_at.to_date %></td>
+          <td><%= return_authorization.created_at.strftime('%F %T %Z') %></td>
           <td><%= link_to return_authorization.number, spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization) %></td>
           <td><%= link_to return_authorization.order.number, spree.edit_admin_order_path(return_authorization.order) %></td>
           <td>
-            <span class="badge badge-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
+            <span class="badge badge-<%= return_authorization.state %> text-uppercase"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
           <td class="actions actions-1 text-right">
             <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
@@ -73,6 +72,7 @@
       <% end %>
     </tbody>
   </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>.

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 overflow-hidden 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 %>