solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -9,13 +9,13 @@
             <%= check_box_tag 'select-all' %>
           <% end %>
         </th>
-        <th class="return-item-product"><%= Spree.t(:product) %></th>
-        <th class="return-item-state"><%= Spree.t(:state) %></th>
-        <th class="return-item-charged"><%= Spree.t(:charged) %></th>
-        <th class="return-item-pre-tax-refund-amount"><%= Spree.t(:pre_tax_refund_amount) %></th>
-        <th class="return-item-reimbursement-type"><%= Spree.t(:reimbursement_type) %></th>
-        <th class="return-item-exchange-for"><%= Spree.t(:exchange_for) %></th>
-        <th class="return-item-reason"><%= Spree.t(:reason) %></th>
+        <th class="return-item-product"><%= Spree::Product.model_name.human %></th>
+        <th class="return-item-state"><%= Spree::ReturnAuthorization.human_attribute_name(:state) %></th>
+        <th class="return-item-charged"><%= Spree::ReturnItem.human_attribute_name(:charged) %></th>
+        <th class="return-item-pre-tax-refund-amount"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+        <th class="return-item-reimbursement-type"><%= Spree::ReimbursementType.model_name.human %></th>
+        <th class="return-item-exchange-for"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+        <th class="return-item-reason"><%= Spree::ReturnItem.human_attribute_name(:return_reason) %></th>
       </tr>
     </thead>
     <tbody>
@@ -27,7 +27,7 @@
           <td class="return-item-checkbox align-center inventory-unit-checkbox">
             <% if editable %>
               <%= item_fields.hidden_field :inventory_unit_id %>
-              <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '0', '1' %>
+              <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.amount}, '0', '1' %>
             <% end %>
           </td>
           <td class="return-item-product">
@@ -36,13 +36,13 @@
           </td>
           <td class="return-item-state align-center"><%= inventory_unit.state.humanize %></td>
           <td class="return-item-charged align-center">
-            <%= return_item.display_pre_tax_amount %>
+            <%= return_item.display_amount %>
           </td>
           <td class="return-item-pre-tax-refund-amount align-center">
             <% if editable %>
-              <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
+              <%= item_fields.text_field :amount, { class: 'refund-amount-input' } %>
             <% else %>
-              <%= return_item.display_pre_tax_amount %>
+              <%= return_item.display_amount %>
             <% end %>
           </td>
           <td class="return-item-reimbursement-type">
@@ -54,9 +54,9 @@
           </td>
           <td class="return-item-exchange-for align-center">
             <% if editable %>
-              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants(@stock_locations), :id, :exchange_name, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
             <% elsif return_item.exchange_processed? %>
-              <%= return_item.exchange_variant.options_text %>
+              <%= return_item.exchange_variant.exchange_name %>
             <% end %>
           </td>
           <td class="return-item-reason">
@@ -76,13 +76,13 @@
   <% end %>
 
   <%= f.field_container :stock_location do %>
-    <%= f.label :stock_location, Spree.t(:stock_location) %>
+    <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
     <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location_id %>
   <% end %>
 
   <%= f.field_container :memo do %>
-    <%= f.label :memo, Spree.t(:memo) %>
+    <%= f.label :memo %>
     <%= f.text_area :memo, {:style => 'height:100px;', :class => 'fullwidth'} %>
     <%= f.error_message_on :memo %>
   <% end %>

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

@@ -12,7 +12,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
+  <i class="fa fa-arrow-right"></i> <%= Spree::ReturnAuthorization.model_name.human %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
 <% end %>
 
 
@@ -23,7 +23,6 @@
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'repeat' %>
-      <span class="or"><%= Spree.t(:or) %></span>
       <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>

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

@@ -12,17 +12,17 @@
 <% end %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:return_authorizations) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree::ReturnAuthorization.model_name.human(count: :other) %>
 <% end %>
 
 <% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
   <table class="index">
     <thead data-hook="rma_header">
       <tr>
-        <th><%= Spree.t(:rma_number) %></th>
-        <th><%= Spree.t(:status) %></th>
-        <th><%= Spree.t(:pre_tax_total) %></th>
-        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th><%= Spree::ReturnAuthorization.human_attribute_name(:number) %></th>
+        <th><%= Spree::ReturnAuthorization.human_attribute_name(:state) %></th>
+        <th><%= Spree::ReturnAuthorization.human_attribute_name(:pre_tax_total) %></th>
+        <th><%= Spree::ReturnAuthorization.human_attribute_name(:created_at) %></th>
         <th class="actions"></th>
       </tr>
     </thead>

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

