solidus_backend 2.4.2 → 2.5.0.beta1

data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb

@@ -16,9 +16,11 @@
             <label for="q_created_at_gt">Date Range</label>
             <div class="input-group date-range-fields">
               <input class="form-control datepicker datepicker-from" placeholder="From">
-              <span class="range-divider input-group-addon">
-                <i class="fa fa-arrow-right"></i>
-              </span>
+              <div class="input-group-prepend input-group-append">
+                <span class="input-group-text range-divider">
+                  <i class="fa fa-arrow-right"></i>
+                </span>
+              </div>
               <input class="form-control datepicker datepicker-to" placeholder="To">
             </div>
           </div>

data/app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb

@@ -2,7 +2,7 @@
   <div id="progress">
     <div class="wrapper">
       <div id="spinner" class="spinner"></div>
-      <div class="progress-message"><%= Spree.t(:loading) %>...</div>
+      <div class="progress-message"><%= t('spree.loading') %>...</div>
     </div>
   </div>
 <%- end %>

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

@@ -15,8 +15,10 @@
 
   <div class="col-1">
     <%= f.field_container :is_default, class: ['checkbox'] do %>
-      <%= f.check_box :is_default %>
-      <%= f.label :is_default %>
+      <label>
+        <%= f.check_box :is_default %>
+        <%= Spree::TaxCategory.human_attribute_name(:is_default) %>
+      </label>
     <% end %>
   </div>
 

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
 <% admin_breadcrumb(@tax_category.name) %>
 

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings) ) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings') ) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxCategory)) %>
 
 
@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
       <li>
-        <%= button_link_to Spree.t(:new_tax_category), new_object_url, id: 'admin_new_tax_categories_link' %>
+        <%= button_link_to t('spree.new_tax_category'), new_object_url, id: 'admin_new_tax_categories_link' %>
       </li>
     <% end %>
   </ul>
@@ -42,7 +42,7 @@
         <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><%= tax_category.is_default? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td class="actions">
           <% if can?(:update, tax_category) %>
             <%= link_to_edit tax_category, no_text: true %>
@@ -55,7 +55,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::TaxCategory,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
-<% admin_breadcrumb(Spree.t(:new_tax_category)) %>
+<% admin_breadcrumb(t('spree.new_tax_category')) %>
 
 
 <% content_for :page_actions do %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_tax_rate_form_fields">
     <fieldset data-hook="tax_rates" class=" no-border-bottom">
-      <legend align="center"><%= Spree.t(:general_settings) %></legend>
+      <legend align="center"><%= t('spree.general_settings') %></legend>
       <div class="row">
 
         <div class="col-5">
@@ -11,11 +11,13 @@
           <div data-hook="rate" class="field">
             <%= f.label :amount %>
             <%= f.text_field :amount, class: 'fullwidth' %>
-            <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
+            <br/><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
           </div>
           <div data-hook="included" class="field">
-            <%= f.check_box :included_in_price %>
-            <%= f.label :included_in_price, Spree.t(:included_in_price) %>
+            <label>
+              <%= f.check_box :included_in_price %>
+              <%= t('spree.included_in_price') %>
+            </label>
           </div>
         </div>
 
@@ -29,19 +31,23 @@
             <%= f.collection_select(:tax_category_ids, @available_categories, :id, :name, {}, {class: 'select2 fullwidth', multiple: "multiple"}) %>
           </div>
           <div data-hook="show_rate" class="field">
-            <%= f.check_box :show_rate_in_label %>
-            <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>
+            <label>
+              <%= f.check_box :show_rate_in_label %>
+              <%= t('spree.show_rate_in_label') %>
+            </label>
           </div>
 
           <div class="date-range-filter field">
-            <%= label_tag :validity_period, Spree.t(:validity_period) %>
-            <%= admin_hint Spree.t(:validity_period), Spree.t(:validity_period, scope: [:hints, "spree/tax_rate"]) %>
+            <%= label_tag :validity_period, t('spree.validity_period') %>
+            <%= admin_hint t('spree.validity_period'), t(:validity_period, scope: [:spree, :hints, "spree/tax_rate"]) %>
             <div class="date-range-fields input-group">
               <%= f.text_field :starts_at, class: 'datepicker form-control datepicker-from', value: datepicker_field_value(f.object.starts_at), placeholder: Spree::TaxRate.human_attribute_name(:starts_at) %>
 
-              <span class="range-divider input-group-addon">
-                <i class="fa fa-arrow-right"></i>
-              </span>
+              <div class="input-group-prepend input-group-append">
+                <span class="input-group-text range-divider">
+                  <i class="fa fa-arrow-right"></i>
+                </span>
+              </div>
 
               <%= f.text_field :expires_at, class: 'datepicker form-control datepicker-to', value: datepicker_field_value(f.object.expires_at), placeholder: Spree::TaxRate.human_attribute_name(:expires_at) %>
             </div>

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

