solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Reimbursements' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Reimbursements' } %>
 
 <% admin_breadcrumb(plural_resource_name(Spree::Reimbursement)) %>
 
@@ -6,7 +6,7 @@
   <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order) %></li>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @customer_return } %>
 
 <table class="index">
   <thead data-hook="customer_return_header">

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% admin_breadcrumb("#{Spree::Reimbursement.model_name.human} #{@reimbursement.number}") %>
 
@@ -7,7 +7,7 @@
   <li><%= button_link_to Spree.t(:back_to_customer_return), url_for([:edit, :admin, @order, @reimbursement.customer_return]) %></li>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @reimbursement } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @reimbursement } %>
 
 <fieldset class='no-border-bottom'>
   <legend align='center'><%= Spree.t(:items_reimbursed) %></legend>
@@ -15,10 +15,10 @@
     <thead>
       <tr>
         <th><%= Spree::Product.model_name.human %></th>
-        <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
-        <th><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
-        <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
-        <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+        <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
+        <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
+        <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+        <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
         <th><%= Spree::ReturnItem.human_attribute_name(:total) %></th>
       </tr>
     </thead>

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

@@ -10,7 +10,7 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <%= render :partial => 'spree/admin/shared/report_order_criteria', :locals => {} %>
+  <%= render partial: 'spree/admin/shared/report_order_criteria', locals: {} %>
 <% end %>
 
 <table class="admin-report" data-hook="sales_total">

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

@@ -12,8 +12,8 @@
         <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-pre-tax-refund-amount wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+        <th class="return-item-reimbursement-type wrap-text"><%= 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>
@@ -83,11 +83,7 @@
 
   <%= f.field_container :memo do %>
     <%= f.label :memo %>
-    <%= f.text_area :memo, {:style => 'height:100px;', :class => 'fullwidth'} %>
+    <%= f.text_area :memo, {style: 'height:100px;', class: 'fullwidth'} %>
     <%= f.error_message_on :memo %>
   <% end %>
 </div>
-
-<% if Spree::Config[:expedited_exchanges] %>
-  <div class="expedited-exchanges-warning"><%= Spree.t(:expedited_exchanges_warning, days_window: Spree::Config[:expedited_exchanges_days_window]) %></div>
-<% end %>

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

@@ -6,18 +6,18 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
 <% admin_breadcrumb("#{@return_authorization.number} (#{Spree.t(@return_authorization.state.downcase)})") %>
 
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @return_authorization } %>
 
 <div data-hook="return-authorization-form-wrapper">
 	<%= form_for [:admin, @order, @return_authorization] do |f| %>
 	  <fieldset class="no-border-top">
-	    <%= render :partial => 'form', :locals => { :f => f } %>
+	    <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
         <%= button Spree.t('actions.update') %>

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

@@ -1,4 +1,4 @@
-<%= 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? %>
@@ -33,10 +33,10 @@
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions">
             <% if can? :update, return_authorization %>
-              <%= link_to_edit return_authorization, :no_text => true, :class => 'edit' %>
+              <%= link_to_edit return_authorization, no_text: true, class: 'edit' %>
             <% end %>
             <% if can?(:destroy, 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,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Return Authorizations' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
 <% admin_breadcrumb(Spree.t(:new_return_authorization)) %>
@@ -7,10 +7,10 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @return_authorization } %>
 <%= form_for [:admin, @order, @return_authorization] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:'actions.create') %>

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

@@ -3,45 +3,45 @@
 <div id="<%= type %>" data-hook="address_fields">
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :firstname %>
-    <%= f.text_field :firstname, :class => 'fullwidth' %>
+    <%= f.text_field :firstname, class: 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :lastname %>
-    <%= f.text_field :lastname, :class => 'fullwidth' %>
+    <%= f.text_field :lastname, class: 'fullwidth' %>
   </div>
 
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{type}-row" %>">
       <%= f.label :company %>
-      <%= f.text_field :company, :class => 'fullwidth' %>
+      <%= f.text_field :company, class: 'fullwidth' %>
     </div>
   <% end %>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :address1 %>
