spree_backend 4.1.13.1 → 4.2.0.beta

data/app/helpers/spree/admin/navigation_helper.rb

@@ -15,6 +15,9 @@ module Spree
       # Example:
       #   # Link to /admin/orders, also highlight tab for ProductsController and ShipmentsController
       #   tab :orders, :products, :shipments
+
+      ICON_SIZE = 16
+
       def tab(*args)
         options = { label: args.first.to_s }
 
@@ -48,7 +51,7 @@ module Spree
                  link_to(
                    titleized_label,
                    destination_url,
-                   class: "sidebar-submenu-item w-100 py-1 px-3 d-block #{'text-success' if selected}"
+                   class: "sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block #{'text-success' if selected}"
                  )
                end
 
@@ -61,9 +64,15 @@ module Spree
       # Single main menu item
       def main_menu_item(text, url: nil, icon: nil)
         link_to url, 'data-toggle': 'collapse', class: 'd-flex w-100 p-3 position-relative align-items-center' do
-          content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
-            content_tag(:span, " #{text}", class: 'text') +
-            content_tag(:span, nil, class: 'icon icon-chevron-left position-absolute')
+          if icon.ends_with?('.svg')
+            svg_icon(name: icon, classes: 'mr-2', width: ICON_SIZE, height: ICON_SIZE) +
+              content_tag(:span, " #{text}", class: 'text') +
+              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+          else
+            content_tag(:span, nil, class: "icon icon-#{icon} mr-2") +
+              content_tag(:span, " #{text}", class: 'text') +
+              svg_icon(name: 'chevron-left.svg', classes: 'drop-menu-indicator position-absolute', width: (ICON_SIZE - 4), height: (ICON_SIZE - 4))
+          end
         end
       end
 
@@ -86,17 +95,17 @@ module Spree
           end
         else
           per_page_default = Spree::Config.admin_orders_per_page
-          per_page_options = %w{15 30 45 60}
+          per_page_options = %w{25 50 75}
         end
 
         selected_option = params[:per_page].try(:to_i) || per_page_default
 
         select_tag(:per_page,
                    options_for_select(per_page_options, selected_option),
-                   class: "form-control pull-right js-per-page-select per-page-selected-#{selected_option}")
+                   class: "w-auto form-control js-per-page-select per-page-selected-#{selected_option} custom-select")
       end
 
-      # helper method to create proper url to apply per page filtering
+      # helper method to create proper url to apply per page ing
       # fixes https://github.com/spree/spree/issues/6888
       def per_page_dropdown_params(args = nil)
         args = params.permit!.to_h.clone
@@ -123,7 +132,7 @@ module Spree
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
         options[:class] = 'btn btn-primary btn-sm with-tip'
         options[:method] = :post
-        options[:icon] = :clone
+        options[:icon] = 'clone.svg'
         button_link_to '', clone_object_url(resource), options
       end
 
@@ -131,7 +140,7 @@ module Spree
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
         options[:class] = 'btn btn-warning btn-sm with-tip'
         options[:method] = :post
-        options[:icon] = :clone
+        options[:icon] = 'clone.svg'
         button_link_to '', clone_admin_promotion_path(promotion), options
       end
 
@@ -139,13 +148,13 @@ module Spree
         url = options[:url] || edit_object_url(resource)
         options[:data] = { action: 'edit' }
         options[:class] = 'btn btn-primary btn-sm'
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options = {})
         options[:data] = { action: 'edit' }
         options[:class] = 'btn btn-primary btn-sm'
-        link_to_with_icon('edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit.svg', Spree.t(:edit), url, options)
       end
 
       def link_to_delete(resource, options = {})
@@ -153,7 +162,7 @@ module Spree
         name = options[:name] || Spree.t(:delete)
         options[:class] = 'btn btn-danger btn-sm delete-resource'
         options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
