spree_backend 3.1.14 → 3.2.0.rc1

data/app/views/kaminari/_paginator.html.erb

@@ -8,8 +8,7 @@
 -%>
 <%= paginator.render do %>
   <ul class="pagination pagination-sm">
-    <%= first_page_tag unless current_page.first? %>
-    <%= prev_page_tag unless current_page.first? %>
+    <%= prev_page_tag %>
     <% each_page do |page| %>
       <% if page.left_outer? || page.right_outer? || page.inside_window? %>
         <%= page_tag page %>
@@ -17,7 +16,6 @@
         <%= gap_tag %>
       <% end %>
     <% end %>
-    <%= next_page_tag unless current_page.last? %>
-    <%= last_page_tag unless current_page.last? %>
+    <%= next_page_tag %>
   </ul>
 <% end %>

data/app/views/kaminari/_prev_page.html.erb

@@ -10,6 +10,6 @@
   <% if current_page.first? %>
     <a href="javascript:;">&laquo;</a>
   <% else %>
-    <%= link_to_unless current_page.first?, "&laquo;".html_safe, url, :rel => 'prev', :remote => remote %>
+    <%= link_to_unless current_page.first?, "&laquo;".html_safe, url, rel: 'prev', remote: remote %>
   <% end %>
 </li>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -8,7 +8,7 @@
       <th><%= Spree.t(:adjustable) %></th>
       <th><%= Spree.t(:description) %></th>
       <th class="text-center"><%= Spree.t(:amount) %></th>
-      <th class="text-center"><%= Spree.t(:state) %></th>
+      <th class="text-center"><%= Spree.t(:status) %></th>
       <th class="actions"></th>
     </tr>
   </thead>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_adjustment_form_fields">
   <%= f.field_container :amount, class: ['form-group'] do %>
-    <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) %>
-    <%= text_field :adjustment, :amount, :class => 'form-control' %>
+    <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", class: "required")) %>
+    <%= text_field :adjustment, :amount, class: 'form-control' %>
     <%= f.error_message_on :amount %>
   <% end %>
   <%= f.field_container :label, class: ['form-group'] do %>
-    <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) %>
-    <%= text_field :adjustment, :label, :class => 'form-control' %>
+    <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", class: "required")) %>
+    <%= text_field :adjustment, :label, class: 'form-control' %>
     <%= f.error_message_on :label %>
   <% end %>
 </div>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_country_form_fields">
   <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'name' 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 :iso_name, class: ['form-group'], 'data-hook' => 'iso_name' do %>
     <%= f.label :iso_name, Spree.t(:iso_name) %>
-    <%= f.text_field :iso_name, :class => 'form-control' %>
+    <%= f.text_field :iso_name, class: 'form-control' %>
     <%= f.error_message_on :iso_name %>
   <% end %>
 

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

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

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_country), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_country' } %>
+  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_country' } %>
 <% end if can? :create, Spree::Country %>
 
 <table class="table" id='listing_countries' data-hook>
@@ -22,8 +22,8 @@
         <td><%= country.iso_name %></td>
         <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(country, :no_text => true) if can? :edit, country %>
-          <%= link_to_delete(country, :no_text => true) if can? :delete, country %>
+          <%= link_to_edit(country, no_text: true) if can? :edit, country %>
+          <%= link_to_delete(country, no_text: true) if can? :delete, country %>
         </td>
       </tr>
     <% end %>

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

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_country) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @country } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @country } %>
 
 <%= form_for [:admin, @country] 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/customer_returns/new.html.erb

@@ -23,7 +23,7 @@
         </fieldset>
 
         <%= 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.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>

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

@@ -6,13 +6,13 @@
     </div>
     <div data-hook="variant" class="form-group">
       <%= f.label :viewable_id, Spree::Variant.model_name.human %>
-      <%= f.select :viewable_id, @variants, {}, {:class => 'select2'} %>
+      <%= f.select :viewable_id, @variants, {}, {class: 'select2'} %>
     </div>
   </div>
   <div data-hook="alt_text" class="col-md-6">
     <div class="form-group">
       <%= f.label :alt, Spree.t(:alt_text) %>