-    <%= f.text_field :address1, :class => 'fullwidth' %>
+    <%= f.text_field :address1, class: 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :address2 %>
-    <%= f.text_field :address2, :class => 'fullwidth' %>
+    <%= f.text_field :address2, class: 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :city %>
-    <%= f.text_field :city, :class => 'fullwidth' %>
+    <%= f.text_field :city, class: 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :zipcode %>
-    <%= f.text_field :zipcode, :class => 'fullwidth' %>
+    <%= f.text_field :zipcode, class: 'fullwidth' %>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= 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'} %>
+      <%= f.collection_select :country_id, available_countries, :id, :name, {}, {class: 'select2 fullwidth js-country_id'} %>
     </span>
   </div>
 
@@ -49,22 +49,14 @@
     <%= 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' };",
-           :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+            style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
+           disabled: !f.object.country.states.empty?, class: 'fullwidth state_name js-state_name' %>
+      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth js-state_id', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
     </span>
   </div>
 
   <div class="field <%= "#{type}-row" %>">
     <%= f.label :phone %>
-    <%= f.phone_field :phone, :class => 'fullwidth' %>
+    <%= f.phone_field :phone, class: 'fullwidth' %>
   </div>
 </div>
-
-<% content_for :head do %>
-  <%= javascript_tag do -%>
-    $(document).ready(function(){
-      $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
-    });
-  <% end -%>
-<% end %>

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

@@ -1,20 +1,17 @@
-<fieldset id="calculator_fields" data-hook class="no-border-bottom">
+<fieldset id="calculator_fields" class="js-calculator-fields no-border-bottom">
   <legend align="center"><%= Spree::Calculator.model_name.human %></legend>
 
-  <div id="preference-settings" data-hook>
+  <div id="preference-settings">
     <div class="field">
-      <%= 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'}) %>
+      <%= f.label(:calculator_type, Spree::Calculator.model_name.human) %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'select2 fullwidth js-calculator-type'}) %>
     </div>
-    <% if !@object.new_record? %>
-      <div class="field">
-        <div class="calculator-settings">
-          <%= f.fields_for :calculator do |calculator_form| %>
-            <%= preference_fields(@object.calculator, calculator_form) %>
-          <% end %>
-        </div>
-        <% if @object.calculator.respond_to?(:preferences) %>
-          <span class="calculator-settings-warning info warning"><%= Spree.t(:calculator_settings_warning) %></span>
+
+    <% @calculators.each do |calculator_class| %>
+      <% calculator = f.object.calculator.class == calculator_class ? f.object.calculator : calculator_class.new %>
+      <div class="js-calculator-preferences" data-calculator-type="<%= calculator_class %>">
+        <%= f.fields_for :calculator, calculator do |calculator_form| %>
+          <%= preference_fields(calculator, calculator_form) %>
         <% end %>
       </div>
     <% end %>

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

@@ -4,8 +4,8 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_configurations_sidebar_menu">
-      <% if can?(:edit, :general_settings) %>
-        <%= settings_tab_item Spree.t(:settings), edit_admin_general_settings_path %>
+      <% if can?(:edit, Spree::Store) %>
+        <%= settings_tab_item plural_resource_name(Spree::Store), admin_stores_path %>
       <% end %>
     </ul>
   </nav>

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

@@ -32,7 +32,7 @@
 
 <%= javascript_include_tag 'spree/backend/all' %>
 
-<%= render "spree/admin/shared/translations" %>
+<%= render "spree/admin/shared/js_locale_data" %>
 
 <%= javascript_tag do -%>
   Spree.api_key = "<%= try_spree_current_user.try(:spree_api_key) %>";

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

@@ -0,0 +1,7 @@
+<% size ||= :mini %>
+
+<% if image && image.attachment? %>
+  <%= image_tag image.attachment(size) %>
+<% else %>
+  <span class="image-placeholder <%= size %>"></span>
+<% end %>

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