-        link_to_with_icon 'delete', name, url, options
+        link_to_with_icon 'delete.svg', name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
@@ -162,20 +171,32 @@ module Spree
         text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
         options.delete(:no_text)
         if icon_name
-          icon = content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+          icon = if icon_name.ends_with?('.svg')
+                   svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: ICON_SIZE, height: ICON_SIZE)
+                 else
+                   content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+                 end
           text = "#{icon} #{text}"
         end
         link_to(text.html_safe, url, options)
       end
 
       def spree_icon(icon_name)
-        icon_name ? content_tag(:i, '', class: icon_name) : ''
+        if icon_name.ends_with?('.svg')
+          icon_name ? svg_icon(name: icon_name, classes: icon_name, width: ICON_SIZE, height: ICON_SIZE) : ''
+        else
+          icon_name ? content_tag(:span, '', class: icon_name) : ''
+        end
       end
 
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
-          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
+          icon = if icon_name.ends_with?('.svg')
+                   svg_icon(name: icon_name, classes: "icon icon-#{icon_name}", width: ICON_SIZE, height: ICON_SIZE)
+                 else
+                   content_tag(:span, '', class: "icon icon-#{icon_name}")
+                 end
           text = "#{icon} #{text}"
         end
         button_tag(
@@ -192,7 +213,7 @@ module Spree
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
-          form_tag(url, method: html_options.delete(:method), class: 'd-inline') do
+          form_tag(url, method: html_options.delete(:method)) do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else
@@ -206,11 +227,15 @@ module Spree
           html_options[:class] = html_options[:class] ? "btn #{html_options[:class]}" : 'btn btn-outline-secondary'
 
           if html_options[:icon]
-            icon = content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
+            icon = if html_options[:icon].ends_with?('.svg')
+                     svg_icon(name: html_options[:icon], classes: "icon icon-#{html_options[:icon]}", width: ICON_SIZE, height: ICON_SIZE)
+                   else
+                     content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
+                   end
             text = "#{icon} #{text}"
           end
 
-          link_to(text.html_safe, url, html_options)
+          link_to(text.html_safe, url, html_options.except(:icon))
         end
       end
 
@@ -222,7 +247,7 @@ module Spree
         options[:class] = 'sidebar-menu-item d-block w-100'
         options[:class] << ' selected' if is_selected
         content_tag(:li, options) do
-          link_to(link_text, url, class: "#{'text-success' if is_selected} py-1 px-3 d-block sidebar-submenu-item")
+          link_to(link_text, url, class: "#{'text-success' if is_selected} sidebar-submenu-item w-100 py-2 py-md-1 pl-3 d-block")
         end
       end
 
@@ -235,6 +260,9 @@ module Spree
       end
 
       def main_sidebar_classes
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::NavigationsHelper#main_sidebar_classes is deprecated and will be removed in Spree 5.0.
+        DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
           'col-3 col-md-2 sidebar'
         else
@@ -243,6 +271,9 @@ module Spree
       end
 
       def wrapper_classes
+        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Admin::NavigationsHelper#wrapper_classes is deprecated and will be removed in Spree 5.0.
+        DEPRECATION
         'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
       end
     end

data/app/helpers/spree/admin/orders_helper.rb

@@ -10,13 +10,13 @@ module Spree
           label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
           links << button_link_to(
             label.capitalize,
-            [event.to_sym, :admin, order],
+            [event, :admin, order],
             method: :put,
-            icon: event.to_s,
+            icon: event.to_s + '.svg',
             data: { confirm: Spree.t(:order_sure_want_to, event: label) }
           )
         end
-        safe_join(links, '&nbsp;'.html_safe)
+        safe_join(links, ''.html_safe)
       end
 
       def line_item_shipment_price(line_item, quantity)

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_first_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.first? %>
   <li class="first page-item">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
+    <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_gap.html.erb

@@ -5,7 +5,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="page gap disabled page-item">
+<li class="page gap disabled page-item d-none d-lg-flex">
   <a href="#" onclick="return false;" class="page-link">
     <%= raw(t 'views.pagination.truncate') %>
   </a>

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_last_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.last? %>
   <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
+    <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_next_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.last? %>
   <li class="next_page page-item">
-    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
+    <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
   </li>
 <% end %>

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_paginator.html.erb

@@ -9,7 +9,7 @@
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>
-  <ul class="pagination mt-4 <%= pagination_class %>">
+  <ul class="pagination d-inline-flex <%= pagination_class %>">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| %>

data/app/views/kaminari/{twitter-bootstrap-4 → admin-twitter-bootstrap-4}/_prev_page.html.erb

@@ -8,6 +8,6 @@
 -%>
 <% unless current_page.first? %>
   <li class="prev page-item">
-    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
+    <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
   </li>
 <% end %>

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -14,8 +14,8 @@
     <%= adjustment.display_amount.to_html %>
   </td>
   <td class="text-center">
-    <span class="badge badge-<%= adjustment.state %>">
-      <%= adjustment.state %>
+    <span class="text-lowercase badge badge-<%= adjustment.state %>">
+      <%= Spree.t("state_machine_states.#{adjustment.state}") %>
     </span>
   </td>
   <td class="actions actions-2 text-center">

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -1,22 +1,22 @@
 <div class="card-header">
   <h3 class="card-title mb-0 h5"><%= Spree.t(:order_adjustments) %></h3>
 </div>
-
-<table class="table table-bordered adjustments" data-hook="adjustments">
-  <thead data-hook="adjustmment_head">
-    <tr>
-      <th><%= Spree.t(:adjustable) %></th>
-      <th><%= Spree.t(:description) %></th>
-      <th class="text-center"><%= Spree.t(:amount) %></th>
-      <th class="text-center"><%= Spree.t(:status) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render partial: "adjustment", collection: @adjustments %>
-  </tbody>
-</table>
-
+<div class="table-responsive">
+  <table class="table table-bordered adjustments" data-hook="adjustments">
+    <thead data-hook="adjustmment_head">
+      <tr>
+        <th><%= Spree.t(:adjustable) %></th>
+        <th><%= Spree.t(:description) %></th>
+        <th class="text-center"><%= Spree.t(:amount) %></th>
+        <th class="text-center"><%= Spree.t(:status) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: "adjustment", collection: @adjustments %>
+    </tbody>
+  </table>
+</div>
 <% if can?(:edit, Spree::Adjustment) %>
   <div class="card-footer">
     <div class="row text-center pb-0">

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

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

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

@@ -1,11 +1,11 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments} %>
 
 <% content_for :page_title do %>
