spree_backend 4.1.13 → 4.2.0.rc4

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

@@ -6,7 +6,7 @@
 <% content_for :sidebar do %>
   <ul class="nav flex-column nav-pills" data-hook="admin_product_tabs">
     <%= content_tag :li do %>
-      <%= link_to_with_icon 'edit',
+      <%= link_to_with_icon 'edit.svg',
         Spree.t(:details),
         edit_admin_product_url(@product),
         class: "nav-link #{'active' if current == :details}" %>
@@ -14,7 +14,7 @@
     <% end if can?(:admin, Spree::Product) %>
 
     <%= content_tag :li do %>
-      <%= link_to_with_icon 'picture',
+      <%= link_to_with_icon 'images.svg',
         Spree.t(:images),
         spree.admin_product_images_url(@product),
         class: "nav-link #{'active' if current == :images}" %>
@@ -22,7 +22,7 @@
     <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
 
     <%= content_tag :li do %>
-      <%= link_to_with_icon 'th-large',
+      <%= link_to_with_icon 'adjust.svg',
         Spree.t(:variants),
         spree.admin_product_variants_url(@product),
         class: "nav-link #{'active' if current == :variants}" %>
@@ -30,7 +30,7 @@
     <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
 
     <%= content_tag :li do %>
-      <%= link_to_with_icon 'list-alt',
+      <%= link_to_with_icon 'list.svg',
         Spree.t(:properties),
         spree.admin_product_product_properties_url(@product),
         class: "nav-link #{'active' if current == :properties}" %>
@@ -38,11 +38,19 @@
     <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
 
     <%= content_tag :li do %>
-      <%= link_to_with_icon 'home',
+      <%= link_to_with_icon 'items.svg',
         Spree.t(:stock),
         stock_admin_product_url(@product),
         class: "nav-link #{'active' if current == :stock}" %>
 
     <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'money.svg',
+        Spree.t(:prices),
+        admin_product_prices_path(@product),
+        class: "nav-link #{'active' if current == :prices}" %>
+
+    <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
   </ul>
 <% end %>

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

@@ -1,32 +1,34 @@
-<table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
-  <thead>
-    <tr data-hook="refunds_header">
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th><%= Spree.t(:payment_identifier) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:payment_method) %></th>
-      <th><%= Spree.t(:transaction_id) %></th>
-      <th><%= Spree.t(:reason) %></th>
-      <% if show_actions %>
-        <th></th>
-      <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% refunds.each do |refund| %>
-      <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
-        <td><%= pretty_time(refund.created_at) %></td>
-        <td><%= refund.payment.number %></td>
-        <td class="amount"><%= refund.display_amount %></td>
-        <td><%= payment_method_name(refund.payment) %></td>
-        <td><%= refund.transaction_id %></td>
-        <td><%= truncate(refund.reason.name, length: 100) %></td>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
+    <thead>
+      <tr data-hook="refunds_header">
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th><%= Spree.t(:payment_identifier) %></th>
+        <th><%= Spree.t(:amount) %></th>
+        <th><%= Spree.t(:payment_method) %></th>
+        <th><%= Spree.t(:transaction_id) %></th>
+        <th><%= Spree.t(:reason) %></th>
         <% if show_actions %>
