spree_backend 4.1.5 → 4.2.0.beta

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

@@ -12,11 +12,11 @@ module Spree
             label.capitalize,
             [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, ' '.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>

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

@@ -1,3 +1,4 @@
+<div class="table-responsive">
 <table class="show return-items-table table table-condensed table-bordered index">
   <thead>
     <tr>
@@ -48,3 +49,4 @@
     <% end %>
   </tbody>
 </table>
+</div>

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

@@ -1,45 +1,47 @@
-<table class="table table-condensed table-bordered">
-  <thead>
-    <tr>
-      <th>
-        <%= check_box_tag 'select-all' %>
-      </th>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:resellable) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= f.fields_for :return_items, return_items do |item_fields| %>
-      <% return_item = item_fields.object %>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered">
+    <thead>
       <tr>
-        <td class="align-center" class="inventory-unit-checkbox">
-          <div style="display:none">
-            <%= item_fields.hidden_field :inventory_unit_id %>
-            <%= item_fields.hidden_field :return_authorization_id %>
-            <%= item_fields.hidden_field :pre_tax_amount %>
-          </div>
-          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
-        </td>
-        <td>
-          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
-          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
-        </td>
-        <td>
-          <%= return_item.inventory_unit.variant.sku %>
-        </td>
-        <td class="align-center">
-          <%= return_item.display_pre_tax_amount %>
-        </td>
-        <td class="align-center">
-          <%= return_item.exchange_variant.try(:exchange_name) %>
-        </td>
-        <td class="align-center">
-          <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
-        </td>
+        <th>
+          <%= check_box_tag 'select-all' %>
+        </th>
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:pre_tax_amount) %></th>
+        <th><%= Spree.t(:exchange_for) %></th>
+        <th><%= Spree.t(:resellable) %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <%= f.fields_for :return_items, return_items do |item_fields| %>
+        <% return_item = item_fields.object %>
+        <tr>
+          <td class="align-center" class="inventory-unit-checkbox">
+            <div style="display:none">
+              <%= item_fields.hidden_field :inventory_unit_id %>
+              <%= item_fields.hidden_field :return_authorization_id %>
+              <%= item_fields.hidden_field :pre_tax_amount %>
+            </div>
+            <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
+          </td>
+          <td>
+            <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+          </td>
+          <td>
+            <%= return_item.inventory_unit.variant.sku %>
+          </td>
+          <td class="align-center">
+            <%= return_item.display_pre_tax_amount %>
+          </td>
+          <td class="align-center">
+            <%= return_item.exchange_variant.try(:exchange_name) %>
+          </td>
+          <td class="align-center">
+            <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::CustomerReturn) %>
-    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add', class: 'btn-success' %>
+    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add.svg', class: 'btn-success' %>
   <% end %>
 <% end %>
 
@@ -13,6 +13,7 @@
 <% if @order.shipments.any?(&:shipped?) %>
 
   <% if @customer_returns.any? %>
+  <div class="table-responsive">
     <table class="table">
       <thead data-hook="customer_return_header">
         <tr>
@@ -43,6 +44,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)) %>,

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

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