spree_backend 3.0.1 → 3.0.2

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

@@ -16,7 +16,7 @@
             <% if can? :edit, @order.user %>
               <%= f.email_field :email, class: 'form-control' %>
             <% else %>
-              <p><%= @order.user.email %></p>
+              <p><%= @order.user.try(:email) || @order.email %></p>
             <% end %>
           </div>
         </div>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_details } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:customer_details) %>

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

@@ -7,7 +7,7 @@
   <% end %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Shipments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :shipments } %>
 
 <% content_for :page_title do %>
   / <%= plural_resource_name(Spree::Shipment) %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :credit_cards } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:refund) %>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: "Payments" } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? && can?(:create, Spree::Payment) %>

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

@@ -1,15 +1,15 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:new_payment) %>
 <% end %>
 
 <% if @payment_methods.any? %>
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @payment } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment } %>
 
-  <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
+  <%= form_for @payment, url: admin_order_payments_path(@order) do |f| %>
     <fieldset>
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-actions" data-hook="buttons">
         <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'save' %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_title do %>
   /
@@ -7,17 +7,17 @@
   <%= payment_method_name(@payment) %>
   /
   <span class="state <%= @payment.state %>">
-    <%= Spree.t(@payment.state, :scope => :payment_states, :default => @payment.state.capitalize) %>
+    <%= Spree.t(@payment.state, scope: :payment_states, default: @payment.state.capitalize) %>
   </span>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'file' %>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file' %>
 <% end %>
 
-<%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
-           :locals => {
-             :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
+<%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
+           locals: {
+             payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
            }
 %>
 

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

@@ -1,12 +1,12 @@
-<%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
-<%= render 'spree/admin/shared/error_messages', :target => @product %>
+<%= render 'spree/admin/shared/product_tabs', current: :properties %>
+<%= render 'spree/admin/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to(Spree.t(:add_product_properties), "javascript:;", { :icon => 'add', :'data-target' => "tbody#product_properties", :class => 'btn-success spree_add_fields' }) %>
-  <span class="js-new-ptype-link"><%= button_link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, { :icon => 'properties', :remote => true, 'data-update' => 'prototypes', :class => 'btn-default' } %></span>
+  <%= button_link_to(Spree.t(:add_product_properties), "javascript:;", { icon: 'add', :'data-target' => "tbody#product_properties", class: 'btn-success spree_add_fields' }) %>
+  <span class="js-new-ptype-link"><%= button_link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, { icon: 'properties', remote: true, 'data-update' => 'prototypes', class: 'btn-default' } %></span>
 <% end if can? :create, Spree::ProductProperty %>
 
-<%= form_for @product, :url => spree.admin_product_url(@product), :method => :put do |f| %>
+<%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
 
@@ -20,7 +20,7 @@
       </thead>
       <tbody id="product_properties" data-hook>
         <%= f.fields_for :product_properties do |pp_form| %>
-          <%= render 'product_property_fields', :f => pp_form %>
+          <%= render 'product_property_fields', f: pp_form %>
         <% end %>
       </tbody>
     </table>

data/app/views/spree/admin/products/_add_stock_form.html.erb

@@ -37,8 +37,6 @@
 
     <div class="form-actions text-center" data-hook="buttons">
       <%= button Spree.t(:add_stock), 'plus' %>
-      <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
     </div>
   <% end %>
 </div>

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

@@ -78,7 +78,7 @@
           </div>
           <div class="info-actions">
             <% if can?(:admin, Spree::Variant) %>
-              <%= link_to_with_icon 'variants', 'Manage Variants', spree.admin_product_variants_url(@product), class: "btn btn-default" %>
+              <%= link_to_with_icon 'variants', Spree.t(:manage_variants), spree.admin_product_variants_url(@product), class: "btn btn-default" %>
             <% end %>
           </div>
         </div>
@@ -90,6 +90,14 @@
           <% end %>
         </div>
 
+        <div data-hook="admin_product_form_promotionable">
+          <%= f.field_container :promotionable, class: ['form-group'] do %>
+              <%= f.label :promotionable %>
+              <%= f.error_message_on :promotionable %>
+              <%= f.check_box :promotionable, class: 'form-control' %>
+          <% end %>
+        </div>
+
         <div id="shipping_specs" class="row">
           <div class="col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
@@ -179,28 +187,29 @@
   </div>
 
 
-<div data-hook="admin_product_form_meta">
+  <div data-hook="admin_product_form_meta">
 
-  <div data-hook="admin_product_form_meta_keywords">
-    <%= f.field_container :meta_keywords, class: ['form-group'] do %>
-      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
-      <%= f.text_field :meta_keywords, class: 'form-control' %>
-    <% end %>
-  </div>
+    <div data-hook="admin_product_form_meta_keywords">
+      <%= f.field_container :meta_keywords, class: ['form-group'] do %>
+        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+        <%= f.text_field :meta_keywords, class: 'form-control' %>
+      <% end %>
+    </div>
 
-  <div data-hook="admin_product_form_meta_description">
-    <%= f.field_container :meta_description, class: ['form-group'] do %>
-      <%= f.label :meta_description, Spree.t(:meta_description) %>
-      <%= f.text_field :meta_description, class: 'form-control' %>
-    <% end %>
-  </div>
+    <div data-hook="admin_product_form_meta_description">
+      <%= f.field_container :meta_description, class: ['form-group'] do %>
+        <%= f.label :meta_description, Spree.t(:meta_description) %>
+        <%= f.text_field :meta_description, class: 'form-control' %>
+      <% end %>
+    </div>
 
-  <div data-hook="admin_product_form_additional_fields"></div>
+    <div data-hook="admin_product_form_additional_fields"></div>
 
-</div>
+  </div>
 
-<% unless Rails.env.test? %>
-  <script>
-    $('.select2-container').css();
-  </script>
-<% end %>
+  <% unless Rails.env.test? %>
+    <script>
+      $('.select2-container').css();
+    </script>
+  <% end %>
+</div>

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

@@ -1,15 +1,15 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Product) %>
-    <%= button_link_to Spree.t(:new_product), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_product' } %>
+    <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :details} %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
-<%= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product], method: :put, html: { multipart: true } 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/products/stock.html.erb