@@ -14,8 +14,7 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'ok' %>
-      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button Spree.t(:'actions.create'), 'ok' %>
       <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>

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

@@ -1,5 +1,5 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree.t(:return_reasons),
+  page_title: Spree::ReturnReason.model_name.human(count: :other),
   new_button_text: Spree.t(:new_rma_reason),
-  resource_name: I18n.t(:other, scope: 'activerecord.models.spree/return_reason')
+  resource: Spree::ReturnReason
 } %>

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

@@ -2,51 +2,51 @@
 
 <div id="<%= type %>" data-hook="address_fields">
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :firstname, Spree.t(:first_name) %>
+    <%= f.label :firstname %>
     <%= f.text_field :firstname, :class => 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :lastname, Spree.t(:last_name) %>
+    <%= f.label :lastname %>
     <%= f.text_field :lastname, :class => 'fullwidth' %>
   </div>
 
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{type}-row" %>">
-      <%= f.label :company, Spree.t(:company) %>
+      <%= f.label :company %>
       <%= f.text_field :company, :class => 'fullwidth' %>
     </div>
   <% end %>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :address1, Spree.t(:street_address) %>
+    <%= f.label :address1 %>
     <%= f.text_field :address1, :class => 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :address2, Spree.t(:street_address_2) %>
+    <%= f.label :address2 %>
     <%= f.text_field :address2, :class => 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :city, Spree.t(:city) %>
+    <%= f.label :city %>
     <%= f.text_field :city, :class => 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :zipcode, Spree.t(:zip) %>
+    <%= f.label :zipcode %>
     <%= f.text_field :zipcode, :class => 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :country_id, Spree.t(:country) %>
+    <%= f.label :country_id, Spree::Country.model_name.human %>
     <span id="<%= s_or_b %>country">
       <%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %>
     </span>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :state_id, Spree.t(:state) %>
+    <%= f.label :state_id, Spree::State.model_name.human %>
     <span id="<%= s_or_b %>state">
       <%= f.text_field :state_name,
             :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
@@ -56,7 +56,7 @@
   </div>
 
   <div class="field <%= "#{type}-row" %>">
-    <%= f.label :phone, Spree.t(:phone) %>
+    <%= f.label :phone %>
     <%= f.phone_field :phone, :class => 'fullwidth' %>
   </div>
 </div>

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

@@ -0,0 +1,19 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_settings_areas_tabs">
+      <% if can? :display, Spree::Zone %>
+        <%= settings_tab_item Spree::Zone.model_name.human(count: :other), admin_zones_path %>
+      <% end %>
+
+      <% if can? :display, Spree::Country %>
+        <%= settings_tab_item Spree::Country.model_name.human(count: :other), admin_countries_path %>
+      <% end %>
+
+      <% if can?(:display, Spree::State) %>
+        <% if country = Spree::Country.find_by(iso: Spree::Config[:default_country_iso]) || Spree::Country.first %>
+          <%= settings_tab_item Spree::State.model_name.human(count: :other), admin_country_states_path(country) %>
+        <% end %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

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

@@ -1,9 +1,9 @@
 <fieldset id="calculator_fields" data-hook class="no-border-bottom">
-  <legend align="center"><%= Spree.t(:calculator) %></legend>
+  <legend align="center"><%= Spree::Calculator.model_name.human %></legend>
 
   <div id="preference-settings" data-hook>
     <div class="field">
-      <%= f.label(:calculator_type, Spree.t(:calculator), :for => 'calc_type') %>
+      <%= f.label(:calculator_type, Spree::Calculator.model_name.human, :for => 'calc_type') %>
       <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc_type', :class => 'select2 fullwidth'}) %>
     </div>
     <% if !@object.new_record? %>

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

