spree_backend 3.1.14 → 3.2.0.rc1

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

@@ -3,27 +3,27 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_property), new_object_url, { :class => "btn-success", :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link' } %>
+  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_property', id: 'new_property_link' } %>
 <% end %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_property_sidebar">
     <%= search_form_for [:admin, @search] do |f| %>
 
-      <%- locals = {:f => f} %>
+      <%- locals = {f: f} %>
 
       <div class="row">
         <div class="col col-md-6">
           <div data-hook="admin_property_index_search" class="form-group">
             <%= f.label :name_cont, Spree.t(:name) %>
-            <%= f.text_field :name_cont, :class => "form-control js-quick-search-target" %>
+            <%= f.text_field :name_cont, class: "form-control js-quick-search-target" %>
           </div>
         </div>
 
         <div class="col-md-6">
           <div class="form-group">
             <%= f.label :presentation_cont, Spree.t(:presentation) %>
-            <%= f.text_field :presentation_cont, :class => "form-control" %>
+            <%= f.text_field :presentation_cont, class: "form-control" %>
           </div>
         </div>
       </div>
@@ -51,8 +51,8 @@
           <td><%= property.name %></td>
           <td><%= property.presentation %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit(property, :no_text => true) %>
-            <%= link_to_delete(property, :no_text => true) %>
+            <%= link_to_edit(property, no_text: true) %>
+            <%= link_to_delete(property, no_text: true) %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -10,7 +10,7 @@
       <tr id="row_<%= prototype.id %>" data-hook="available_row">
         <td><%= prototype.name %></td>
         <td class="actions actions-1">
-          <%= link_to_with_icon 'save', Spree.t(:select), select_admin_prototype_url(prototype), :class => ' btn btn-default btn-sm ajax select_properties_from_prototype', :no_text => true %>
+          <%= link_to_with_icon 'save', Spree.t(:select), select_admin_prototype_url(prototype), class: ' btn btn-default btn-sm ajax select_properties_from_prototype', no_text: true %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/prototypes/available.js.erb

@@ -1,2 +1,2 @@
-$("#prototypes").html('<%= escape_javascript(render :partial => "spree/admin/prototypes/prototypes") %>');
+$("#prototypes").html('<%= escape_javascript(render partial: "spree/admin/prototypes/prototypes") %>');
 $(".js-new-ptype-link").hide();

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

@@ -3,11 +3,11 @@
   <%= @prototype.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @prototype } %>
 
 <%= form_for [:admin, @prototype] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_prototype), new_object_url, { :class => "btn-success", :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
 <% end %>
 
 <% if @prototypes.any? %>
@@ -19,8 +19,8 @@
         <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
           <td><%= prototype.name %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
-            <%= link_to_delete(prototype, :no_text => true) %>
+            <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') %>
+            <%= link_to_delete(prototype, no_text: true) %>
           </td>
         </tr>
       <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @prototype } %>
 
 <% content_for :page_title do %>
   <%= link_to Spree.t(:prototypes), spree.admin_prototypes_url %> /
@@ -7,7 +7,7 @@
 
 <%= form_for [:admin, @prototype] do |f| %>
   <fieldset data-hook="new_prototype">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/prototypes/show.html.erb

@@ -5,7 +5,7 @@
     <% @prototype.option_types.each do |ot| %>
       <li class="option-type-field">
         <b>
-          <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
+          <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), id: "option_type_#{ot.id}", class: "option-type" %>
           <%= label_tag "option_type_#{ot.id}", ot.presentation %>
         </b>
         <ul class="option-type-values">

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

@@ -5,6 +5,8 @@
   / <%= Spree.t(:refund) %> <%= @refund.id %>
 <% end %>
 
+<%= render 'spree/admin/shared/error_messages', target: @refund %>
+
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset>
     <div data-hook="admin_refund_form_fields">

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

@@ -5,6 +5,8 @@
   / <%= Spree.t(:new_refund) %>
 <% end %>
 
+<%= render 'spree/admin/shared/error_messages', target: @refund %>
+
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset>
     <div data-hook="admin_refund_form_fields">

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

