solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+<%= render 'spree/admin/shared/general_tabs' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_tracker) %>

data/app/views/spree/admin/users/_addresses_form.html.erb

@@ -1,8 +1,7 @@
 <div data-hook="bill_address_wrapper" class="alpha six columns">
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:billing_address) %></legend>
-    <%= f.fields_for :bill_address, @user.bill_address do |ba_form| %>
-      <% ba_form.object ||= Spree::Address.build_default %>
+    <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
       <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
     <% end %>
   </fieldset>
@@ -11,8 +10,7 @@
 <div data-hook="ship_address_wrapper" class="alpha six columns">
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-    <%= f.fields_for :ship_address, @user.ship_address do |sa_form| %>
-      <% sa_form.object ||= Spree::Address.build_default  %>
+    <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
       <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
     <% end %>
   </fieldset>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_user_form_fields" class="row">
   <div class="alpha six columns">
     <%= f.field_container :email do %>
-      <%= f.label :email, Spree.t(:email) %>
+      <%= f.label :email %>
       <% if can?(:update_email, @user) %>
         <%= f.email_field :email, :class => 'fullwidth' %>
       <% else %>
@@ -13,7 +13,7 @@
 
     <% if can? :display, Spree::Role %>
       <div data-hook="admin_user_form_roles" class="field">
-        <%= label_tag nil, Spree.t(:roles) %>
+        <%= label_tag nil, Spree::Role.model_name.human(count: :other) %>
         <ul>
           <% if can? :manage, Spree::Role %>
             <% @roles.each do |role| %>
@@ -31,9 +31,9 @@
       </div>
     <% end %>
 
-    <% if can?(:display, Spree::StockLocation) %>
+    <% if Spree::Config[:can_restrict_stock_management] && can?(:display, Spree::StockLocation) %>
       <div data-hook="admin_user_form_stock_locations" class="field">
-        <%= label_tag nil, Spree.t(:stock_locations) %>
+        <%= label_tag nil, Spree::StockLocation.model_name.human(count: :other) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
             <% @stock_locations.each do |stock_location| %>
@@ -55,13 +55,13 @@
 
   <div data-hook="admin_user_form_password_fields" class="omega six columns">
     <%= f.field_container :password do %>
-      <%= f.label :password, Spree.t(:password) %>
+      <%= f.label :password %>
       <%= f.password_field :password, :class => 'fullwidth' %>
       <%= f.error_message_on :password %>
     <% end %>
 
     <%= f.field_container :password do %>
-      <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
+      <%= f.label :password_confirmation %>
       <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
       <%= f.error_message_on :password_confirmation %>
     <% end %>

data/app/views/spree/admin/users/_sidebar.html.erb

@@ -6,26 +6,26 @@
   <nav class="menu">
     <ul data-hook="admin_user_tab_options">
       <li<%== ' class="active"' if current == :account %>>
-        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
+        <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
       </li>
       <% if can?(:addresses, @user) %>
         <li<%== ' class="active"' if current == :address %>>
-          <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
+          <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:orders, @user) %>
         <li<%== ' class="active"' if current == :orders %>>
-          <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
+          <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), spree.orders_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:items, @user) %>
         <li<%== ' class="active"' if current == :items %>>
-          <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
+          <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:display, Spree::StoreCredit) %>
         <li<%== ' class="active"' if current == :store_credits %>>