-   / <%= plural_resource_name(Spree::Adjustment) %>
+   / <%= Spree.t(:adjustments) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to(Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add') if can? :create, Spree::Adjustment %>
+  <%= button_link_to(Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), class: "btn-success", icon: 'add.svg') if can? :create, Spree::Adjustment %>
 <% end %>
 
 <% if @adjustments.present? %>
@@ -24,7 +24,7 @@
       <div class="form-group">
         <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code), class: "form-control" %>
       </div>
-      <%= button Spree.t(:add_coupon_code), 'plus', 'submit', id: "add_coupon_code" %>
+      <%= button Spree.t(:add_coupon_code), 'add.svg', 'submit', id: "add_coupon_code" %>
     </div>
   </div>
 <% end %>

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

@@ -13,7 +13,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'cancel' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -24,9 +24,14 @@
   <% end %>
 
   <div data-hook="states_required" class="form-group checkbox">
-    <label>
-      <%= f.check_box :states_required %>
-      <%= Spree.t(:states_required) %>
-    </label>
+    <%= f.check_box :states_required %>
+    <%= f.label :states_required, Spree.t(:states_required) %>
+    <%= f.error_message_on :states_required %>
+  </div>
+
+  <div data-hook="zipcode_required" class="form-group checkbox">
+    <%= f.check_box :zipcode_required %>
+    <%= f.label :zipcode_required, Spree.t(:zipcode_required) %>
+    <%= f.error_message_on :zipcode_required %>
   </div>
 </div>

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