@@ -0,0 +1,32 @@
+<div data-hook="admin_reimbursement_type_form_fields" class="row">
+  <div class="col-md-8">
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name, Spree.t(:name) %>
+      <%= f.text_field :name, class:'form-control' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+  <%- if @reimbursement_type.new_record? %>
+    <div class="col-md-8">
+      <%= f.field_container :type, class: ['form-group'] do %>
+        <%= f.label :type, Spree.t(:type) %>
+        <%= f.select :type, options_for_select(Spree::ReimbursementType::KINDS), {:include_blank => false}, { :class => 'select2' } %>
+        <%= f.error_message_on :type %>
+      <% end %>
+    </div>
+  <% end %>
+  <div class="col-md-5">
+    <%= f.field_container :active, class: ['form-inline'] do %>
+      <%= f.check_box :active, class: 'form-control' %>
+      <%= f.label :active, Spree.t(:active) %>
+      <%= f.error_message_on :active %>
+    <% end %>
+  </div>
+  <div class="col-md-5">
+    <%= f.field_container :mutable, class: ['form-inline'] do %>
+      <%= f.check_box :mutable, class: 'form-control' %>
+      <%= f.label :mutable, Spree.t(:mutable) %>
+      <%= f.error_message_on :mutable %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:reimbursement_types), spree.admin_reimbursement_types_url %> /
+  <%= @reimbursement_type.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
+
+<%= form_for @reimbursement_type, :url => object_url, :method => :put do |reimbursement_form| %>
+  <%= render partial: 'form', locals: { f: reimbursement_form } %>
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
+<% end %>

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

@@ -2,12 +2,17 @@
   <%= plural_resource_name(Spree::ReimbursementType) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_reimbursement_type' } %>
+<% end if can?(:create, Spree::ReimbursementType) %>
+
 <% if @reimbursement_types.any? %>
   <table class="table" id='listing_reimbursement_types' data-hook>
     <thead>
       <tr data-hook="reimbursement_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:type) %></th>
+        <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
@@ -19,6 +24,10 @@
           <td>
             <%= reimbursement_type.type %>
           </td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
+            <%= link_to_delete reimbursement_type, no_text: true if can?(:delete, reimbursement_type) %>
+          </td>
         </tr>
       <% end %>
     </tbody>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t(:reimbursement_types), spree.admin_reimbursement_types_url %> /
+  <%= Spree.t(:new_reimbursement_type) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
+
+<%= form_for [:admin, @reimbursement_type] do |reimbursement_form| %>
+  <%= render partial: 'form', locals: { f: reimbursement_form } %>
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
+<% end %>

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

@@ -96,7 +96,7 @@
         <%= Spree.t(:reimburse) %>
       <% end %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), icon: 'remove-sign' %>
+      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), icon: 'remove-sign' %>
     <% end %>
   </div>
 </fieldset>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -4,7 +4,7 @@
 <% end %>
 
 <div class="well">
-  <%= render :partial => 'spree/admin/shared/report_order_criteria' %>
+  <%= render partial: 'spree/admin/shared/report_order_criteria' %>
 </div>
 
 <table class="table table-bordered admin-report" data-hook="sales_total">

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

@@ -10,7 +10,7 @@
           <% end %>
         </th>
         <th><%= Spree.t(:product) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:charged) %></th>
         <th><%= Spree.t(:pre_tax_refund_amount) %></th>
         <th><%= Spree.t(:reimbursement_type) %></th>
@@ -68,20 +68,20 @@
   <% end %>
 
   <%= f.field_container :stock_location, class: ['form-group'] do %>
-    <%= f.label :stock_location, Spree.t(:stock_location) %>
+    <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
     <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location_id %>
   <% end %>
 
   <%= f.field_container :reason, class: ['form-group'] do %>
-    <%= f.label :reason, Spree.t(:reason) %>
+    <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
     <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 
   <%= f.field_container :memo, class: ['form-group'] do %>
     <%= f.label :memo, Spree.t(:memo) %>
-    <%= f.text_area :memo, :class => 'form-control' %>
+    <%= f.text_area :memo, class: 'form-control' %>
     <%= f.error_message_on :memo %>
   <% end %>
 </div>

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

@@ -57,8 +57,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::CustomerReturn.model_name.human(count: :many)) %>.
-  </div>
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CustomerReturn)) %>.  </div>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection, per_page_action: :customer_returns } %>

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -7,10 +7,10 @@
     <%= link_to Spree.t(:all), spree.admin_return_authorizations_path %>
   </li>
   <li class="<%= "active" if params[:q][:state_eq] == "authorized" %>">
-    <%= link_to Spree.t(:authorized), params.merge({q: {state_eq: :authorized}}) %>
+    <%= link_to Spree.t(:authorized), params.to_h.merge({q: {state_eq: :authorized}}) %>
   </li>
   <li class="<%= "active" if params[:q][:state_eq] == "canceled" %>">