@@ -1,7 +1,7 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
 <% admin_breadcrumb(@tax_rate.name) %>
 

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

@@ -1,14 +1,14 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxRate)) %>
 
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::TaxRate) %>
     <li>
-      <%= button_link_to Spree.t(:new_tax_rate), new_object_url %>
+      <%= button_link_to t('spree.new_tax_rate'), new_object_url %>
     </li>
   <% end %>
 <% end %>
@@ -42,18 +42,18 @@
     <tbody>
       <% @tax_rates.each do |tax_rate|%>
       <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-        <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
+        <td><%=tax_rate.zone.try(:name) || t('spree.not_available') %></td>
         <td><%=tax_rate.name %></td>
         <td>
           <% if tax_rate.tax_categories.any? %>
             <%= tax_rate.tax_categories.map(&:name).join(", ") %>
           <% else %>
-            <%= Spree.t(:not_available) %>
+            <%= t('spree.not_available') %>
           <% end %>
         </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><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
+        <td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
         <td><%=tax_rate.calculator.to_s %></td>
         <td class="actions">
@@ -69,7 +69,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::TaxRate,
                  new_resource_url: new_object_url %>

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

@@ -1,9 +1,9 @@
 <%= render 'spree/admin/shared/taxes_tabs' %>
 
-<% admin_breadcrumb(Spree.t(:settings)) %>
-<% admin_breadcrumb(Spree.t('admin.tab.taxes')) %>
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
-<% admin_breadcrumb(Spree.t(:new_tax_rate)) %>
+<% admin_breadcrumb(t('spree.new_tax_rate')) %>
 
 
 <% content_for :page_actions do %>

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { class: 'add-taxon-button' } %>
+    <%= button_link_to t('spree.add_taxon'), spree.admin_taxonomies_path, { class: 'add-taxon-button' } %>
   </li>
 <% end %>
 
@@ -13,8 +13,8 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div class="filter-actions actions">
-      <%= button Spree.t('actions.update') %>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path %>
+      <%= button t('spree.actions.update') %>
+      <%= button_link_to t('spree.actions.cancel'), admin_taxonomies_path %>
     </div>
   </fieldset>
 

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>
-      <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, id: 'admin_new_taxonomy_link' %>
+      <%= button_link_to t('spree.new_taxonomy'), spree.new_admin_taxonomy_url, id: 'admin_new_taxonomy_link' %>
     </li>
   <% end %>
 <% end %>
@@ -15,7 +15,7 @@
   <%= render 'list' %>
 </div>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Taxonomy,
                  new_resource_url: new_object_url %>

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

@@ -1,6 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
-<% admin_breadcrumb(Spree.t(:new_taxonomy)) %>
+<% admin_breadcrumb(t('spree.new_taxonomy')) %>
 
 
 <% content_for :page_actions do %>
@@ -12,7 +12,7 @@
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.create') %>
+      <%= button t('spree.actions.create') %>
     </div>
   </fieldset>
 <% end %>

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

@@ -10,7 +10,11 @@
       <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
       <div class="input-group">
         <% if @taxon.parent %>
-          <span class="input-group-addon"><%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %></span>
+          <div class="input-group-prepend">
+            <span class="input-group-text">
+              <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
+            </span>
+          </div>
         <% end %>
         <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br />
       </div>

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

@@ -1,9 +1,9 @@
-<% admin_breadcrumb(Spree.t(:taxon_edit)) %>
+<% admin_breadcrumb(t('spree.taxon_edit')) %>
 
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path %>
+    <%= button_link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path %>
   </li>
 <% end %>
 
@@ -13,7 +13,7 @@
   <%= render 'form', f: f %>
 
   <div class="form-buttons filter-actions" data-hook="buttons">
-    <%= button Spree.t('actions.update') %>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %>
+    <%= button t('spree.actions.update') %>
+    <%= button_link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy) %>
   </div>
 <% end %>

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

@@ -1,16 +1,16 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
-<% admin_breadcrumb(Spree.t('admin.taxons.display_order')) %>
+<% admin_breadcrumb(t('spree.admin.taxons.display_order')) %>
 
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:choose_a_taxon_to_sort_products_for) %>
-<% end %>
+<fieldset class="no-border-bottom">
+  <legend>
+    <%= t('spree.choose_a_taxon_to_sort_products_for') %>
+  </legend>
 
-<% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search" class="col-4">
     <input type='text' id='taxon_id' />
   </div>
-<% end %>
+</fieldset>
 
-<div class='col-10'>
+<div class='col-12'>
   <div id='taxon_products' class='list-group'></div>
 </div>

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

