spree_backend 4.1.14 → 4.2.0.beta

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -1,23 +1,25 @@
-<table class="table table-condensed table-bordered">
-  <thead>
-    <tr data-hook="taxons_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:path) %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% taxons.each do |taxon| %>
-      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
-        <td><%= taxon.name %></td>
-        <td><%= taxon_path taxon %></td>
-        <td class="actions">
-          <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete') + ' ' + Spree.t(:remove) %>
-        </td>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered">
+    <thead>
+      <tr data-hook="taxons_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:path) %></th>
+        <th></th>
       </tr>
-    <% end %>
-    <% if taxons.empty? %>
-      <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% taxons.each do |taxon| %>
+        <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
+          <td><%= taxon.name %></td>
+          <td><%= taxon_path taxon %></td>
+          <td class="actions">
+            <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete.svg) + ' ' + Spree.t(:remove) %>
+          </td>
+        </tr>
+      <% end %>
+      <% if taxons.empty? %>
+        <tr data-hook="taxons_none"><td colspan="3"><%= Spree.t(:none) %>.</td></tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -4,6 +4,10 @@
   <%= @taxon.name %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= taxon_preview_link(@taxon) %>
+<% end %>
+
 <%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 
@@ -13,8 +17,8 @@
   <%= render 'form', f: f %>
 
   <div class="form-actions" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'save' %>
+    <%= button Spree.t('actions.update'), 'save.svg' %>
     <span class="or"><%= Spree.t(:or) %></span>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "cancel.svg" %>
   </div>
 <% end %>

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

@@ -7,7 +7,7 @@
     <%= text_field_tag :taxon_id %>
   </div>
 
-  <ul id="taxon_products" class="taxon"></ul>
+  <ul id="taxon_products" class="taxon row"></ul>
 
   <%= render partial: "spree/admin/products/autocomplete", formats: :js %>
 </div>

data/app/views/spree/admin/users/_lifetime_stats.html.erb

@@ -4,27 +4,28 @@
       <%= Spree.t(:lifetime_stats) %>
     </h1>
   </div>
-
-  <table class="table" id="user-lifetime-stats" data-hook>
-    <tr>
-      <td width="30%"><%= Spree.t(:total_sales) %>:</td>
-      <td><%= @user.display_lifetime_value.to_html %></td>
-    </tr>
-    <tr>
-      <td><%= Spree.t(:num_orders) %>:</td>
-      <td><%= @user.order_count %></td>
-    </tr>
-    <tr>
-      <td><%= Spree.t(:average_order_value) %>:</td>
-      <td><%= @user.display_average_order_value.to_html %></td>
-    </tr>
-    <tr>
-      <td><%= Spree.t('admin.user.store_credits') %>:</td>
-      <td id="store_credit"><%= Spree::Money.new(@user.total_available_store_credit) %></td>
-    </tr>
-    <tr>
-      <td><%= Spree.t(:member_since) %>:</td>
-      <td><%= pretty_time(@user.created_at) %></td>
-    </tr>
-  </table>
+  <div class="table-responsive">
+    <table class="table" id="user-lifetime-stats" data-hook>
+      <tr>
+        <td width="30%"><%= Spree.t(:total_sales) %>:</td>
+        <td><%= @user.display_lifetime_value.to_html %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:num_orders) %>:</td>
+        <td><%= @user.order_count %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:average_order_value) %>:</td>
+        <td><%= @user.display_average_order_value.to_html %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t('admin.user.store_credits') %>:</td>
+        <td id="store_credit"><%= Spree::Money.new(@user.total_available_store_credit) %></td>
+      </tr>
+      <tr>
+        <td><%= Spree.t(:member_since) %>:</td>
+        <td><%= pretty_time(@user.created_at) %></td>
+      </tr>
+    </table>
+  </div>
 </div>

data/app/views/spree/admin/users/_sidebar.html.erb