-    <%= link_to Spree.t(:canceled), params.merge({q: {state_eq: :canceled}}) %>
+    <%= link_to Spree.t(:canceled), params.to_h.merge({q: {state_eq: :canceled}}) %>
   </li>
 <% end %>
 
@@ -47,7 +47,7 @@
         <th><%= Spree.t(:created_at) %></th>
         <th><%= Spree.t(:number) %></th>
         <th><%= Spree.t(:order) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree.t(:status) %></th>
         <th></th>
       </tr>
     </thead>
@@ -69,7 +69,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::ReturnAuthorization.model_name.human(count: :many)) %>.
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>.
   </div>
 <% end %>
 

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

@@ -3,7 +3,7 @@
   <%= @role.name.capitalize %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @role } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>

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

@@ -3,7 +3,7 @@
   <%= Spree.t(:new_role) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @role } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>

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

@@ -8,8 +8,8 @@
 
   <div id="preference-settings" data-hook class="panel-body">
     <div class="form-group">
-      <%= f.label(:calculator_type, Spree.t(:calculator), :for => 'calc_type') %>
-      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc_type', :class => 'select2'}) %>
+      <%= f.label(:calculator_type, Spree.t(:calculator), for: 'calc_type') %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {id: 'calc_type', class: 'select2'}) %>
     </div>
     <% if !@object.new_record? %>
       <div class="form-group">

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

@@ -6,4 +6,4 @@
   show_flash('error', "<%= j error %>");
 <% end %>
 
-<%= render :partial => '/spree/admin/shared/update_order_state' if @order %>
+<%= render partial: '/spree/admin/shared/update_order_state' if @order %>

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

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success'} %>
+  <%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'delete' %>
 </div>

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

@@ -9,12 +9,13 @@
     <%= yield :title %>
   <% else %>
     <%= "Spree #{Spree.t('administration')}: " %>
-    <%= Spree.t(controller.controller_name, :default => controller.controller_name.titleize) %>
+    <%= Spree.t(controller.controller_name, default: controller.controller_name.titleize) %>
   <% end %>
 </title>
 
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
+<%= render 'spree/shared/paths' %>
 <%= javascript_include_tag 'spree/backend/all' %>
 <%= render "spree/admin/shared/translations" %>
 

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

@@ -1,6 +1,4 @@
-<% admin = try_spree_current_user.try(:has_spree_role?, "admin") %>
-
-<header class="header <%= admin ? "logged-in" : "logged-out" %>">
+<header class="header logged-in">
 
   <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
     <div class="container-fluid">
@@ -11,20 +9,15 @@
             spree.admin_path,
             class: "logo navbar-brand"
           ) %>
-          <% if admin %>
             <span class="navbar-toggle" id="sidebar-toggle">
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </span>
-          <% end %>
         </div>
-
-        <% if admin %>
-          <div class="col-sm-9 col-md-10">
-            <div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
-          </div>
-        <% end %>
+        <div class="col-sm-9 col-md-10">
+          <div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
+        </div>
       </div>
     </div>
   </nav>

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

@@ -1,7 +1,7 @@
 <% args = params.clone %>
 
 <% if defined?(per_page_action) %>
-  <% args.merge!(action: per_page_action) %>
+  <% args[:action] = per_page_action %>
 <% end %>
 
 <div class="row index-pagination-row">

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

@@ -39,3 +39,9 @@
     <%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
   </ul>
 <% end %>
+
+<% if can? :admin, current_store && Spree::Config[:admin_show_version] %>
+  <div class="spree-version hidden-xs hidden-sm">
+    <%= Spree.version %>
+  </div>
+<% end %>

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

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'ok', 'submit', {class: 'btn-success'} %>
+  <%= button Spree.t('actions.create'), 'ok', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'remove' %>
 </div>

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

@@ -11,7 +11,7 @@
         </td>
         <td>
           <span class="state label label-<%= @order.state %>">
-            <%= Spree.t(@order.state, :scope => :order_state) %>
+            <%= Spree.t(@order.state, scope: :order_state) %>
           </span>
         </td>
       </tr>
@@ -71,7 +71,7 @@
           </td>
           <td id='shipment_status'>
             <span class="state label label-<%= @order.shipment_state %>">
-              <%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %>
+              <%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %>
             </span>
           </td>
         </tr>
@@ -81,7 +81,7 @@
           </td>
           <td id='payment_status'>
             <span class="state label label-<%= @order.payment_state %>">