@@ -3,29 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_country' } %>
+  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_country' } %>
 <% end if can? :create, Spree::Country %>
-
-<table class="table" id='listing_countries' data-hook>
-  <thead>
-    <tr data-hook="tax_header">
-      <th><%= Spree.t(:country_name) %></th>
-      <th><%= Spree.t(:iso_name) %></th>
-      <th><%= Spree.t(:states_required) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @countries.each do |country| %>
-      <tr id="<%= spree_dom_id country %>" data-hook="country_row">
-        <td><%= country.name %></td>
-        <td><%= country.iso_name %></td>
-        <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(country, no_text: true) if can? :edit, country %>
-          <%= link_to_delete(country, no_text: true) if can? :delete, country %>
-        </td>
+<div class="table-responsive">
+  <table class="table" id='listing_countries' data-hook>
+    <thead>
+      <tr data-hook="tax_header">
+        <th><%= Spree.t(:country_name) %></th>
+        <th><%= Spree.t(:iso3) %></th>
+        <th><%= Spree.t(:states_required) %></th>
+        <th><%= Spree.t(:zipcode_required) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @countries.each do |country| %>
+        <tr id="<%= spree_dom_id country %>" data-hook="country_row">
+          <td><%= country.name %></td>
+          <td><%= country.iso3 %></td>
+          <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center"><%= country.zipcode_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(country, no_text: true) if can? :edit, country %>
+            <%= link_to_delete(country, no_text: true) if can? :delete, country %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -1,36 +1,38 @@
-<table class="table table-condensed table-bordered">
-  <thead data-hook="customer_return_header">
-    <tr>
-      <th><%= Spree.t(:number) %></th>
-      <th><%= Spree.t(:total) %></th>
-      <th><%= Spree.t(:status) %></th>
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% reimbursements.each do |reimbursement| %>
-      <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row">
-        <td>
-          <% if reimbursement.reimbursed? %>
-            <%= link_to reimbursement.number, url_for([:admin, @order, reimbursement]) %>
-          <% else %>
-            <%= reimbursement.number %>
-          <% end %>
-        </td>
-        <td><%= reimbursement.display_total %></td>
-        <td>
-          <span class="state <%= reimbursement_status_color(reimbursement) %>">
-            <%= reimbursement.reimbursement_status %>
-          </span>
-        </td>
-        <td><%= pretty_time(reimbursement.created_at) %></td>
-        <td class="actions actions-1">
-          <% if !reimbursement.reimbursed? %>
-            <%= link_to_edit_url(url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true) if can?(:edit, reimbursement) %>
-          <% end %>
-        </td>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered">
+    <thead data-hook="customer_return_header">
+      <tr>
+        <th><%= Spree.t(:number) %></th>
+        <th><%= Spree.t(:total) %></th>
+        <th><%= Spree.t(:status) %></th>
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% reimbursements.each do |reimbursement| %>
+        <tr id="<%= spree_dom_id(reimbursement) %>" data-hook="reimbursement_row">
+          <td>
+            <% if reimbursement.reimbursed? %>
+              <%= link_to reimbursement.number, url_for([:admin, @order, reimbursement]) %>
+            <% else %>
+              <%= reimbursement.number %>
+            <% end %>
+          </td>
+          <td><%= reimbursement.display_total %></td>
+          <td>
+            <span class="state <%= reimbursement_status_color(reimbursement) %>">
+              <%= reimbursement.reimbursement_status %>
+            </span>
+          </td>
+          <td><%= pretty_time(reimbursement.created_at) %></td>
+          <td class="actions actions-1">
+            <% if !reimbursement.reimbursed? %>
+              <%= link_to_edit_url(url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true) if can?(:edit, reimbursement) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>