-          <td class="actions actions-1">
-            <%= link_to_with_icon('edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
-          </td>
+          <th></th>
         <% end %>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% refunds.each do |refund| %>
+        <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
+          <td><%= pretty_time(refund.created_at) %></td>
+          <td><%= link_to refund.payment.number, spree.admin_order_payment_path(refund.payment.order, refund.payment) %></td>
+          <td class="amount"><%= refund.display_amount %></td>
+          <td><%= payment_method_name(refund.payment) %></td>
+          <td><%= refund.transaction_id %></td>
+          <td><%= truncate(refund.reason.name, length: 100) %></td>
+          <% if show_actions %>
+            <td class="actions actions-1">
+              <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -2,16 +2,37 @@
   <div class="form-group date-range-filter">
     <%= label_tag nil, Spree.t(:date_range) %>
     <div class="date-range-filter row">
-      <div class="col-md-6">
-        <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]) %>
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
+        <div class="input-group datePickerFrom"
+             data-wrap="true"
+             data-max-date="<%= params[:q][:completed_at_lt] %>" >
+          <%= s.text_field :completed_at_gt,
+                           class: 'form-control shadow-none',
+                           placeholder: Spree.t(:starting_from),
+                           value: datepicker_field_value(params[:q][:completed_at_gt]),
+                           '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-min-date="<%= params[:q][:completed_at_gt] %>" >
+
+          <%= s.text_field :completed_at_lt,
+                           class: 'form-control shadow-none',
+                           placeholder: Spree.t(:ending_at),
+                           value: datepicker_field_value(params[:q][:completed_at_lt]),
+                           'data-input':'' %>
+          <%= render partial: 'spree/admin/shared/cal_close' %>
+        </div>
       </div>
-      <div class="col-md-6">
-        <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]) %>
-    </div>
     </div>
   </div>
 
   <div class="form-actions">
-    <%= button Spree.t(:search), 'search' %>
+    <%= button Spree.t(:search), 'search.svg' %>
   </div>
 <% end %>

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

@@ -1,5 +1,23 @@
+<div class="d-lg-none page-actions__close border-bottom text-right">
+  <button
+    id="contextual-menu-close"
+    class="btn btn-link"
+    type="button"
+    aria-expanded="false"
+    aria-label="Toggle page actions">
+    <%= svg_icon name: "cancel.svg", width: '20', height: '20' %>
+  </button>
+</div>
+<% if content_for?(:page_actions) %>
+  <div class="page-actions d-lg-none col-12 px-0 <% if content_for?(:sidebar) %>pb-3<% end %> text-center" data-hook="toolbar">
+    <div class="d-flex justify-content-center flex-wrap">
+      <%= yield :page_actions %>
+    </div>
+  </div>
+<% end %>
+
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" class="main-right-sidebar" data-hook>
+  <aside id="sidebar" class="main-right-sidebar px-2" data-hook>
     <%= yield :sidebar %>
   </aside>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% if content_for?(:table_filter) %>
-  <div class="filter-wrap row">
+  <div class="filter-wrap row mb-4">
     <div class="col-12">
       <div class="input-group index-filter-button">
         <span class="input-group-btn">
-          <button class="btn js-show-index-filters" type="button">
-            <span class="icon icon-chevron-right"></span>
+          <button class="btn js-show-index-filters m-0" type="button">
+              <%= svg_icon name: "chevron-right.svg", width: '12', height: '12' %>
             <%= Spree.t(:filter) %>
           </button>
         </span>

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

@@ -10,10 +10,42 @@
     confirm_delete:           Spree.t(:confirm_delete),
     currency_separator:       I18n.t('number.currency.format.separator'),
     cut:                      Spree.t(:cut),
+
     date_picker:              Spree.t(:js_format, scope: 'date_picker', default: 'yy/mm/dd'),