-              <%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>
+              <%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>
             </span>
           </td>
         </tr>

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

@@ -23,7 +23,7 @@
         <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% 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-default btn-sm") if can?(:edit, refund) %>
+            <%= 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-default btn-sm") if can?(:edit, refund) %>
           </td>
         <% end %>
       </tr>

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

@@ -1,12 +1,12 @@
-<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
+<%= search_form_for @search, url: spree.sales_total_admin_reports_path  do |s| %>
   <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]) %>
+        <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]) %>
       </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]) %>
+        <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]) %>
     </div>
     </div>
   </div>

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

@@ -1,44 +1,44 @@
 <script>
   Spree.translations = <%==
-  { :date_picker    => Spree.t(:js_format,
-                              :scope => 'date_picker',
-                              :default => 'yy/mm/dd'),
-    :abbr_day_names           => I18n.t(:abbr_day_names, :scope => :date),
-    :add                      => Spree.t(:add),
-    :are_you_sure_delete      => Spree.t(:are_you_sure_delete),
-    :bill_address             => Spree.t(:bill_address),
-    :choose_a_customer        => Spree.t(:choose_a_customer),
-    :confirm_delete           => Spree.t(:confirm_delete),
-    :cut                      => Spree.t(:cut),
-    :destroy                  => Spree.t(:destroy, :scope => :actions),
-    :edit                     => Spree.t(:edit,    :scope => :actions),
-    :save                     => Spree.t(:save,    :scope => :actions),
-    :cancel                   => Spree.t(:cancel,  :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),
-    :month_names              => I18n.t(:month_names, :scope => :date).instance_eval {|o|
+  { abbr_day_names:           I18n.t(:abbr_day_names, scope: :date),
+    add:                      Spree.t(:add),
+    are_you_sure_delete:      Spree.t(:are_you_sure_delete),
+    bill_address:             Spree.t(:bill_address),
+    cancel:                   Spree.t(:cancel,  scope: :actions),
+    choose_a_customer:        Spree.t(:choose_a_customer),
+    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'),
+    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),
+    month_names:              I18n.t(:month_names, scope: :date).instance_eval {|o|
                                      o.try(:reject, &:blank?) || o},
-    :more                     => Spree.t(:more),
-    :name                     => Spree.t(:name),
-    :next                     => Spree.t(:next),
-    :no_results               => Spree.t(:no_results),
-    :option_type_placeholder  => Spree.t(:option_type_placeholder),
-    :paste                    => Spree.t(:paste),
-    :previous                 => Spree.t(:previous),
-    :remove                   => Spree.t(:remove),
-    :rename                   => Spree.t(:rename),
-    :searching                => Spree.t(:searching),
-    :sku                      => Spree.t(:sku),
-    :type_to_search           => Spree.t(:type_to_search),
-    :taxon_placeholder        => Spree.t(:taxon_placeholder),
-    :variant_placeholder      => Spree.t(:variant_placeholder),
-    :value                    => Spree.t(:value),
-    :currency_separator       => I18n.t('number.currency.format.separator'),
-
+    more:                     Spree.t(:more),
+    name:                     Spree.t(:name),
+    new_taxon:                Spree.t(:new_taxon),
+    next:                     Spree.t(:next),
+    no_results:               Spree.t(:no_results),
+    option_type_placeholder:  Spree.t(:option_type_placeholder),
+    paste:                    Spree.t(:paste),
+    previous:                 Spree.t(:previous),
+    remove:                   Spree.t(:remove),
+    rename:                   Spree.t(:rename),
+    save:                     Spree.t(:save,    scope: :actions),
+    searching:                Spree.t(:searching),
+    server_error:             Spree.t(:server_error),
+    sku:                      Spree.t(:sku),
+    type_to_search:           Spree.t(:type_to_search),
+    taxon_placeholder:        Spree.t(:taxon_placeholder),
+    taxonomy_tree_error:      Spree.t(:taxonomy_tree_error),
+    tags_placeholder:         Spree.t(:tags_placeholder),
+    tracking:                 Spree.t(:tracking),
+    variant_placeholder:      Spree.t(:variant_placeholder),
+    value:                    Spree.t(:value)
   }.to_json
 %>
 </script>

data/app/views/spree/admin/shared/{_update_order_state.js → _update_order_state.js.erb}

@@ -1,7 +1,7 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, :scope => :order_state) %>');
+$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
 $('#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"]) %>');
+  $('#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"]) %>');
 <% end %>