spree_backend 4.1.10 → 4.2.0.rc2

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

@@ -1,6 +1,6 @@
 <% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
   <small
-    class="spree-version <%= 'd-md-block' if cookies['sidebar-minimized'] == 'false' %> d-none font-weight-bold ml-3 my-3 text-muted"
+    class="spree-version font-weight-bold ml-3 my-3 text-muted"
     aria-label="Spree Commerce version">
     <%= Spree.version %>
   </small>

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', class: "btn-success" } %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-success" } %>
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_named_types' data-hook>
     <thead>
       <tr data-hook="named_types_header">
@@ -34,6 +35,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: resource_name) %>,

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add.svg' %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="categories_header">
@@ -26,6 +27,7 @@
       <% end %>
     </tbody>
   </table>
+</div>  
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingCategory)) %>,

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add', id: 'admin_new_shipping_method_link' %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_shipping_methods'>
     <thead>
       <tr data-hook="admin_shipping_methods_index_headers">
@@ -32,6 +33,7 @@
       <% end %>
     </tbody>
   </table>
+</div>  
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingMethod)) %>,

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

@@ -5,6 +5,7 @@
 <% end %>
 
 <% if @state_changes.any? %>
+<div class="table-responsive">
   <table class="table" id="listing_order_state_changes" data-hook>
     <thead>
       <tr data-hook="admin_orders_state_changes_headers">
@@ -18,10 +19,11 @@
 
     <tbody>
       <% @state_changes.each do |state_change| %>
+        <% scope = state_change.name == 'order'  ? "#{ state_change.name }_state" : "#{ state_change.name }_states" -%>
         <tr>
           <td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
-          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_state") : Spree.t(:previous_state_missing) %></td>
-          <td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name }_state") %></td>
+          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: scope) : Spree.t(:previous_state_missing) %></td>
+          <td><%= Spree.t(state_change.next_state, scope: scope) %></td>
           <td>
             <% if state_change.user %>
               <% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>
@@ -38,6 +40,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_state_changes) %>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -1,26 +1,27 @@
 <div id="new_state" data-hook></div>
-
-<table class="table" id='listing_states' data-hook>
-  <thead>
-    <tr data-hook="states_header">
-      <th><%= Spree.t(:name) %></th>
-      <th class="text-center"><%= Spree.t(:abbreviation) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @states.each do |state| %>
-      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
-        <td><%= state.name %></td>
-        <td class="text-center"><%= state.abbr %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(state, no_text: true) if can? :edit, state %>
-          <%= link_to_delete(state, no_text: true) if can? :delete, state %>
-        </td>
+<div class="table-responsive">
+  <table class="table" id='listing_states' data-hook>
+    <thead>
+      <tr data-hook="states_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="text-center"><%= Spree.t(:abbreviation) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-    <% if @states.empty? %>
-      <tr><td colspan="3"><%= Spree.t(:none) %></td></tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @states.each do |state| %>
+        <tr id="<%= spree_dom_id state %>" data-hook="states_row">
+          <td><%= state.name %></td>
+          <td class="text-center"><%= state.abbr %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(state, no_text: true) if can? :edit, state %>
+            <%= link_to_delete(state, no_text: true) if can? :delete, state %>
+          </td>
+        </tr>
+      <% end %>
+      <% if @states.empty? %>
+        <tr><td colspan="3"><%= Spree.t(:none) %></td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add', id: 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add.svg', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -31,9 +31,9 @@
     </div>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'plus' %>
+      <%= button Spree.t(:transfer_stock), 'add' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_stock_location' } %>
 <% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_stock_locations' data-hook>
     <thead>
       <tr data-hook="stock_locations_header">
@@ -33,6 +34,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockLocation)) %>,

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

@@ -4,35 +4,37 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
 <% end %>
 
 <% if @stock_movements.any? %>
-<table class="table" id='listing_stock_movements'>
-  <colgroup>
-    <col style="width: 35%">
-    <col style="width: 20%">
-    <col style="width: 45%">
-  </colgroup>
-  <thead>
-    <tr data-hook="admin_stock_movements_index_headers">
-      <th><%= Spree.t(:stock_item) %>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @stock_movements.each do |stock_movement|%>
-      <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
-        <td>
-          <%= display_variant(stock_movement) %>
-        </td>
-        <td><%= stock_movement.quantity %></td>
-        <td><%= pretty_originator(stock_movement) %></td>
+<div class="table-responsive">
+  <table class="table" id='listing_stock_movements'>
+    <colgroup>
+      <col style="width: 35%">
+      <col style="width: 20%">
+      <col style="width: 45%">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_stock_movements_index_headers">
+        <th><%= Spree.t(:stock_item) %>
+        <th><%= Spree.t(:quantity) %></th>
+        <th><%= Spree.t(:action) %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @stock_movements.each do |stock_movement|%>
+        <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
+          <td>
+            <%= display_variant(stock_movement) %>
+          </td>
+          <td><%= stock_movement.quantity %></td>
+          <td><%= pretty_originator(stock_movement) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockMovement)) %>,
@@ -40,4 +42,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_movements, theme: 'twitter-bootstrap-4' %>
+<%= paginate @stock_movements, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb

@@ -1,22 +1,24 @@
 <div id="source-movements-table" class="twelve columns alpha">
-  <table class="table sortable">
-    <thead data-hook="bulk_variants_header">
-      <tr>
-        <th><%= Spree.t('variant') %></th>
-        <th><%= Spree.t('sku') %></th>
-        <th><%= Spree.t('quantity') %></th>
-        <th><%= Spree.t('count_on_hand') %></th>
-      </tr>
-    </thead>
-    <tbody id="bulk_variants_tbody">
-      <% stock_movements.each do |movement| %>
+  <div class="table-responsive">
+    <table class="table sortable">
+      <thead data-hook="bulk_variants_header">
         <tr>
-          <td><%= movement.stock_item.variant.name %></td>
-          <td><%= movement.stock_item.variant.sku %></td>
-          <td><%= movement.quantity %></td>
-          <td><%= movement.stock_item.count_on_hand %></td>
+          <th><%= Spree.t('variant') %></th>
+          <th><%= Spree.t('sku') %></th>
+          <th><%= Spree.t('quantity') %></th>
+          <th><%= Spree.t('count_on_hand') %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody id="bulk_variants_tbody">
+        <% stock_movements.each do |movement| %>
+          <tr>
+            <td><%= movement.stock_item.variant.name %></td>
+            <td><%= movement.stock_item.variant.sku %></td>
+            <td><%= movement.quantity %></td>
+            <td><%= movement.stock_item.count_on_hand %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-success' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <div data-hook="admin_orders_index_search" class="card bg-light mb-3">
@@ -41,7 +41,7 @@
 
         <div class="form-actions">
           <div data-hook="admin_stock_transfers_index_search_buttons">
-            <%= button Spree.t(:filter_results), 'search' %>
+            <%= button Spree.t(:filter_results), 'search.svg' %>
           </div>
         </div>
       <% end %>
@@ -50,6 +50,7 @@
 </div>
 
 <% if @stock_transfers.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_stock_transfers' data-hook>
     <thead>
       <tr data-hook='stock_transfers_header'>
@@ -63,7 +64,7 @@
     <tbody>
       <% @stock_transfers.each do |stock_transfer| %>
         <tr id="<%= spree_dom_id stock_transfer %>" data-hook="stock_transfer_row">
-          <td><%= link_to stock_transfer.created_at, admin_stock_transfer_path(stock_transfer) %></td>
+          <td><%= link_to stock_transfer.created_at.strftime('%F %T %Z'), admin_stock_transfer_path(stock_transfer) %></td>
           <td><%= stock_transfer.reference %></td>
           <td><%= stock_transfer.source_location.try(:name) %></td>
           <td><%= stock_transfer.destination_location.try(:name) %></td>
@@ -74,6 +75,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockTransfer)) %>,
@@ -81,4 +83,4 @@
   </div>
 <% end %>
 
-<%= paginate @stock_transfers, theme: 'twitter-bootstrap-4' %>
+<%= paginate @stock_transfers, theme: 'admin-twitter-bootstrap-4' %>

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

@@ -77,7 +77,7 @@
             <div class="input-group">
               <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 1 %>
               <span class="input-group-btn">
-                <%= button Spree.t(:add), 'plus', 'submit', class: "transfer_add_variant" %>
+                <%= button Spree.t(:add), 'add.svg', 'submit', class: "transfer_add_variant" %>
               </span>
             </div>
           </div>
@@ -90,7 +90,7 @@
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>.
   </div>
 
-  <div id="transfer-variants-table" style="display:none">
+  <div id="transfer-variants-table" style="display:none" class="table-responsive">
     <table class="table table-bordered sortable">
       <thead data-hook="transfer_variants_header">
         <th><%= Spree.t(:name) %></th>
@@ -104,6 +104,6 @@
   </div>
 
   <div class="form-actions" data-hook="buttons">
-    <%= button Spree.t(:transfer_stock), 'plus transfer_transfer' %>
+    <%= button Spree.t(:transfer_stock), 'add.svg', class: 'transfer_transfer' %>
   </div>
 <% end %>

data/app/views/spree/admin/stock_transfers/show.html.erb

@@ -9,11 +9,11 @@
 
 <fieldset>
   <legend><%= Spree.t(:stock_transfer_name) %></legend>
-
+<div class="table-responsive">
   <table class="table table-bordered">
     <tr>
       <td width="30%"><strong><%= Spree.t(:created_at) %></strong></td>
-      <td><%= @stock_transfer.created_at %></td>
+      <td><%= pretty_time(@stock_transfer.created_at) %></td>
     </tr>
     <% if @stock_transfer.reference.present? %>
       <tr>
@@ -22,7 +22,7 @@
       </tr>
     <% end %>
   </table>
-
+</div>
   <% if @stock_transfer.source_movements.present? %>
     <fieldset>
       <legend id="stock-location-source">

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_store_credit_category_link' %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
 <% if @store_credit_categories.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="admin_store_credit_categories_index_headers">
@@ -26,6 +27,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-warning">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCreditCategory)) %>,

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

@@ -10,10 +10,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::StoreCredit) %>
+  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::StoreCredit) %>
 <% end %>
 
 <% if @store_credits.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <th><%= Spree.t(:credited) %></th>
@@ -41,6 +42,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>