-      <%= f.text_area :alt, :rows => 4, :class => 'form-control' %>
+      <%= f.text_area :alt, rows: 4, class: 'form-control' %>
     </div>
   </div>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="col-md-6">
     <%= 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.text_field :name, class: "form-control" %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
@@ -10,7 +10,7 @@
   <div class="col-md-6">
     <%= f.field_container :presentation, class: ['form-group'] do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
-      <%= f.text_field :presentation, :class => "form-control" %>
+      <%= f.text_field :presentation, class: "form-control" %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>

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

@@ -5,11 +5,11 @@
 
 <% content_for :page_actions do %>
   <span id="new_add_option_value" data-hook>
-    <%= button_link_to Spree.t(:add_option_value), "javascript:;", { :icon => 'add', :'data-target' => "tbody#option_values", :class => 'btn-success spree_add_fields' } %>
+    <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add', :'data-target' => "tbody#option_values", class: 'btn-success spree_add_fields' } %>
   </span>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @option_type } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
   <div class="panel panel-default">
@@ -19,7 +19,7 @@
       </h1>
     </div>
     <div class="panel-body">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
     </div>
     <table class="table table-condensed table-bordered sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
@@ -37,13 +37,13 @@
           </tr>
         <% else %>
           <%= f.fields_for :option_values do |option_value_form| %>
-            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+            <%= render partial: 'option_value_fields', locals: { f: option_value_form } %>
           <% end %>
         <% end %>
       </tbody>
     </table>
     <div class="panel-footer text-center">
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>
   </div>
 <% end %>

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

@@ -3,11 +3,11 @@
   <%= Spree.t(:new_option_type) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @option_type } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type] 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/orders/_adjustments.html.erb

@@ -5,11 +5,13 @@
         <%= title %>
       </h1>
     </div>
-    
+
     <table class="table table-bordered">
       <thead>
-        <th><%= Spree.t('name')%></th>
-        <th><%= Spree.t('amount')%></th>
+        <tr>
+          <th><%= Spree.t('name')%></th>
+          <th><%= Spree.t('amount')%></th>
+        </tr>
       </thead>
       <tbody id="order-charges" data-hook="order_details_adjustments">
         <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
@@ -20,7 +22,7 @@
             <td class="total">
               <span>
                 <%= Spree::Money.new(
-                  adjustments.sum(&:amount), 
+                  adjustments.sum(&:amount),
                   currency: adjustments.first.order.try(:currency)
                 ) %>
               </span>

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

@@ -51,6 +51,6 @@
       );
     <% end %>
 
-    <%= render partial: 'spree/admin/shared/update_order_state', handlers: [:js] %>
+    <%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
   <% end %>
 </div>

data/app/views/spree/admin/orders/_line_items.html.erb

@@ -7,11 +7,13 @@
     </div>
     <table class="table table-bordered line-items" data-hook="line-items">
       <thead>
-        <th colspan="2"><%= Spree.t(:name) %></th>
-        <th class="text-center"><%= Spree.t(:price) %></th>
-        <th class="text-center"><%= Spree.t(:quantity) %></th>
-        <th class="text-center"><%= Spree.t(:total_price) %></th>
-        <th class="orders-actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+        <tr>
+          <th colspan="2"><%= Spree.t(:name) %></th>
+          <th class="text-center"><%= Spree.t(:price) %></th>
+          <th class="text-center"><%= Spree.t(:quantity) %></th>
+          <th class="text-center"><%= Spree.t(:total_price) %></th>
+          <th class="orders-actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+        </tr>
       </thead>
       <tbody>
         <% order.line_items.each do |item| %>
@@ -20,7 +22,7 @@
               <%= mini_image(item.variant) %>
             </td>
             <td class="line-item-name text-center">
-              <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+              <%= item.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
             </td>
             <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
             <td class="line-item-qty-show text-center">

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -34,6 +34,6 @@
       shipments.push(<%== shipment.as_json(root: false, only: [:id, :tracking, :number, :state, :stock_location_id], include: [:inventory_units, :stock_location]).to_json %>);
     <% end %>
 
-    <%= render partial: 'spree/admin/shared/update_order_state', handlers: [:js] %>
+    <%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
   <% end %>
 </div>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -18,11 +18,13 @@
 
   <table class="table table-bordered stock-contents" data-hook="stock-contents">
     <thead>
