spree_backend 3.1.14 → 3.2.0.rc1

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', :class => "btn-success" } %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', class: "btn-success" } %>
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
@@ -11,7 +11,7 @@
     <thead>
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree.t(:status) %></th>
         <th></th>
       </tr>
     </thead>

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

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

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :class => "btn-success", :icon => 'add' %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add' %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
@@ -19,8 +19,8 @@
       <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
         <td><%= shipping_category.name %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(shipping_category, :no_text => true) if can? :edit, shipping_category %>
-          <%= link_to_delete(shipping_category, :no_text => true) if can? :edit, shipping_category %>
+          <%= link_to_edit(shipping_category, no_text: true) if can? :edit, shipping_category %>
+          <%= link_to_delete(shipping_category, no_text: true) if can? :edit, shipping_category %>
         </td>
       </tr>
       <% end %>

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

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_shipping_category) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>
   <fieldset>
-    <%= 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/shipping_methods/_form.html.erb

@@ -1,17 +1,17 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
     <div data-hook="admin_shipping_method_form_name_field" class="col-md-6">
-      <%= f.field_container :name, :class => ['form-group'] do %>
+      <%= f.field_container :name, class: ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %>
-        <%= f.text_field :name, :class => 'form-control' %>
+        <%= f.text_field :name, class: 'form-control' %>
         <%= f.error_message_on :name %>
       <% end %>
     </div>
 
     <div data-hook="admin_shipping_method_form_display_field" class="col-md-6">
-      <%= f.field_container :display_on, :class => ['form-group'] do %>
+      <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { :class => 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { class: 'select2' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>
@@ -19,25 +19,25 @@
 
   <div class="row">
     <div data-hook="admin_shipping_method_form_internal_name_field" class="col-md-4">
-      <%= f.field_container :admin_name, :class => ['form-group'] do %>
+      <%= f.field_container :admin_name, class: ['form-group'] do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
-        <%= f.text_field :admin_name, :class => 'form-control', :label => false %>
+        <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <%= f.error_message_on :admin_name %>
       <% end %>
     </div>
 
     <div data-hook="admin_shipping_method_form_code" class="col-md-4">
-      <%= f.field_container :code, :class => ['form-group'] do %>
+      <%= f.field_container :code, class: ['form-group'] do %>
         <%= f.label :code, Spree.t(:code) %>
-        <%= f.text_field :code, :class => 'form-control', :label => false %>
+        <%= f.text_field :code, class: 'form-control', label: false %>
         <%= f.error_message_on :code %>
       <% end %>
     </div>
 
     <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-md-4">
-      <%= f.field_container :tracking_url, :class => ['form-group'] do %>
+      <%= f.field_container :tracking_url, class: ['form-group'] do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
-        <%= f.text_field :tracking_url, :class => 'form-control', :placeholder => Spree.t(:tracking_url_placeholder) %>
+        <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
         <%= f.error_message_on :tracking_url %>
       <% end %>
     </div>
@@ -54,7 +54,7 @@
       </div>
 
       <div class="panel-body">
-        <%= f.field_container :categories, :class => ['form-group'] do %>
+        <%= f.field_container :categories, class: ['form-group'] do %>
           <% Spree::ShippingCategory.all.each do |category| %>
             <div class="checkbox">
               <%= label_tag do %>
@@ -78,7 +78,7 @@
       </div>
 
       <div class="panel-body">
-        <%= f.field_container :zones, :class => ['form-group'] do %>
+        <%= f.field_container :zones, class: ['form-group'] do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
             <div class="checkbox">
@@ -97,7 +97,7 @@
 
 <div class="row">
   <div data-hook="admin_shipping_method_form_calculator_fields" class="col-md-6">
-    <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+    <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
   </div>
 
   <div class="col-md-6">
@@ -109,7 +109,7 @@
       </div>
 
       <div class="panel-body">
-        <%= f.field_container :categories, :class => ['form-group'] do %>
+        <%= f.field_container :categories, class: ['form-group'] do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>

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

@@ -4,14 +4,14 @@
 <% end %>
 
 <div data-hook="admin_shipping_method_edit_form_header">
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_edit_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="admin_shipping_method_edit_form_buttons">
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>
   <% end %>
 </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :class => "btn-success", :icon => 'add', :id => 'admin_new_shipping_method_link' %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add', id: 'admin_new_shipping_method_link' %>
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
@@ -25,8 +25,8 @@
           <td><%= shipping_method.calculator.description %></td>
           <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit(shipping_method, :no_text => true) if can? :edit, shipping_method %>
-            <%= link_to_delete(shipping_method, :no_text => true) if can? :delete, shipping_method %>
+            <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
+            <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>
           </td>
         </tr>
       <% end %>

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

@@ -4,16 +4,16 @@
 <% end %>
 
 <div data-hook="admin_shipping_method_new_form_header">
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_new_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
     <fieldset>
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div data-hook="admin_shipping_method_new_form_buttons">
-        <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
       </div>
     </fieldset>
   <% end %>

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

@@ -2,14 +2,14 @@
   <div class="col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %>
-      <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-md-6">
     <%= f.field_container :abbr, class: ['form-group'] do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
-      <%= f.text_field :abbr, :class => 'form-control' %>
+      <%= f.text_field :abbr, class: 'form-control' %>
     <% end %>
   </div>
 </div>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -14,8 +14,8 @@
         <td><%= state.name %></td>
         <td class="text-center"><%= state.abbr %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(state, :no_text => true) if can? :edit, state %>
-          <%= link_to_delete(state, :no_text => true) if can? :delete, state %>
+          <%= link_to_edit(state, no_text: true) if can? :edit, state %>
+          <%= link_to_delete(state, no_text: true) if can? :delete, state %>
         </td>
       </tr>
     <% end %>

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

@@ -3,11 +3,11 @@
   <%= @state.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @state } %>
 
 <%= form_for [:admin, @country, @state] 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/states/index.html.erb

@@ -3,16 +3,16 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :class => "btn-success", :icon => 'add', :id => 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">
   <%= label_tag :country, Spree.t(:country) %>
-  <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
+  <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
     <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
 </div>
 
 <div id="state-list" data-hook>
-  <%= render :partial => 'state_list'%>
+  <%= render partial: 'state_list'%>
 </div>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @state } %>
 
 <% content_for :page_title do %>
   <%= link_to Spree.t(:states), spree.admin_country_states_url(@country) %> /