@@ -5,31 +5,31 @@
 <% content_for :sidebar do %>
   <ul class="nav flex-column nav-pills" data-hook="admin_user_tab_options">
     <li>
-      <%= link_to_with_icon 'user',
+      <%= link_to_with_icon 'user.svg',
         Spree.t(:"admin.user.account"),
         spree.edit_admin_user_path(@user),
         class: "nav-link #{'active' if current == :account}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'user',
+      <%= link_to_with_icon 'location.svg',
         Spree.t(:"admin.user.addresses"),
         spree.addresses_admin_user_path(@user),
         class: "nav-link #{'active' if current == :address}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'shopping-cart',
+      <%= link_to_with_icon 'list.svg',
         Spree.t(:"admin.user.orders"),
         spree.orders_admin_user_path(@user),
         class: "nav-link #{'active' if current == :orders}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'edit',
+      <%= link_to_with_icon 'items.svg',
         Spree.t(:"admin.user.items"),
         spree.items_admin_user_path(@user),
         class: "nav-link #{'active' if current == :items}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'money',
+      <%= link_to_with_icon 'payments.svg',
         Spree.t(:"admin.user.store_credits"),
         spree.admin_user_store_credits_path(@user),
         class: "nav-link #{'active' if current == :store_credits}" %>

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,3 +1,3 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' if can?(:create, Spree::Order) %>
+  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Order) %>
 <% end %>

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

@@ -46,13 +46,13 @@
       </div>
       <div class="form-actions">
         <%= form_tag spree.clear_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('clear_key', scope: 'api'), 'delete', 'submit', class: "btn-danger" %>
+          <%= button Spree.t('clear_key', scope: 'api'), 'delete.svg', 'submit', class: "btn-danger" %>
         <% end %>
 
         <span class="or"><%= Spree.t(:or)%></span>
 
         <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('regenerate_key', scope: 'api'), 'save' %>
+          <%= button Spree.t('regenerate_key', scope: 'api'), 'recycle.svg' %>
         <% end %>
       </div>
 

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add', id: 'admin_new_user_link' %>
+  <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_user_link' %>
 <% end if can? :create, Spree::user_class %>
 
 <% content_for :table_filter_title do %>
@@ -38,34 +38,36 @@
         </div>
       <% end %>
       <div data-hook="admin_users_index_search_buttons" class="form-actions">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search), 'search.svg' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
 <% if @users.any? %>
-  <table class="table" id="listing_users" data-hook>
-    <thead>
-      <tr data-hook="admin_users_index_headers">
-        <th>
-          <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
-        </th>
-        <th data-hook="admin_users_index_header_actions" class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @users.each do |user|%>
-        <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-          <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
-          <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit user, no_text: true if can?(:edit, user) %>
-            <%= link_to_delete user, no_text: true if can?(:delete, user) %>
-          </td>
+  <div class="table-responsive">
+    <table class="table" id="listing_users" data-hook>
+      <thead>
+        <tr data-hook="admin_users_index_headers">
+          <th>
+            <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
+          </th>
+          <th data-hook="admin_users_index_header_actions" class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @users.each do |user|%>
+          <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
+            <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+            <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
+              <%= link_to_edit user, no_text: true if can?(:edit, user) %>
+              <%= link_to_delete user, no_text: true if can?(:delete, user) %>
+            </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.user_class)) %>,
@@ -73,4 +75,4 @@
   </div>
 <% end %>
 
-<%= paginate @users, theme: 'twitter-bootstrap-4' %>
+<%= paginate @users, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/users/items.html.erb

@@ -7,10 +7,10 @@
 <% end %>
 
 <fieldset data-hook="admin_user_items_purchased">
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
+    <div class="table-responsive">
     <table class="table table-condensed table-bordered stock-contents" id="listing_items" data-hook="stock-contents">
       <thead>
         <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
@@ -54,13 +54,14 @@
           <% end %>
         <% end %>
     </table>
+    </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), spree.new_admin_order_path %>!
     </div>
   <% end %>
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
+  <%= paginate @orders, theme: 'admin-twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

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