-      <th colspan="2"><%= Spree.t(:item_description) %></th>
-      <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
-      <th width="15%" class="text-center"><%= Spree.t(:quantity) %></th>
-      <th width="15%" class="text-center"><%= Spree.t(:total) %></th>
-      <th class="orders-actions actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+      <tr>
+        <th colspan="2"><%= Spree.t(:item_description) %></th>
+        <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
+        <th width="15%" class="text-center"><%= Spree.t(:quantity) %></th>
+        <th width="15%" class="text-center"><%= Spree.t(:total) %></th>
+        <th class="orders-actions actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
+      </tr>
     </thead>
 
     <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
@@ -74,8 +76,8 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", :class => 'cancel-tracking btn btn-primary btn-sm', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :no_text => true %>
-            <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", :class => 'save-tracking btn btn-success btn-sm', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save'), :no_text => true %>
+            <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+            <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
           <% end %>
         </td>
       </tr>

data/app/views/spree/admin/orders/cart.html.erb

@@ -24,8 +24,4 @@
   </div>
 </div>
 
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>
-
 <%= render 'spree/admin/shared/order_summary' %>

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

@@ -28,8 +28,4 @@
   </div>
 </div>
 
-<% content_for :head do %>
-  <%= javascript_tag 'var expand_variants = true;' %>
-<% end %>
-
 <%= render 'spree/admin/shared/order_summary' %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_order), new_admin_order_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_order' %>
+  <%= button_link_to Spree.t(:new_order), new_admin_order_url, class: "btn-success", icon: 'add', id: 'admin_new_order' %>
 <% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter do %>
@@ -17,7 +17,7 @@
             <div class="row no-padding-bottom">
               <div class="col-md-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from form-control', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+                  <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
                   <span class="input-group-addon">
                     <i class="icon icon-calendar"></i>
                   </span>
@@ -26,7 +26,7 @@
               </div>
               <div class="col-md-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to form-control', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+                  <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
                   <span class="input-group-addon">
                     <i class="icon icon-calendar"></i>
                   </span>
@@ -38,7 +38,7 @@
 
         <div class="col-md-4">
           <div class="form-group">
-            <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
+            <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
             <%= f.text_field :number_cont, class: 'form-control js-quick-search-target' %>
           </div>
         </div>
@@ -50,21 +50,21 @@
         <div class="col-md-4">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-md-4">
           <div class="form-group">
             <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
+            <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-md-4">
           <div class="form-group">
             <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
+            <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
@@ -107,7 +107,7 @@
         <div class="col-md-4">
           <div class="form-group">
             <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {include_blank: true}, class: 'select2' %>
           </div>
         </div>
 
@@ -117,14 +117,14 @@
 
             <div class="checkbox">
               <%= label_tag 'q_completed_at_not_null' do %>
-                <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
+                <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
                 <%= Spree.t(:show_only_complete_orders) %>
               <% end %>
             </div>
 
             <div class="checkbox">
               <%= label_tag 'q_considered_risky_eq' do %>
