spree_backend 4.1.13 → 4.2.0.rc4

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

@@ -8,6 +8,6 @@
 <%= form_for [:admin, @store] do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
-    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_stores_path(@store) } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: spree.admin_stores_path } %>
   </fieldset>
 <% end %>

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::Store) %>
+  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Store) %>
 <% end %>
 
 <% if @stores.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <th><%= Spree.t(:name) %></th>
@@ -18,21 +19,27 @@
     <tbody>
       <% @stores.each do |store| %>
         <tr>
-          <td><%= store.name %></td>
-          <td><%= link_to store.url, 'https://' + store.url, target: :blank %></td>
+          <td><%= store.unique_name %></td>
+          <td><%= link_to store.url, store.formatted_url, target: :blank %></td>
           <td><%= store.default_currency %></td>
-          <td><%= store.default ? "<strong>#{Spree.t(:say_yes)}</strong>".html_safe : Spree.t(:say_no) %>
+          <td><%= active_badge(store.default) %></td>
           <td class="actions actions-2 text-right" data-hook="admin_stores_index_row_actions">
-            <% if can?(:edit, store) && !store.default %>
-              <%= link_to_with_icon('ok', Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), no_text: true, method: :put, class: 'btn btn-warning btn-sm with-tip') %>
-            <% end %>
             <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
+
+            <% if can?(:edit, store) %>
+              <% btn_url = store.default? ? '#' : spree.set_default_admin_store_path(store) %>
+              <% btn_class = store.default? ? 'outline-secondary disabled' : 'warning' %>
+              <% btn_label = store.default? ? nil : Spree.t(:store_set_default_button) %>
+              <%= link_to_with_icon('save.svg', btn_label, btn_url, no_text: true, method: (store.default? ? nil : :put), class: "btn btn-#{btn_class} btn-sm with-tip", aria: {disabled: store.default?}) %>
+            <% end %>
+
             <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
           </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::StoreCredit)) %>

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

@@ -3,37 +3,39 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_tax_categories_link' %>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
 <% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>
-<table class="table" id='listing_tax_categories' data-hook>
-  <thead>
-    <tr data-hook="tax_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:tax_code) %></th>
-      <th><%= Spree.t(:description) %></th>
-      <th><%= Spree.t(:default) %></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @tax_categories.each do |tax_category|
-         @edit_url = edit_admin_tax_category_path(tax_category)
-         @delete_url = admin_tax_category_path(tax_category)
-    %>
-      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
-        <td><%= tax_category.name %></td>
-        <td><%= tax_category.tax_code %></td>
-        <td><%= tax_category.description %></td>
-        <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
-          <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+<div class="table-responsive">
+  <table class="table" id='listing_tax_categories' data-hook>
+    <thead>
+      <tr data-hook="tax_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:tax_code) %></th>
+        <th><%= Spree.t(:description) %></th>
+        <th><%= Spree.t(:default) %></th>
+        <th></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @tax_categories.each do |tax_category|
+           @edit_url = edit_admin_tax_category_path(tax_category)
+           @delete_url = admin_tax_category_path(tax_category)
+      %>
+        <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
+          <td><%= tax_category.name %></td>
+          <td><%= tax_category.tax_code %></td>
+          <td><%= tax_category.description %></td>
+          <td><%= active_badge(tax_category.is_default?) %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
+            <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxCategory)) %>,

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add.svg' %>
 <% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr data-hook="rate_header">
@@ -27,8 +28,8 @@
         <td><%=tax_rate.name %></td>
         <td><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
         <td><%=tax_rate.amount %></td>
-        <td><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td><%= active_badge(tax_rate.included_in_price?) %></td>
+        <td><%= active_badge(tax_rate.show_rate_in_label?) %></td>
         <td><%=tax_rate.calculator.to_s %></td>
         <td class="actions actions-2 text-right">
           <%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %>
@@ -38,6 +39,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxRate)) %>,

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -1,23 +1,25 @@
-<table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
-  <thead>
-    <tr data-hook="taxonomies_header">
-      <th class="no-border"></th>
-      <th><%= Spree.t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @taxonomies.each do |taxonomy| %>
-      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
-        <td class="move-handle">
-          <span class="icon icon-sort handle"></span>
-        </td>
-        <td><%= taxonomy.name %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
-          <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
-        </td>
+<div class="table-responsive">
+  <table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
+    <thead>
+      <tr data-hook="taxonomies_header">
+        <th class="no-border handel-head"></th>
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody id="sortVert">
+      <% @taxonomies.each do |taxonomy| %>
+        <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" >
+          <td class="move-handle">
+            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+          </td>
+          <td><%= taxonomy.name %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
+            <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -29,9 +29,9 @@
     </div>
 
     <div class="form-actions">
-      <%= button Spree.t('actions.update'), 'ok', 'submit', { class: 'btn-success' } %>
+      <%= button Spree.t('actions.update'), 'save.svg', 'submit', { class: 'btn-success' } %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'cancel.svg' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_taxonomy_link' %>
+  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
 <% end if can?(:create, Spree::Taxonomy) %>
 
 <% if @taxonomies.any? %>

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