@@ -7,38 +7,39 @@
 <% end %>
 
 <fieldset data-hook="admin_user_order_history">
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
-    <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
-      <thead>
-        <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
-          <th><%= sort_link @search, :total,          I18n.t(:total, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_total_title'} %></th>
-        </tr>
-      </thead>
-      <tbody>
-      <% @orders.each do |order| %>
-        <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-          <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
-          <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
-          <td class="order-state">
-            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
-            <% if order.payment_state %>
-              <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
-            <% end %>
-            <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
-              <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
-            <% end %>
-          </td>
-          <td class="order-total"><%= order.display_total.to_html %></td>
-        </tr>
-      <% end %>
-      </tbody>
+    <div class="table-responsive">
+      <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
+        <thead>
+          <tr data-hook="admin_orders_index_headers">
+            <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
+            <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
+            <th><%= sort_link @search, :state,          I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
+            <th><%= sort_link @search, :total,          I18n.t(:total, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_total_title'} %></th>
+          </tr>
+        </thead>
+        <tbody>
+        <% @orders.each do |order| %>
+          <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+            <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
+            <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
+            <td class="order-state">
+              <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+              <% if order.payment_state %>
+                <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
+              <% end %>
+              <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
+                <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
+              <% end %>
+            </td>
+            <td class="order-total"><%= order.display_total.to_html %></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::Order)) %>,
@@ -46,7 +47,7 @@
     </div>
   <% end %>
 
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
+  <%= paginate @orders, theme: 'admin-twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -23,7 +23,7 @@
             </td>
             <td class="actions actions-1 text-center">
               <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                <span class="icon icon-add"></span>
+                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
               </button>
             </td>
           {{else}}
@@ -37,7 +37,7 @@
               </td>
               <td class="actions actions-1 text-center">
                 <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                  <span class="icon icon-add"></span>
+                   <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                 </button>
               </td>
             {{else}}
@@ -53,7 +53,7 @@
           </td>
           <td class="actions actions-1 text-center">
             <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-              <span class="icon icon-add"></span>
+              <%= svg_icon name: "add.svg", width: '16', height: '16' %>
             </button>
           </td>
         {{/if}}

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -19,7 +19,7 @@
             </td>
             <td class="actions actions-1">
               <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                <span class="icon icon-add"></span>
+                <%= svg_icon name: "add", width: '16', height: '16' %>
               </button>
             </td>
           {{else}}
@@ -33,7 +33,7 @@
               </td>
               <td class="actions actions-1">
                 <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                  <span class="icon icon-add"></span>
+                  <%= svg_icon name: "add", width: '16', height: '16' %>
                 </button>
               </td>
             {{else}}

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

@@ -24,6 +24,11 @@
         <%= f.text_field :price, value: number_to_currency(@variant.price, unit: ''), class: 'form-control' %>
       </div>
 
+      <div class="form-group" data-hook="compare_at_price">
+        <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
+        <%= f.text_field :compare_at_price, value: number_to_currency(@variant.compare_at_price, unit: ''), class: 'form-control' %>
+      </div>
+
       <div class="form-group" data-hook="cost_price">
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, value: number_to_currency(@variant.cost_price, unit: ''), class: 'form-control' %>
@@ -35,10 +40,17 @@
       </div>
 
       <div class="form-group" data-hook="discontinue_on">
-
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
-          <%= f.text_field :discontinue_on, value: datepicker_field_value(@variant.discontinue_on), class: 'datepicker form-control' %>
+          <div class="input-group datepicker" data-wrap="true" >
+            <%= f.text_field :discontinue_on,
+                             value: datepicker_field_value(@variant.discontinue_on),
+                             placeholder: Spree.t(:select_a_date),
+                             class: 'form-control shadow-none',
+                             'data-input':'' %>
+
+            <%= render partial: 'spree/admin/shared/cal_close' %>
+          </div>
       </div>
     </div>
   </div>