@@ -1,70 +1,15 @@
-<% content_for :sidebar_title do %>
-  <%= Spree.t(:configurations) %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <nav class="menu">
-    <ul class="sidebar" data-hook="admin_configurations_sidebar_menu">
-      <% if can? :edit, :general_settings %>
-        <%= configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path %>
-      <% end %>
-
-      <% if can? :display, Spree::TaxCategory %>
-        <%= configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path %>
-      <% end %>
-
-      <% if can? :display, Spree::TaxRate %>
-        <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
-      <% end %>
-
-      <% if can? :display, Spree::Zone %>
-        <%= configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path %>
-      <% end %>
-
-      <% if can? :display, Spree::Country %>
-        <%= configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::State) %>
-        <% if country = Spree::Country.find_by_id(Spree::Config[:default_country_id]) || Spree::Country.first %>
-          <%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(country) %>
-        <% end %>
-      <% end %>
-
-      <% if can?(:display, Spree::PaymentMethod) %>
-        <%= configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::Taxonomy) %>
-        <%= configurations_sidebar_menu_item Spree.t(:taxonomies), admin_taxonomies_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::ShippingMethod) %>
-        <%= configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::ShippingCategory) %>
-        <%= configurations_sidebar_menu_item Spree.t(:shipping_categories), admin_shipping_categories_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::StockLocation) %>
-        <%= configurations_sidebar_menu_item Spree.t(:stock_locations), spree.admin_stock_locations_path %>
+<%# This file holds the tabs for the "General" settings area. It has this
+    filename to maintain compatibility with extensions which add their own menu
+    entires through deface. %>
+<% content_for :tabs do %>
+  <nav>
+    <ul class="tabs" data-hook="admin_configurations_sidebar_menu">
+      <% if can?(:edit, :general_settings) %>
+        <%= settings_tab_item Spree.t(:general_settings), edit_admin_general_settings_path %>
       <% end %>
 
       <% if can?(:display, Spree::Tracker) %>
-        <%= configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::RefundReason) %>
-        <%= configurations_sidebar_menu_item Spree.t(:refund_reasons), admin_refund_reasons_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::ReimbursementType) %>
-        <%= configurations_sidebar_menu_item Spree.t(:reimbursement_types), admin_reimbursement_types_path %>
-      <% end %>
-
-      <% if can?(:display, Spree::ReturnReason) %>
-        <%= configurations_sidebar_menu_item Spree.t(:return_reasons), admin_return_reasons_path %>
+        <%= settings_tab_item Spree.t(:analytics_trackers), admin_trackers_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -2,5 +2,3 @@
 if success %>
   show_flash('success', "<%= j success %>")
 <% end %>
-
-<%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

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

@@ -1,5 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
   <%= button Spree.t('actions.update'), 'refresh' %>
-  <span class="or"><%= Spree.t(:or) %></span>
   <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %>
 </div>

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

@@ -0,0 +1,11 @@
+<div class="flash-wrapper js-flash-wrapper">
+  <% if flash[:error] %>
+    <div class="flash error"><%= flash[:error] %></div>
+  <% end %>
+  <% if notice %>
+    <div class="flash notice"><%= notice %></div>
+  <% end %>
+  <% if flash[:success] %>
+    <div class="flash success"><%= flash[:success] %></div>
+  <% end %>
+</div>

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

@@ -0,0 +1,2 @@
+<%# For compatability with existing overrides, these can be found in the following partial %>
+<%= render 'spree/admin/shared/configuration_menu' %>

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

@@ -23,6 +23,16 @@
     as it must, which means a bottom of page notification will obstruct interactions.
     */
     .flash-wrapper { position: static; }
+
+    /* Capybara doesn't know how to use dropdowns */
+    .tabs-dropdown ul {
+      display: block !important;
+      position: static;
+    }
+  </style>
+<%- elsif Rails.env.development? %>
+  <style>
+    .translation_missing { background: red; }
   </style>
 <%- end %>
 
@@ -32,7 +42,6 @@
 <%= render "spree/admin/shared/translations" %>
 
 <%= javascript_tag do -%>
-  var AUTH_TOKEN = "<%= form_authenticity_token %>";
   Spree.api_key = "<%= try_spree_current_user.try(:spree_api_key) %>";
   Spree.env = "<%= Rails.env %>";
 <% end %>

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

@@ -1,5 +1,13 @@
-<header class="admin-nav-header">
-  <%= link_to spree.admin_path, class: 'brand-link' do %>
-    <%= image_tag(Spree::Config[:admin_interface_logo]) %>
-  <%- end %>
-</header>
+<% if content_for?(:page_title) || content_for?(:page_actions) %>
+  <div id="content-header" class="main-header" data-hook>
+    <% if content_for?(:page_title) %>
+      <h1 class="page-title"><%= yield :page_title %></h1>
+    <% end %>
+
+    <% if content_for?(:page_actions) %>
+      <ul class="header-actions page-actions inline-menu" data-hook="toolbar">
+        <%= yield :page_actions %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,5 +1,5 @@
 <div class="admin-nav">