@@ -1,43 +1,47 @@
 <div data-hook="admin_inside_taxon_form">
-  <div class="row">
-    <div class="col-12 col-md-5">
-      <%= f.field_container :name, class: ['form-group'] do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-        <%= text_field :taxon, :name, class: 'form-control' %>
-        <%= f.error_message_on :name, class: 'error-message' %>
-      <% end %>
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+    <%= text_field :taxon, :name, class: 'form-control' %>
+    <%= f.error_message_on :name, class: 'error-message' %>
+  <% end %>
 
-      <%= f.field_container :permalink, class: ['form-group'] do %>
-        <%= label_tag :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
-        <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
-        <small class="form-text text-muted" id="permalink_part_display">
-          <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
-        </small>
-      <% end %>
+  <%= f.field_container :permalink, class: ['form-group'] do %>
+    <%= label_tag :permalink_part, raw(Spree.t(:permalink) + required_span_tag) %>
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <span class="input-group-text" id="basic-addon3">
+          <%= [current_store.formatted_url, 't', @parent_permalink].join('/') %>
+        </span>
+      </div>
+      <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
+    </div>
+  <% end %>
 
-      <%= f.field_container :hide_from_nav, class: ['form-group'] do %>
-        <%= f.label :hide_from_nav do %>
-          <%= Spree.t(:hide_from_subcategories_nav) %>
-          <br>
-          <%= f.check_box :hide_from_nav, { checked: @taxon.hide_from_nav } %>
-          <small><%= Spree.t(:say_yes) %></small>
-        <% end %>
-      <% end %>
+  <%= f.field_container :hide_from_nav, class: ['form-group'] do %>
+    <%= f.label :hide_from_nav do %>
+      <%= Spree.t(:hide_from_subcategories_nav) %>
+      <br>
+      <%= f.check_box :hide_from_nav, { checked: @taxon.hide_from_nav } %>
+      <small><%= Spree.t(:say_yes) %></small>
+    <% end %>
+  <% end %>
 
-      <%= f.field_container :icon, class: ['form-group'] do %>
-        <%= f.label :icon, Spree.t(:icon) %>
-        <%= image_tag main_app.url_for(@taxon.icon.try(:attachment)) if @taxon.icon %>
-        <%= f.file_field :icon %>
-      <% end %>
-    </div>
+  <%= f.field_container :icon, class: ['form-group'] do %>
+    <%= f.label :icon, Spree.t(:header_banner) %>
+    <%= image_tag(main_app.url_for(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
+    <%= f.file_field :icon %>
+    <% if @taxon.icon.present? %>
+      <%= link_to Spree.t(:remove_image),
+        remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id),
+        method: :delete
+      %>
+    <% end %>
+  <% end %>
 
-    <div class="col-12 col-md-7">
-      <%= f.field_container :description, class: ['form-group'] do %>
-        <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, class: 'form-control', rows: 6 %>
-      <% end %>
-    </div>
-  </div>
+  <%= f.field_container :description, class: ['form-group'] do %>
+    <%= f.label :description, Spree.t(:description) %>
+    <%= f.text_area :description, class: 'form-control', rows: 6 %>
+  <% end %>
 
   <%= f.field_container :meta_title, class: ['form-group'] do %>
     <%= f.label :meta_title, Spree.t(:meta_title) %>
@@ -46,7 +50,7 @@
 
   <%= f.field_container :meta_description, class: ['form-group'] do %>
     <%= f.label :meta_description, Spree.t(:meta_description) %>
-    <%= f.text_field :meta_description, class: 'form-control', rows: 6 %>
+    <%= f.text_area :meta_description, class: 'form-control', rows: 6 %>
   <% end %>
 
   <%= f.field_container :meta_keywords, class: ['form-group'] do %>

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

@@ -4,10 +4,10 @@
 
 <div class="taxon-products-view">
   <div class="form-group">
-    <%= text_field_tag :taxon_id %>
+    <%= select_tag :taxon_id, nil, class: 'd-block w-100' %>
   </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/_addresses_form.html.erb

@@ -25,12 +25,10 @@
       </div>
 
       <div class="card-body">
-          <p class="field checkbox" data-hook="use_billing">
-            <%= label_tag :use_billing, id: 'use_billing' do %>
-              <% checked = @user.bill_address.nil? ? false : @user.bill_address == @user.ship_address %>
-              <%= check_box_tag 'user[use_billing]', '1', checked %>
-              <%= Spree.t(:use_billing_address) %>
-            <% end %>
+          <p class="form-group" data-hook="use_billing">
+            <% checked = @user.bill_address.nil? ? false : @user.bill_address == @user.ship_address %>
+            <%= check_box_tag 'user[use_billing]', '1', checked, class: 'checkbox' %>
+            <%= label_tag :use_billing, Spree.t(:use_billing_address), for: 'user_use_billing', id: 'use_billing', class: 'form-check-label' %>
           </p>
         <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
           <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>

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>