-          <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), admin_user_store_credits_path(@user) %>
+          <%= link_to_with_icon 'money', Spree.t(:"admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>
       <% end %>
     </ul>

data/app/views/spree/admin/users/addresses.html.erb

@@ -6,7 +6,7 @@
 <%= render :partial => 'spree/admin/users/user_page_actions' %>
 
 <fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="alpha twelve columns">
-  <legend><%= Spree.t('addresses', :scope => 'admin.user') %></legend>
+  <legend><%= Spree::Address.model_name.human(count: :other) %></legend>
 
   <div data-hook="admin_user_edit_form_header">
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>

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

@@ -38,8 +38,6 @@
           <%= button Spree.t('clear_key', :scope => 'api'), 'trash' %>
         <% end %>
 
-        <span class="or"><%= Spree.t(:or)%></span>
-
         <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
           <%= button Spree.t('regenerate_key', :scope => 'api'), 'refresh' %>
         <% end %>

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

@@ -17,7 +17,7 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search,:email, Spree.t(:user), {}, {:title => 'users_email_title'} %></th>
+      <th><%= sort_link @search,:email, Spree::LegacyUser.model_name.human, {}, {:title => 'users_email_title'} %></th>
       <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
   </thead>
@@ -38,7 +38,7 @@
   </tbody>
 </table>
 
-<%= paginate @users %>
+<%= paginate @users, theme: "solidus_admin" %>
 
 <% content_for :sidebar_title do %>
   <%= Spree.t(:search) %>

data/app/views/spree/admin/users/items.html.erb

@@ -8,7 +8,7 @@
 <fieldset data-hook="admin_user_items_purchased" class="alpha twelve columns">
   <legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
 
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: "solidus_admin" %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
@@ -24,12 +24,12 @@
       </colgroup>
 
       <thead>
-        <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
-        <th colspan=2><%= Spree.t(:description) %></th>
-        <th><%= I18n.t(:price, :scope => 'activerecord.attributes.spree/line_item') %></th>
-        <th><%= I18n.t(:quantity, :scope => 'activerecord.attributes.spree/line_item') %></th>
-        <th><%= Spree.t(:total) %></th>
-        <th><%= sort_link @search, :state, I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
+        <th><%= sort_link @search, :completed_at, Spree::Order.human_attribute_name(:completed_at), {}, {:title => 'orders_completed_at_title'} %></th>
+        <th colspan=2><%= Spree::LineItem.human_attribute_name(:description) %></th>
+        <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
+        <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
+        <th><%= Spree::Order.human_attribute_name(:total) %></th>
+        <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {}, {:title => 'orders_state_title'} %></th>
         <th><%= sort_link @search, :number, Spree.t(:order_num, :scope => 'admin.user'), {}, {:title => 'orders_number_title'} %></th>
       </thead>
 
@@ -72,11 +72,10 @@
     </table>
   <% else %>
     <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>
-      <% if can?([:admin, :create], Spree::Order) %>
-        <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
-      <% end %>
+      <%= render 'spree/admin/shared/no_objects_found',
+                   resource: Spree::Order,
+                   new_resource_url: spree.new_admin_order_path %>
     </div>
   <% end %>
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: "solidus_admin" %>
 </fieldset>

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

@@ -8,7 +8,7 @@
 <fieldset data-hook="admin_user_order_history" class="alpha twelve columns">
   <legend><%= Spree.t(:"admin.user.order_history") %></legend>
 
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: "solidus_admin" %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
@@ -21,10 +21,10 @@
       </colgroup>
       <thead>
         <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
-          <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_total_title'} %></th>
+          <th><%= sort_link @search, :completed_at,   Spree::Order.human_attribute_name(:completed_at), {}, {:title => 'orders_completed_at_title'} %></th>
+          <th><%= sort_link @search, :number,         Spree::Order.human_attribute_name(:number), {}, {:title => 'orders_number_title'} %></th>
+          <th><%= sort_link @search, :state,          Spree::Order.human_attribute_name(:state), {}, {:title => 'orders_state_title'} %></th>
+          <th><%= sort_link @search, :total,          Spree::Order.human_attribute_name(:total), {}, {:title => 'orders_total_title'} %></th>
         </tr>
       </thead>
       <tbody>
@@ -54,12 +54,11 @@
     </table>
   <% else %>
     <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>
-      <% if can?([:admin, :create], Spree::Order) %>
-        <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
-      <% end %>
+      <%= render 'spree/admin/shared/no_objects_found',
+                   resource: Spree::Order,
+                   new_resource_url: spree.new_admin_order_path %>
     </div>
   <% end %>
 
-  <%= paginate @orders %>
+  <%= paginate @orders, theme: "solidus_admin" %>
 </fieldset>

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

@@ -1,49 +1,75 @@
-<div data-hook="admin_variant_form_fields" class="label-block left six columns alpha">
-  <div data-hook="variants">
-    <% @product.option_types.each do |option_type| %>
-      <div class="field" data-hook="presentation">
-        <%= label :new_variant, option_type.presentation %>
-        <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-          { :prompt => true }, { :name => 'variant[option_value_ids][]', :class => 'select2 fullwidth' } %>
+<div data-hook="variants">
+  <fieldset class="no-border-top no-border-bottom">
+    <div class="field four columns alpha" data-hook="sku">
+      <%= f.label :sku %>
+      <%= f.text_field :sku, :class => 'fullwidth' %>
+    </div>
+    <div class="field four columns checkbox" data-hook="track_inventory">
+      <%= f.label :track_inventory do %>
+        <%= f.check_box :track_inventory %>
+        <%= Spree::Variant.human_attribute_name(:track_inventory) %>
+      <% end %>
+    </div>
+  </fieldset>
+  <% if f.object.new_record? %>
+    <fieldset class="no-border-top no-border-bottom">
+      <% @product.option_types.each_with_index do |option_type, index| %>
+        <div class="field four columns <%= 'alpha' if index % 3 == 0 %><%= 'omega' if index % 3 == 2 %>" data-hook="presentation">
+          <%= label :new_variant, option_type.presentation %>
+          <%= f.collection_select 'option_value_ids',
+                                  option_type.option_values,
+                                  :id,
+                                  :presentation,
+                                  { include_blank: true },
+                                  {
+                                    name: 'variant[option_value_ids][]',
+                                    class: "select2 fullwidth"
+                                  } %>
+        </div>
+      <% end %>
+    </fieldset>
+  <% end %>
+</div>
+
+<div data-hook="admin_variant_form_additional_fields">
+  <fieldset class="no-border-top no-border-bottom">
+    <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
+      <div class="field four columns <%= 'alpha' if index % 4 == 0 %> <%= 'omega' if index % 4 == 3 %>" data-hook="<%= field %>">
+        <%= f.label field %>
+        <%= f.text_field field,
+                         value: number_with_precision(@variant.send(field), :precision => 2),
+                         class: 'fullwidth' %>
       </div>
     <% end %>
+  </fieldset>
+</div>
 
-    <div class="field" data-hook="sku">
-      <%= f.label :sku, Spree.t(:sku) %>
-      <%= f.text_field :sku, :class => 'fullwidth' %>
-    </div>
+<div data-hook="admin_variant_form_fields">
+  <fieldset class="no-border-top no-border-bottom">
+    <p> <%== t('.pricing_hint') %> </p>
 
-    <div class="field" data-hook="price">
-      <%= f.label :price, Spree.t(:price) %>
+    <div class="field four columns alpha" data-hook="price">
+      <%= f.label :price %>
       <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
     </div>
 
-    <div class="field" data-hook="cost_price">
-      <%= f.label :cost_price, Spree.t(:cost_price) %>
+    <div class="field four columns" data-hook="cost_price">
+      <%= f.label :cost_price %>
       <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>
     </div>
 
-    <div class="field" data-hook="tax_category">
-      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
-    </div>
-
-    <div class="field" data-hook="tax_category">
-      <label>
-        <%= f.check_box :track_inventory %>
-        <%= Spree.t(:track_inventory) %>
-      </label>
+    <div class="field four columns omega" data-hook="tax_category">
+      <%= f.label :tax_category %>
+      <%= f.collection_select :tax_category_id,
+                              @tax_categories,
+                              :id,
+                              :name,
+                              { :include_blank => t('.use_product_tax_category') },
+                              { :class => 'select2 fullwidth' } %>
     </div>
-  </div>
+  </fieldset>
 </div>
 
-<div class="right six columns omega label-block" data-hook="admin_variant_form_additional_fields">
-  <% [:weight, :height, :width, :depth].each do |field| %>
-    <div class="field" data-hook="<%= field %>"><%= f.label field, Spree.t(field) %>
-      <% value = number_with_precision(@variant.send(field), :precision => 2) %>
-      <%= f.text_field field, :value => value, :class => 'fullwidth' %>
-    </div>
-  <% end %>
-</div>
+
 
 <div class="clear"></div>

data/app/views/spree/admin/variants/_table.html.erb

@@ -0,0 +1,47 @@
+<%= paginate variants, theme: "solidus_admin" %>
+
+<table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
+  <colgroup>
+    <col style="width: 5%" />
+    <col style="width: 25%" />
+    <col style="width: 20%" />
+    <col style="width: 20%" />
+    <col style="width: 15%" />
+    <col style="width: 15%" />
+  </colgroup>
+  <thead data-hook="variants_header">
+    <tr>
+      <th colspan="2"><%= Spree.t(:options) %></th>
+      <th><%= Spree::Variant.human_attribute_name(:price) %></th>
+      <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% variants.each do |variant| %>
+    <tr id="<%= spree_dom_id variant %>" data-hook="variants_row" class="<%= "deleted" if variant.deleted? %> <%= cycle('odd', 'even')%>">
+      <td class="no-border">
+        <% if can? :update_positions, Spree::Variant %>
+          <span class="handle"></span>
+        <% end %>
+      </td>
+      <td><%= variant.options_text %></td>
+      <td class="align-center"><%= variant.display_price.to_html %></td>
+      <td class="align-center"><%= variant.sku %></td>
+      <td class="actions">
+        <% if can?(:update, variant) %>
+          <%= link_to_edit(variant, :no_text => true) unless variant.deleted? %>
+        <% end %>
+        <% if can?(:destroy, variant) %>
+          &nbsp;
+          <%= link_to_delete(variant, :no_text => true) unless variant.deleted? %>
+        <% end %>
+      </td>
+    </tr>
+    <% end %>
+    <% if variants.empty? %>
+      <tr><td colspan="4"><%= Spree.t(:none) %></td></tr>
+    <% end %>
+  </tbody>
+</table>
+<%= paginate variants, theme: "solidus_admin" %>

data/app/views/spree/admin/variants/_table_filter.html.erb

@@ -0,0 +1,25 @@
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
+    <div data-hook="admin_variants_index_search" class="field thirteen columns alpha">
+      <%= f.label :variant_search_term, Spree.t(:variant_search_placeholder) %>
+      <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+    </div>
+
+    <% if product.variants.only_deleted.any? %>
+      <div class="field checkbox three columns omega">
+        <%= label_tag :deleted do %>
+          <%= check_box_tag :deleted, "on", params[:deleted] == "on" %>
+          <%= t('.show_deleted') %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class="actions filter-actions">
+      <%= f.button :search %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,14 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
 
+<% content_for :page_title do %>
+  &#x2f; <%= @variant.options_text %>
+<% end %>
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
+    <legend><%= t('.edit_variant') %></legend>
     <div data-hook="admin_variant_edit_form">
       <%= render :partial => 'form', :locals => { :f => f } %>
     </div>

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

@@ -1,129 +1,45 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
+<%= render 'spree/admin/shared/product_tabs', current: 'Variants' %>
 
-<%# Place for new variant form %>
-<div id="new_variant" data-hook></div>
-
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <div data-hook="admin_variants_sidebar">
-
-    <%= search_form_for [:admin, @search], url: admin_product_variants_url(product: @product) do |f| %>
-
-      <%- locals = {:f => f} %>
-
-      <div class="three columns">
-        <div class="field">
-          <%= f.label :sku_cont, Spree.t(:sku) %>
-          <%= f.text_field :sku_cont, :size => 15 %>
-        </div>
-      </div>
-
-      <% @option_types.each do |option_type| %>
-        <div data-hook="admin_variants_index_search">
-          <div class="three columns">
-            <div class="field">
-              <% option_values = @option_values.select { |ov| ov.option_type_id == option_type.id } %>
-              <%= f.label :option_values_presentation_in, option_type.presentation %>
-              <br />
-              <%= f.collection_select :option_values_presentation_in, option_values.sort_by(&:presentation), :presentation, :presentation, { :include_blank => Spree.t('match_choices.none') }, { class: "select2 fullwidth" } %>
-            </div>
-          </div>
-        </div>
-      <% end %>
-
-      <div class="clear"></div>
-
-      <div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
-        <%= button Spree.t(:search), 'search' %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
-
-<% if @variants.any? %>
-  <%= paginate @variants %>
-
-  <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
-    <colgroup>
-      <col style="width: 5%" />
-      <col style="width: 25%" />
-      <col style="width: 20%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
-      <col style="width: 15%" />
-    </colgroup>
-    <thead data-hook="variants_header">
-      <tr>
-        <th colspan="2"><%= Spree.t(:options) %></th>
-        <th><%= Spree.t(:price) %></th>
-        <th><%= Spree.t(:sku) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @variants.each do |variant| %>
-      <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row" class="<%= cycle('odd', 'even')%>">
-        <td class="no-border">
-          <% if can? :update_positions, Spree::Variant %>
-            <span class="handle"></span>
-          <% end %>
-        </td>
-        <td><%= variant.options_text %></td>
-        <td class="align-center"><%= variant.display_price.to_html %></td>
-        <td class="align-center"><%= variant.sku %></td>
-        <td class="actions">
-          <% if can?(:update, variant) %>
-            <%= link_to_edit(variant, :no_text => true) unless variant.deleted? %>
-          <% end %>
-          <% if can?(:destroy, variant) %>
-            &nbsp;
-            <%= link_to_delete(variant, :no_text => true) unless variant.deleted? %>
-          <% end %>
-        </td>
-      </tr>
+<% if @variants.any? || @product.variants.only_deleted.any?%>
+  <%= render "table_filter", product: @product %>
+  <%= render "table", variants: @variants %>
+<% else %>
+  <% if !Spree::OptionType.any? %>
+    <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
+      <%= Spree.t(:to_add_variants_you_must_first_define) %>
+      <% if can?(:display, Spree::OptionType) %>
+        <%= link_to Spree::OptionType.model_name.human(count: :other), admin_option_types_path%>
+      <% else %>
+        <%= Spree::OptionType.model_name.human(count: :other) %>
       <% end %>
-      <% unless @product.has_variants? %>
-        <tr><td colspan="5"><%= Spree.t(:none) %></td></tr>
+    </p>
+  <% elsif @product.empty_option_values? %>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t :no_option_values_on_product_html,
+                  link: link_to(Spree.t(:product_details), [:edit, :admin, @product]) %>
+    </div>
+  <% else %>
+    <div class="alpha twelve columns no-objects-found">
+      <%= Spree.t(:no_resource, resource: Spree::Variant.model_name.human(count: :other)) %>
+      <% if can? :create, Spree::Variant %>
+        <%= link_to Spree.t(:create_one), new_object_url, remote: true %>
       <% end %>
-    </tbody>
-  </table>
-  <%= paginate @variants %>
-<% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>
-    <% if can?(:create, Spree::Variant) %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_product_variant_path(@product) %>!
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 <% end %>
 
-<% if @product.empty_option_values? %>
-  <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
-    <%= Spree.t(:to_add_variants_you_must_first_define) %>
-    <% if can?(:display, Spree::OptionType) %>
-      <%= link_to Spree.t(:option_types), admin_option_types_path%>
-    <% else %>
-      <%= Spree.t(:option_types) %>
-    <% end %>
-  </p>
-<% else %>
+<% if !@product.empty_option_values? %>
   <% content_for :page_actions do %>
     <ul class="inline-menu" data-hook="toolbar">
       <% if can?(:create, Spree::Variant) %>
         <li id="new_var_link" data-hook>
-          <%= link_to_with_icon('plus',
+          <%= link_to_with_icon 'plus',
                                 Spree.t(:new_variant),
                                 new_admin_product_variant_url(@product),
                                 :remote => :true,
-                                :'data-update' => 'new_variant',
-                                :class => 'button'
-                               ) %>
+                                :class => 'button' %>
         </li>
       <% end %>
-      <li><%= link_to_with_icon('filter', @deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active), admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), :class => 'button') %></li>
     </ul>
   <% end %>
 <% end %>