@@ -0,0 +1,47 @@
+<script>
+  if (Spree === undefined) {
+    var Spree = {}
+  }
+  Spree.translations = <%==
+    I18n.t("spree").merge({
+      date_picker:    Spree.t(:js_format,
+                               scope: 'date_picker',
+                               default: 'yy/mm/dd'),
+      abbr_day_names:         I18n.t(:abbr_day_names, scope: :date),
+      destroy:                Spree.t(:destroy, scope: :actions),
+      edit:                   Spree.t(:edit,    scope: :actions),
+      save:                   Spree.t(:save,    scope: :actions),
+      cancel:                 Spree.t(:cancel,  scope: :actions),
+      first_day:              Spree.t(:first_day,
+                                       scope: 'date_picker',
+                                       default: 0).to_i,
+      item_stock_placeholder: Spree.t(:choose_location),
+      month_names:            I18n.t(:month_names, scope: :date).reject(&:blank?),
+      currency_separator:     I18n.t('number.currency.format.separator'),
+      currency_delimiter:     I18n.t('number.currency.format.delimiter'),
+      activerecord:           I18n.t('activerecord')
+  }).to_json
+%>;
+
+  Spree.currencyInfo = <%==
+    Money::Currency.all.map { |c|
+      format =
+        if c.symbol == "" || c.symbol_first
+          "%s%v"
+        else
+          "%v %s"
+        end
+      [c.id.to_s.upcase, [
+        c.symbol || "¤",
+        c.exponent,
+        format
+      ]]
+    }.to_h.to_json
+%>;
+</script>
+<script data-hook='admin-custom-translations'>
+</script>
+
+<% if I18n.locale != :en %>
+  <%= javascript_include_tag "solidus_admin/select2_locales/select2_locale_#{I18n.locale}" %>
+<% end %>

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

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

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

@@ -0,0 +1,16 @@
+<% amount_attr ||= :amount %>
+<% currency_attr ||= :currency %>
+<% currency ||= nil %>
+<% required ||= nil %>
+
+<div class="input-group number-with-currency <%= "number-with-currency-with-select" unless currency %> js-number-with-currency">
+  <div class="input-group-addon number-with-currency-symbol"></div>
+  <%= f.text_field amount_attr, value: number_to_currency(f.object.public_send(amount_attr), unit: ''), class: 'form-control number-with-currency-amount', required: required %>
+  <% if currency %>
+    <div class="input-group-addon number-with-currency-addon" data-currency="<%= currency %>">
+      <%= ::Money::Currency.find(currency).iso_code %>
+    </div>
+  <% else %>
+    <%= f.select currency_attr, ::Money::Currency.all.map(&:iso_code), {include_blank: true}, {required: required, class: 'number-with-currency-select'} %>
+  <% end %>
+</div>

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

@@ -55,7 +55,7 @@
     <% 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 Spree.t(:cancel_inventory), spree.admin_order_cancellations_path(@order) %>
       <% end %>
     <% end %>

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

@@ -1,7 +1,7 @@
 <header id="order_tab_summary" data-hook>
   <dl class="additional-info">
-    <dt id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
-    <dd><span class="state <%= @order.state %>"><%= Spree.t(@order.state, :scope => :order_state) %></span></dd>
+    <dt class="order-state" id="order_status" data-hook><%= Spree.t(:status) %>:</dt>
+    <dd class="order-state"><span class="state <%= @order.state %>"><%= Spree.t(@order.state, scope: :order_state) %></span></dd>
 
     <% if @order.user.present? %>
       <dt data-hook='admin_order_user_link'><%= Spree.t(:user) %>:</dt>
@@ -10,29 +10,28 @@
 
     <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>
     <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
-    <% if checkout_steps.include?("delivery") && @order.ship_total > 0 %>
-      <dt data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
-      <dd id='ship_total'><%= @order.display_ship_total.to_html %></dd>
-    <% end %>
 