@@ -7,7 +7,7 @@
 
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>
-    <%= 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/stock_locations/_form.html.erb

@@ -85,11 +85,3 @@
     <% end %>
   </div>
 </div>
-
-<% content_for :head do %>
-  <%= javascript_tag do %>
-    $(document).ready(function(){
-      $('span#country .select2').on('change', function() { update_state(''); });
-    });
-  <% end %>
-<% end %>

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -33,7 +33,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:transfer_stock), 'plus' %>
       <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>
   </fieldset>
 <% end %>

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

@@ -3,11 +3,11 @@
   <%= @stock_location.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>
 
 <%= form_for [:admin, @stock_location] 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/stock_locations/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_stock_location' } %>
 <% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>
@@ -11,7 +11,7 @@
     <thead>
       <tr data-hook="stock_locations_header">
         <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:state) %></th>
+        <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:stock_movements) %></th>
         <th class="actions"></th>
       </tr>
@@ -26,8 +26,8 @@
           <td><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
           <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
           <td class="actions actions-2 text-center">
-            <%= link_to_edit(stock_location, :no_text => true) if can? :create, stock_location %>
-            <%= link_to_delete(stock_location, :no_text => true) if can? :create, stock_location %>
+            <%= link_to_edit(stock_location, no_text: true) if can? :create, stock_location %>
+            <%= link_to_delete(stock_location, no_text: true) if can? :create, stock_location %>
           </td>
         </tr>
       <% end %>

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

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_stock_location) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
   <fieldset>
-    <%= 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/stock_transfers/index.html.erb

@@ -3,13 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <div data-hook="admin_orders_index_search" class="well">
   <fieldset>
     <legend><%= Spree.t(:search) %></legend>
-    <%= search_form_for @q, :url => admin_stock_transfers_path do |f| %>
+    <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
 
       <div class="row no-marginb">
         <div class="col-md-4">
@@ -66,7 +66,7 @@
           <td><%= stock_transfer.source_location.try(:name) %></td>
           <td><%= stock_transfer.destination_location.try(:name) %></td>
           <td class="actions actions-1">
-            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), :class => 'btn btn-default btn-sm', :no_text => true, :data => {:action => 'view'} %>
+            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-default btn-sm', no_text: true, data: {action: 'view'} %>
           </td>
         </tr>
       <% end %>

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

@@ -19,7 +19,7 @@
   {{/each}}
 </script>
 
-<%= form_tag admin_stock_transfers_path, :method => :post do %>
+<%= form_tag admin_stock_transfers_path, method: :post do %>
   <div class="panel panel-default">
     <div class="panel-heading">
       <h1 class="panel-title">

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

@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <fieldset>
@@ -28,7 +28,7 @@
       <legend id="stock-location-source">
         <%= Spree.t(:source) %> / <%= @stock_transfer.source_location.name %>
       </legend>