@@ -2,7 +2,7 @@
     
   <div data-hook="bill_address_wrapper" class="col-6">
     <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:billing_address) %></legend>
+      <legend align="center"><%= t('spree.billing_address') %></legend>
       <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
         <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
       <% end %>
@@ -11,7 +11,7 @@
 
   <div data-hook="ship_address_wrapper" class="col-6">
     <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+      <legend align="center"><%= t('spree.shipping_address') %></legend>
       <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
         <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: "shipping" } %>
       <% end %>

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

@@ -5,7 +5,7 @@
       <% if can?(:update_email, @user) %>
         <%= f.email_field :email, class: 'fullwidth' %>
       <% else %>
-        <span title="<%= Spree.t(:cannot_update_email) %>" class="fa fa-question-circle icon_link no-text with-tip"></span>
+        <span title="<%= t('spree.cannot_update_email') %>" class="fa fa-question-circle icon_link no-text with-tip"></span>
         <%= f.email_field :email, class: 'fullwidth', disabled: true %>
       <% end %>
       <%= error_message_on :user, :email %>
@@ -19,8 +19,11 @@
             <%= hidden_field_tag('user[spree_role_ids][]', nil) %>
             <% @roles.each do |role| %>
               <li>
-                <%= check_box_tag 'user[spree_role_ids][]', role.id, @user_roles.include?(role), id: "user_spree_role_#{role.name}" %>
-                <%= label_tag "user_spree_role_#{role.name}", role.name %>
+                <label>
+                  <%= check_box_tag 'user[spree_role_ids][]', role.id,
+                    @user_roles.include?(role), id: "user_spree_role_#{role.name}" %>
+                  <%= role.name %>
+                </label>
               </li>
             <% end %>
           <% else %>
@@ -39,8 +42,10 @@
           <% if can?(:manage, Spree::UserStockLocation) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
-                <%= check_box_tag 'user[stock_location_ids][]', stock_location.id, @user.stock_locations.include?(stock_location), id: "user_spree_stock_locations_#{stock_location.name}" %>
-                <%= label_tag stock_location.name %>
+                <label>
+                  <%= check_box_tag 'user[stock_location_ids][]', stock_location.id, @user.stock_locations.include?(stock_location), id: "user_spree_stock_locations_#{stock_location.name}" %>
+                  <%= stock_location.name %>
+                </label>
               </li>
             <% end %>
           <% else %>

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

@@ -1,18 +1,18 @@
 <% content_for :sidebar_title do %>
-  <%= Spree.t(:lifetime_stats) %>
+  <%= t('spree.lifetime_stats') %>
 <% end %>
 
 <% content_for :sidebar do %>
   <nav class="menu">
-    <fieldset class='no-border-top' data-hook="admin_user_lifetime_stats">
+    <fieldset class="no-border-top no-border-bottom" data-hook="admin_user_lifetime_stats">
       <dl id="user-lifetime-stats">
-        <dt><%= Spree.t(:total_sales) %>:</dt>
+        <dt><%= t('spree.total_sales') %>:</dt>
           <dd><%= @user.display_lifetime_value.to_html %></dd>
-        <dt><%= Spree.t(:num_orders) %>:</dt>
+        <dt><%= t('spree.num_orders') %>:</dt>
           <dd><%= @user.order_count.to_i %></dd>
-        <dt><%= Spree.t(:average_order_value) %>:</dt>
+        <dt><%= t('spree.average_order_value') %>:</dt>
           <dd><%= @user.display_average_order_value.to_html %></dd>
-        <dt><%= Spree.t(:member_since) %>:</dt>
+        <dt><%= t('spree.member_since') %>:</dt>
           <dd><%= l @user.created_at.to_date %></dd>
       </dl>
     </fieldset>

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

@@ -2,26 +2,26 @@
   <nav>
     <ul class='tabs' data-hook="admin_user_tab_options">
       <li<%== ' class="active"' if current == :account %>>
-        <%= link_to Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
+        <%= link_to t("spree.admin.user.account"), spree.edit_admin_user_path(@user) %>
       </li>
       <% if can?(:addresses, @user) %>
         <li<%== ' class="active"' if current == :address %>>
-          <%= link_to Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
+          <%= link_to t("spree.admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:orders, @user) %>
         <li<%== ' class="active"' if current == :orders %>>
-          <%= link_to Spree.t(:"admin.user.order_history"), spree.orders_admin_user_path(@user) %>
+          <%= link_to t("spree.admin.user.order_history"), spree.orders_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:items, @user) %>
         <li<%== ' class="active"' if current == :items %>>
-          <%= link_to Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
+          <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:display, Spree::StoreCredit) %>
         <li<%== ' class="active"' if current == :store_credits %>>
-          <%= link_to Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
+          <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>
       <% end %>
     </ul>