+    firstDay:                 Spree.t(:first_day, scope: 'date_picker', default: (0).to_i),
+    rangeSep:                 Spree.t(:rangeSeparator, scope: 'date_picker', default: ' to '),
+    weekAbbr:                 Spree.t(:weekAbbreviation, scope: 'date_picker', default: 'Wk'),
+    scrollTitle:              Spree.t(:scrollTitle, scope: 'date_picker', default: 'Scroll to increment'),
+    toggleTitle:              Spree.t(:toggleTitle, scope: 'date_picker', default: 'Click to toggle'),
+    am:                       Spree.t(:am, scope: 'date_picker', default: 'AM'),
+    pm:                       Spree.t(:pm, scope: 'date_picker', default: 'PM'),
+    yearAriaLabel:            Spree.t(:yearAriaLabel, scope: 'date_picker', default: 'Year'),
+    hourAriaLabel:            Spree.t(:hourAriaLabel, scope: 'date_picker', default: 'Hour'),
+    minuteAriaLabel:          Spree.t(:minuteAriaLabel, scope: 'date_picker', default: 'Minute'),
+
+    sun:                      Spree.t(:sun, scope: 'date_picker', default: 'Sun'),
+    mon:                      Spree.t(:mon, scope: 'date_picker', default: 'Mon'),
+    tue:                      Spree.t(:tue, scope: 'date_picker', default: 'Tue'),
+    wed:                      Spree.t(:wed, scope: 'date_picker', default: 'Wed'),
+    thu:                      Spree.t(:thu, scope: 'date_picker', default: 'Thu'),
+    fri:                      Spree.t(:fri, scope: 'date_picker', default: 'Fri'),
+    sat:                      Spree.t(:sat, scope: 'date_picker', default: 'Sat'),
+
+    lh_jan:                   Spree.t(:lh_jan, scope: 'date_picker', default: 'January'),
+    lh_feb:                   Spree.t(:lh_feb, scope: 'date_picker', default: 'February'),
+    lh_mar:                   Spree.t(:lh_mar, scope: 'date_picker', default: 'March'),
+    lh_apr:                   Spree.t(:lh_apr, scope: 'date_picker', default: 'April'),
+    lh_may:                   Spree.t(:lh_may, scope: 'date_picker', default: 'May'),
+    lh_jun:                   Spree.t(:lh_jun, scope: 'date_picker', default: 'June'),
+    lh_jul:                   Spree.t(:lh_jul, scope: 'date_picker', default: 'July'),
+    lh_aug:                   Spree.t(:lh_aug, scope: 'date_picker', default: 'August'),
+    lh_sep:                   Spree.t(:lh_sep, scope: 'date_picker', default: 'September'),
+    lh_oct:                   Spree.t(:lh_oct, scope: 'date_picker', default: 'October'),
+    lh_nov:                   Spree.t(:lh_nov, scope: 'date_picker', default: 'November'),
+    lh_dec:                   Spree.t(:lh_dec, scope: 'date_picker', default: 'December'),
+
     destroy:                  Spree.t(:destroy, scope: :actions),
     edit:                     Spree.t(:edit,    scope: :actions),
-    first_day:                Spree.t(:first_day, scope: 'date_picker', default: 0).to_i,
     find_a_taxon:             Spree.t(:find_a_taxon),
     item_stock_placeholder:   Spree.t(:choose_location),
     loading:                  Spree.t(:loading),
@@ -32,6 +64,7 @@
     save:                     Spree.t(:save,    scope: :actions),
     searching:                Spree.t(:searching),
     server_error:             Spree.t(:server_error),
+    select_an_option:         Spree.t(:select_an_option),
     sku:                      Spree.t(:sku),
     type_to_search:           Spree.t(:type_to_search),
     taxon_placeholder:        Spree.t(:taxon_placeholder),

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -2,6 +2,10 @@ $('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j S
 $('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
-  $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
-  $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% if @order.payment_state.present? %>
+    $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
+  <% end %>
+  <% if @order.shipment_state.present? %>
+    $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% end %>
 <% end %>

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">
@@ -22,7 +23,7 @@
             <%= named_type.name %>
           </td>
           <td class="align-center">
-            <%= Spree.t(named_type.active? ? :active : :inactive) %>
+            <%= active_badge(named_type.active, label: Spree.t(named_type.active? ? :active : :inactive)) %>
           </td>
           <td class="actions actions-1 text-right">
             <% if named_type.mutable? %>
@@ -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/_form.html.erb

@@ -11,7 +11,7 @@
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
       <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2-clear' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>
@@ -110,7 +110,7 @@
 
       <div class="card-body">
         <%= f.field_container :categories, class: ['form-group'] do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2-clear" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>
       </div>

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">
@@ -21,7 +22,11 @@
       <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
           <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
-          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td>
+            <% shipping_method.zones.each do |zone| %>
+              <%= link_to zone.name, spree.edit_admin_zone_path(zone) %>
+            <% end %>
+          </td>
           <td><%= shipping_method.calculator.description %></td>
           <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:none) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
@@ -32,6 +37,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>