@@ -1,5 +1,5 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Stock Management' } %>
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :stock} %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
 <% if can? :create, Spree::StockMovement %>
   <div id="add_stock_form" class="panel panel-default">

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -13,7 +13,7 @@
         <% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
         <div class="form-group">
           <%= label_tag "#{line_item_prefix}_variant_id", Spree.t(:variant) %>
-          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete" %>
+          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete fullwidth-input" %>
         </div>
         <div class="form-group no-marginb">
           <%= label_tag "#{line_item_prefix}_quantity", Spree.t(:quantity) %>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: "Payments" } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_title do %>
   / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
@@ -21,7 +21,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.save'), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "delete" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: {current: :payments} %>
 
 <% content_for :page_title do %>
   / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
@@ -29,7 +29,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:refund), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "delete" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,10 +1,10 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:editing_resource, resource: Spree::Reimbursement.model_name.human) %> #<%= @reimbursement.number %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement } %>
 
 <%= form_for [:admin, @order, @reimbursement] do |f| %>
   <fieldset class='no-border-bottom'>
@@ -96,7 +96,7 @@
         <%= Spree.t(:reimburse) %>
       <% end %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([: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/reimbursements/index.html.erb

@@ -1,10 +1,10 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Reimbursements' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :reimbursements } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:edit_reimbursement) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @customer_return } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @customer_return } %>
 
 <table class="table">
   <thead data-hook="customer_return_header">

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

@@ -1,10 +1,10 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_title do %>
   / <%= Spree::Reimbursement.model_name.human %> #<%= @reimbursement.number %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement } %>
 
 <fieldset class='no-border-bottom'>
   <legend><%= Spree.t(:items_reimbursed) %></legend>

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

@@ -52,9 +52,9 @@
           <td>
             <% if editable %>
               <% if return_item.exchange_processed? %>
-                <%= return_item.exchange_variant.options_text %>
+                <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
               <% end %>
             <% end %>
           </td>

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

@@ -1,26 +1,26 @@
 <% content_for :page_actions do %>
   <% if @return_authorization.can_cancel? %>
-    <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, :icon => "delete" %>
+    <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete" %>
   <% end %>
   <%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :return_authorizations } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @return_authorization } %>
 
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'repeat' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,8 +1,8 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :return_authorizations } %>
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::ReturnAuthorization) %>
-    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :class => "btn-success", :icon => 'add' %>
+    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-success", icon: 'add' %>
   <% end %>
 <% end %>
 