-    <% if @order.included_tax_total != 0 %>
-      <dt data-hook='admin_order_tab_included_tax_title'><%= Spree::Order.human_attribute_name(:included_tax_total) %>:</dt>
-      <dd id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
+    <% if checkout_steps.include?("delivery")  %>
+      <dt class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
+      <dd class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" id='ship_total'><%= @order.display_ship_total.to_html %></dd>
     <% end %>
 
-    <% if @order.additional_tax_total != 0 %>
-      <dt data-hook='admin_order_tab_additional_tax_title'><%= Spree::Order.human_attribute_name(:additional_tax_total) %>:</dt>
-      <dd id='additional_tax_total'><%= @order.display_additional_tax_total.to_html %></dd>
-    <% end %>
+    <dt class="order-included_tax_total <%= "hidden" if @order.included_tax_total.zero? %>" data-hook='admin_order_tab_included_tax_title'><%= Spree::Order.human_attribute_name(:included_tax_total) %>:</dt>
+    <dd class="order-included_tax_total <%= "hidden" if @order.included_tax_total.zero? %>" id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
+
+    <dt class="order-additional_tax_total <%= "hidden" if @order.additional_tax_total.zero? %>" data-hook='admin_order_tab_additional_tax_title'><%= Spree::Order.human_attribute_name(:additional_tax_total) %>:</dt>
+    <dd class="order-additional_tax_total <%= "hidden" if @order.additional_tax_total.zero? %>" id='additional_tax_total'><%= @order.display_additional_tax_total.to_html %></dd>
 
     <dt data-hook='admin_order_tab_total_title'><%= Spree::Order.human_attribute_name(:total) %>:</dt>
     <dd id='order_total'><%= @order.display_total.to_html %></dd>
 
+    <dt class="order-shipment_state <%= "hidden" unless @order.completed? %>"><%= Spree::Shipment.model_name.human %>: </dt>
+    <dd class="order-shipment_state <%= "hidden" unless @order.completed? %>" id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) %></span></dd>
+
+    <dt class="order-payment_state <%= "hidden" unless @order.completed? %>"><%= Spree::Payment.model_name.human %>: </dt>
+    <dd class="order-payment_state <%= "hidden" unless @order.completed? %>" id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %></span></dd>
+
     <% if @order.completed? %>
-      <dt><%= Spree::Shipment.model_name.human %>: </dt>
-      <dd id='shipment_status'><span class="state <%= @order.shipment_state %>"><%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></span></dd>
-      <dt><%= Spree::Payment.model_name.human %>: </dt>
-      <dd id='payment_status'><span class="state <%= @order.payment_state %>"><%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></span></dd>
       <dt data-hook='admin_order_tab_date_completed_title'><%= Spree::Order.human_attribute_name(:completed_at) %>:</dt>
       <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
     <% end %>

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

@@ -4,22 +4,22 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_product_tabs">
-      <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
+      <%= content_tag :li, class: ('active' if current == 'Product Details') do %>
         <%= link_to Spree.t(:product_details), spree.edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
-      <%= content_tag :li, :class => ('active' if current == 'Images') do %>
+      <%= content_tag :li, class: ('active' if current == 'Images') do %>
         <%= link_to Spree.t(:images), spree.admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) %>
-      <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
+      <%= content_tag :li, class: ('active' if current == 'Variants') do %>
         <%= link_to plural_resource_name(Spree::Variant), spree.admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
-      <%= content_tag :li, :class => ('active' if current == 'Prices') do %>
+      <%= content_tag :li, class: ('active' if current == 'Prices') do %>
         <%= link_to plural_resource_name(Spree::Price), spree.admin_product_prices_url(@product) %>
       <% end if can?(:admin, Spree::Price) %>
-      <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
+      <%= content_tag :li, class: ('active' if current == 'Product Properties') do %>
         <%= link_to plural_resource_name(Spree::ProductProperty), spree.admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) %>
-      <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
+      <%= content_tag :li, class: ('active' if current == 'Stock Management') do %>
         <%= link_to Spree.t(:stock_management), spree.admin_product_stock_url(@product) %>
       <% end if can?(:admin, Spree::StockItem) %>
     </ul>