-                <%= f.check_box :considered_risky_eq, {:checked => (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
+                <%= f.check_box :considered_risky_eq, {checked: (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
                 <%= Spree.t(:show_only_considered_risky) %>
               <% end %>
             </div>
@@ -152,19 +152,19 @@
     <thead>
       <tr data-hook="admin_orders_index_headers">
         <% if @show_only_completed %>
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order') %></th>
         <% else %>
-          <th><%= sort_link @search, :created_at,     I18n.t(:created_at, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :created_at,     I18n.t(:created_at, scope: 'activerecord.attributes.spree/order') %></th>
         <% end %>
-        <th><%= sort_link @search, :number,           I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :state,            I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :number,           I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :considered_risky, I18n.t(:considered_risky, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :state,            I18n.t(:state, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :payment_state,    I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
          <% end %>
-        <th><%= sort_link @search, :email,            I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :total,            I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :email,            I18n.t(:email, scope: 'activerecord.attributes.spree/order') %></th>
+        <th><%= sort_link @search, :total,            I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -210,7 +210,7 @@
         </td>
         <td><%= order.display_total.to_html %></td>
         <td class='actions actions-1' data-hook="admin_orders_index_row_actions">
-          <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
+          <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true %>
         </td>
       </tr>
     <% end %>

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

@@ -5,7 +5,7 @@
     <div class="col-md-4">
       <div id="preference-settings" data-hook class="form-group">
         <%= f.label :type, Spree.t(:provider) %>
-        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2'}) %>
+        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
 
         <% unless @object.new_record? %>
           <%= preference_fields(@object, f) %>
@@ -17,11 +17,11 @@
       </div>
       <div data-hook="display" class="form-group">
         <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {:class => 'select2'}) %>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
       </div>
       <div data-hook="auto_capture" class="form-group">
         <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2'}) %>
+        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
       </div>
       <div data-hook="active" class="form-group">
         <strong><%= Spree.t(:active) %></strong>
@@ -44,12 +44,12 @@
     <div class="col-md-8">
       <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
         <%= label_tag :payment_method_name, Spree.t(:name) %>
-        <%= text_field :payment_method, :name, :class => 'form-control' %>
+        <%= text_field :payment_method, :name, class: 'form-control' %>
         <%= error_message_on :payment_method, :name %>
       <% end %>
       <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
         <%= label_tag :payment_method_description, Spree.t(:description) %>
-        <%= text_area :payment_method, :description, { :cols => 60, :rows => 6, :class => 'form-control' } %>
+        <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
       <% end %>
     </div>
   </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_payment_method), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_payment_methods_link' %>
+  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_payment_methods_link' %>
 <% end if can? :create, Spree::PaymentMethod %>
 
 <% if @payment_methods.any? %>
@@ -31,8 +31,8 @@
           <td class="text-center"><%= Spree.t(method.display_on) %></td>
           <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit(method, :no_text => true) if can? :edit, method %>
-            <%= link_to_delete(method, :no_text => true) if can? :delete, method %>
+            <%= link_to_edit(method, no_text: true) if can? :edit, method %>
+            <%= link_to_delete(method, no_text: true) if can? :delete, method %>
           </td>
         </tr>
       <% end %>

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

@@ -1,15 +1,15 @@
 <div data-hook="admin_payment_form_fields">
   <div class="form-group">
     <%= f.label :amount, Spree.t(:amount) %>
-    <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'form-control' %>
+    <%= f.text_field :amount, value: @order.display_outstanding_balance.money, class: 'form-control' %>
   </div>
   <div class="form-group">
     <strong><%= Spree.t(:payment_method) %></strong>
     <% @payment_methods.each do |method| %>
-      <div class="radio" data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
+      <div class="radio" data-id="<%= Spree.t(method.name, scope: :payment_methods, default: method.name).parameterize %>">
         <label data-hook="payment_method_field">
           <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method, { class: "payment_methods_radios" } %>
-          <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+          <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
         </label>
       </div>
     <% end %>
@@ -19,9 +19,9 @@
 
         <div class="payment-methods" id="payment_method_<%= method.id %>">
           <% if method.source_required? %>
-            <%=render :partial => "spree/admin/payments/source_forms/#{method.method_type}",
-                       :locals => {
-                         :payment_method => method,
+            <%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",
+                       locals: {
+                         payment_method: method,
                          previous_cards: method.reusable_sources(@order)
                        }
             %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -23,8 +23,8 @@
 
     <div data-hook="card_number" class="form-group">
       <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
-      <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
-      <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required form-control cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
+      <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', class: 'required')) %>
+      <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
       <span id="card_type" style="display:none;">
         ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
           <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
@@ -33,24 +33,24 @@
     </div>
 
     <div data-hook="card_name" class="form-group">
-      <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+      <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', class: 'required')) %>
       <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>
     </div>
 
     <div data-hook="card_expiration" class="form-group">
-      <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+      <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', class: 'required')) %><br>
       <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM / YY" %>
     </div>
 
     <div data-hook="card_code" class="form-group">
-      <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
+      <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', class: "required")) %>
       <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>
       <a href="/content/cvv" class="info cvvLink" target="_blank">
         (<%= Spree.t(:what_is_this) %>)
       </a>
     </div>
 
-    <%= image_tag 'credit_cards/credit_card.gif', :class => 'credit-card-image' %>
+    <%= image_tag 'credit_cards/credit_card.gif', class: 'credit-card-image' %>
 
   </div>
 </fieldset>