@@ -29,9 +29,9 @@
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions actions-2">
-            <%= link_to_edit(return_authorization, :no_text => true, :class => 'edit') if can?(:edit, return_authorization) %>
+            <%= link_to_edit(return_authorization, no_text: true, class: 'edit') if can?(:edit, return_authorization) %>
             <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
-              <%= link_to_delete return_authorization, :no_text => true %>
+              <%= link_to_delete return_authorization, no_text: true %>
             <% end %>
           </td>
         </tr>

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

@@ -1,18 +1,18 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :return_authorizations } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:new_return_authorization) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:create), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -6,53 +6,53 @@
 <% content_for :sidebar do %>
   <ul class="nav nav-pills nav-stacked" data-hook="admin_order_tabs">
     <% if ((can? :update, @order) && (@order.shipments.count == 0 || @order.shipments.shipped.count == 0)) %>
-      <li<%== ' class="active"' if current == 'Cart' %> data-hook='admin_order_tabs_cart_details'>
+      <li<%== ' class="active"' if current == :cart %> data-hook='admin_order_tabs_cart_details'>
         <%= link_to_with_icon 'edit', Spree.t(:cart), cart_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
-      <li<%== ' class="active"' if current == 'Customer Details' %> data-hook='admin_order_tabs_customer_details'>
+      <li<%== ' class="active"' if current == :customer_details %> data-hook='admin_order_tabs_customer_details'>
         <%= link_to_with_icon 'user', Spree.t(:customer), spree.admin_order_customer_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :update, @order %>
-      <li<%== ' class="active"' if current == 'Shipments' %> data-hook='admin_order_tabs_shipment_details'>
+      <li<%== ' class="active"' if current == :shipments %> data-hook='admin_order_tabs_shipment_details'>
         <%= link_to_with_icon 'road', Spree.t(:shipments), edit_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::Adjustment %>
-      <li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
+      <li<%== ' class="active"' if current == :adjustments %> data-hook='admin_order_tabs_adjustments'>
         <%= link_to_with_icon 'wrench', Spree.t(:adjustments), spree.admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:index, Spree::Payment) %>
-      <li<%== ' class="active"' if current == 'Payments' %> data-hook='admin_order_tabs_payments'>
+      <li<%== ' class="active"' if current == :payments %> data-hook='admin_order_tabs_payments'>
         <%= link_to_with_icon 'credit-card', Spree.t(:payments), spree.admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == 'Returns' %> data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'transfer', Spree.t(:returns), spree.admin_order_return_authorizations_url(@order) %>
+        <li<%== ' class="active"' if current == :return_authorizations %> data-hook='admin_order_tabs_return_authorizations'>
+          <%= link_to_with_icon 'transfer', Spree.t(:return_authorizations), spree.admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :index, Spree::CustomerReturn %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == 'Customer Returns' %>>
+        <li<%== ' class="active"' if current == :customer_returns %>>
           <%= link_to_with_icon 'transfer', Spree.t(:customer_returns), spree.admin_order_customer_returns_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :update, @order %>
-      <li<%== ' class="active"' if current == 'State Changes' %> data-hook='admin_order_tabs_state_changes'>
+      <li<%== ' class="active"' if current == :state_changes %> data-hook='admin_order_tabs_state_changes'>
         <%= link_to_with_icon 'refresh', Spree::StateChange.human_attribute_name(:state_changes), spree.admin_order_state_changes_url(@order) %>
       </li>
     <% end %>