-      <%= render :partial => 'stock_movements', :object => @stock_transfer.source_movements %>
+      <%= render partial: 'stock_movements', object: @stock_transfer.source_movements %>
     </fieldset>
   <% end %>
 
@@ -37,7 +37,7 @@
       <legend id="stock-location-destination">
         <%= Spree.t(:destination) %> / <%= @stock_transfer.destination_location.name %>
       </legend>
-      <%= render :partial => 'stock_movements', :object => @stock_transfer.destination_movements %>
+      <%= render partial: 'stock_movements', object: @stock_transfer.destination_movements %>
     </fieldset>
   <% end %>
 

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

@@ -1,21 +1,21 @@
 <div data-hook="admin_tax_category_form_fields">
-  <%= f.field_container :name, :class => ['form-group'] do %>
+  <%= f.field_container :name, class: ['form-group'] do %>
     <%= f.label :name, Spree.t(:name) %>
-    <%= f.text_field :name, :class => 'form-control' %>
+    <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
 
-  <%= f.field_container :tax_code, :class => ['form-group'] do %>
+  <%= f.field_container :tax_code, class: ['form-group'] do %>
     <%= f.label :tax_code, Spree.t(:tax_code) %>
-    <%= f.text_field :tax_code, :class => 'form-control' %>
+    <%= f.text_field :tax_code, class: 'form-control' %>
   <% end %>
 
-  <%= f.field_container :description, :class => ['form-group'] do %>
+  <%= f.field_container :description, class: ['form-group'] do %>
     <%= f.label :description, Spree.t(:description) %><br>
-    <%= f.text_field :description, :class => 'form-control' %>
+    <%= f.text_field :description, class: 'form-control' %>
   <% end %>
 
-  <%= f.field_container :is_default, :class => ['checkbox'] do %>
+  <%= f.field_container :is_default, class: ['checkbox'] do %>
     <%= f.label :is_default do %>
       <%= f.check_box :is_default %>
       <%= Spree.t(:default) %>

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

@@ -3,11 +3,11 @@
   <%= @tax_category.name %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] 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/tax_categories/new.html.erb

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_tax_category) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>
   <fieldset>
-    <%= 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/tax_rates/_form.html.erb

@@ -10,12 +10,12 @@
       <div class="col-md-6">
         <div data-hook="name" class="form-group">
           <%= f.label :name, Spree.t(:name) %>
-          <%= f.text_field :name, :class => 'form-control' %>
+          <%= f.text_field :name, class: 'form-control' %>
         </div>
         <div data-hook="rate" class="form-group">
           <%= f.field_container :amount, class: ["form-group"] do %>
             <%= f.label :amount, Spree.t(:rate) %>
-            <%= f.text_field :amount, :class => 'form-control' %>
+            <%= f.text_field :amount, class: 'form-control' %>
             <%= f.error_message_on :amount %>
           <% end %>
           <p class="help-block">
@@ -33,11 +33,11 @@
       <div class="col-md-6">
         <div data-hook="zone" class="form-group">
           <%= f.label :zone, Spree.t(:zone) %>
-          <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2'}) %>
+          <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {class: 'select2'}) %>
         </div>
         <div data-hook="category" class="form-group">
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2'}) %>
+          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {class: 'select2'}) %>
         </div>
         <div data-hook="show_rate" class="form-group">
           <%= f.label :show_rate_in_label do %>
@@ -51,4 +51,4 @@
   </div>
 </div>
 
-<%= render 'spree/admin/shared/calculator_fields', :f => f %>
+<%= render 'spree/admin/shared/calculator_fields', f: f %>

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

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

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

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

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_inside_taxonomy_form" class="form-group">
   <%= f.field_container :name, class: ['form-group'] do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-    <%= f.text_field :name, :class => 'form-control' %>
-    <%= f.error_message_on :name, :class => 'error-message' %>
+    <%= f.text_field :name, class: 'form-control' %>
+    <%= f.error_message_on :name, class: 'error-message' %>
   <% end %>
 </div>

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

@@ -1,10 +1,5 @@
 <% content_for :head do %>
   <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};
-    var loading = '#{escape_javascript Spree.t(:loading)}';
-    var new_taxon = '#{escape_javascript Spree.t(:new_taxon)}';
-    var server_error = '#{escape_javascript Spree.t(:server_error)}';
-    var taxonomy_tree_error = '#{escape_javascript Spree.t(:taxonomy_tree_error)}';
-
     $(document).ready(function(){
       setup_taxonomy_tree(taxonomy_id);
     });

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

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @taxonomy } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
 
 <%= form_for [:admin, @taxonomy] do |f| %>
   <fieldset>