-  <%= render partial: 'spree/admin/shared/header' %>
+  <%= render partial: 'spree/admin/shared/navigation_header' %>
   <div class="admin-nav-sticky">
     <%= render partial: 'spree/admin/shared/menu' %>
     <div class="admin-nav-footer">

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

@@ -0,0 +1,5 @@
+<header class="admin-nav-header">
+  <%= link_to spree.admin_path, class: 'brand-link' do %>
+    <%= image_tag(Spree::Config[:admin_interface_logo]) %>
+  <%- end %>
+</header>

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

@@ -1,5 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
   <%= button Spree.t('actions.create'), 'ok' %>
-  <span class="or"><%= Spree.t(:or) %></span>
   <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
 </div>

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

@@ -0,0 +1,4 @@
+<%= Spree.t(:no_resource, resource: resource.model_name.human(count: :other)) %>
+<% if can? :create, resource %>
+  <%= link_to Spree.t(:create_one), new_resource_url %>
+<% end %>

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

@@ -1,61 +1,61 @@
-<nav class="menu">
-  <ul data-hook="admin_order_tabs">
+<nav>
+  <ul class="tabs" data-hook="admin_order_tabs">
     <% if (@order.shipments.count == 0 || @order.shipped_shipments.count == 0) %>
-      <li<%== ' class="active"' if current == 'Cart' %> data-hook='admin_order_tabs_order_details'>
+      <li class="<%= "active" if current == "Cart" %>" data-hook='admin_order_tabs_order_details'>
         <%= link_to_with_icon 'shopping-cart', Spree.t(:cart), cart_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if 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'>
         <% if can?(:update, @order) %>
-          <%= link_to_with_icon 'user', Spree.t(:customer_details), edit_admin_order_customer_url(@order) %>
+          <%= link_to_with_icon 'user', Spree.t(:customer), edit_admin_order_customer_url(@order) %>
         <% else %>
-          <%= link_to_with_icon 'user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
+          <%= link_to_with_icon 'user', Spree.t(:customer), admin_order_customer_url(@order) %>
         <% end %>
       </li>
     <% end %>
 
-    <li<%== ' class="active"' if current == 'Shipments' %> data-hook='admin_order_tabs_order_details'>
-      <%= link_to_with_icon 'edit', Spree.t(:shipments), edit_admin_order_url(@order) %>
+    <li class="<%= "active" if current == "Shipments" %>" data-hook='admin_order_tabs_order_details'>
+      <%= link_to_with_icon 'edit', Spree::Shipment.model_name.human(count: :other), edit_admin_order_url(@order) %>
     </li>
 
     <% if can? :display, Spree::Adjustment %>
-      <li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
+      <li class="<%= "active" if current == "Adjustments" %>" data-hook='admin_order_tabs_adjustments'>
+        <%= link_to_with_icon 'cogs', Spree::Adjustment.model_name.human(count: :other), admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:display, Spree::Payment) %>
-      <li<%== ' class="active"' if current == 'Payments' %> data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
+      <li class="<%= "active" if current == "Payments" %>" data-hook='admin_order_tabs_payments'>
+        <%= link_to_with_icon 'credit-card', Spree::Payment.model_name.human(count: :other), admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if !@order.completed? && can?(:update, @order) %>
-      <li<%== ' class="active"' if current == 'Confirm' %> data-hook='admin_order_tabs_confirm'>
+      <li class="<%= "active" if current == "Confirm" %>" data-hook='admin_order_tabs_confirm'>
         <%= link_to_with_icon 'check', Spree.t(:confirm), confirm_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :display, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == 'Return Authorizations' %> data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'share', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
+        <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'>
+          <%= link_to_with_icon 'share', Spree.t('admin.tab.rma'), admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :display, Spree::CustomerReturn %>
       <% if @order.completed? %>
-        <li<%== ' class="active"' if current == 'Customer Returns' %>>
-          <%= link_to_with_icon 'download', Spree.t(:customer_returns), admin_order_customer_returns_url(@order) %>
+        <li class="<%= "active" if current == "Customer Returns" %>">
+          <%= link_to_with_icon 'download', Spree::CustomerReturn.model_name.human(count: :other), admin_order_customer_returns_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
-      <%= content_tag('li', :class => ('active' if current == 'Cancel Inventory'), :data => {:hook => 'admin_order_tabs_cancel_inventory'}) do %>
+      <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", :data => {:hook => 'admin_order_tabs_cancel_inventory'}) do %>
         <%= link_to_with_icon 'cancel', Spree.t(:cancel_inventory), admin_order_cancellations_path(@order) %>
       <% end %>
     <% end %>