spree_backend 2.0.13 → 2.1.0

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

@@ -1,48 +1,40 @@
 <div data-hook="admin_product_form_fields">
+  
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">    
+    <%= f.field_container :name do %>
+      <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+      <%= f.text_field :name, :class => 'fullwidth title' %>
+      <%= f.error_message_on :name %>
+    <% end %>
 
-  <div class="left eight columns alpha" data-hook="admin_product_form_left">
-    <div data-hook="admin_product_form_name">
-      <%= f.field_container :name do %>
-        <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-        <%= f.text_field :name, :class => 'fullwidth title' %>
-        <%= f.error_message_on :name %>
-      <% end %>
-    </div>
-
-    <div data-hook="admin_product_form_permalink">
-      <%= f.field_container :permalink do %>
-        <%= f.label :permalink, raw(Spree.t(:permalink) + content_tag(:span, ' *',  :class => "required")) %>
-        <%= f.text_field :permalink, :class => 'fullwidth title' %>
-        <%= f.error_message_on :permalink %>
-      <% end %>
-    </div>
+    <%= f.field_container :permalink do %>
+      <%= f.label :permalink, raw(Spree.t(:permalink) + content_tag(:span, ' *',  :class => "required")) %>
+      <%= f.text_field :permalink, :class => 'fullwidth title' %>
+      <%= f.error_message_on :permalink %>
+    <% end %>
 
-    <div data-hook="admin_product_form_description">
-      <%= f.field_container :description do %>
-        <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
-        <%= f.error_message_on :description %>
-      <% end %>
-    </div>
+    <%= f.field_container :description do %>
+      <%= f.label :description, Spree.t(:description) %>
+      <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
+      <%= f.error_message_on :description %>
+    <% end %>
   </div>
 
   <div class="right four columns omega" data-hook="admin_product_form_right">
-    <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
       <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
       <%= f.error_message_on :price %>
     <% end %>
-    </div>
 
-    <div data-hook="admin_product_form_cost_price" class="alpha two columns">
+    <div class="alpha two columns">
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
-    <div data-hook="admin_product_form_cost_currency" class="omega two columns">
+    <div class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>
         <%= f.text_field :cost_currency %>
@@ -52,89 +44,74 @@
 
     <div class="clear"></div>
 
-    <div data-hook="admin_product_form_available_on">
-      <%= f.field_container :available_on do %>
-        <%= f.label :available_on, Spree.t(:available_on) %>
-        <%= f.error_message_on :available_on %>
-        <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
-      <% end %>
-    </div>
+    <%= f.field_container :available_on do %>
+      <%= f.label :available_on, Spree.t(:available_on) %>
+      <%= f.error_message_on :available_on %>
+      <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
+    <% end %>
 
     <% unless @product.has_variants? %>
-      <div data-hook="admin_product_form_sku">
-        <%= f.field_container :sku do %>
-          <%= f.label :sku, Spree.t(:sku) %>
-          <%= f.text_field :sku, :size => 16 %>
-        <% end %>
-      </div>
+      <%= f.field_container :sku do %>
+        <%= f.label :sku, Spree.t(:sku) %>
+        <%= f.text_field :sku, :size => 16 %>
+      <% end %>
 
       <ul id="shipping_specs">
-        <li id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field alpha two columns">
+        <li id="shipping_specs_weight_field" class="field alpha two columns">
           <%= f.label :weight, Spree.t(:weight) %>
           <%= f.text_field :weight, :size => 4 %>
         </li>
-        <li id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field omega two columns">
+        <li id="shipping_specs_height_field" class="field omega two columns">
           <%= f.label :height, Spree.t(:height) %>
           <%= f.text_field :height, :size => 4 %>
         </li>
-        <li id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field alpha two columns">
+        <li id="shipping_specs_width_field" class="field alpha two columns">
           <%= f.label :width, Spree.t(:width) %>
           <%= f.text_field :width, :size => 4 %>
         </li>
-        <li id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field omega two columns">
+        <li id="shipping_specs_depth_field" class="field omega two columns">
           <%= f.label :depth, Spree.t(:depth) %>
           <%= f.text_field :depth, :size => 4 %>
         </li>
       </ul>
     <% end %>
 
-    <div data-hook="admin_product_form_shipping_categories">
-      <%= f.field_container :shipping_categories do %>
-        <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
-        <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
-        <%= f.error_message_on :shipping_category %>
-      <% end %>
-    </div>
+    <%= f.field_container :shipping_categories do %>
+      <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+      <%= f.error_message_on :shipping_category %>
+    <% end %>
 
-    <div data-hook="admin_product_form_tax_category">
-      <%= f.field_container :tax_category do %>
-        <%= 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' }) %>
-        <%= f.error_message_on :tax_category %>
-      <% end %>
-    </div>
+    <%= f.field_container :tax_category do %>
+      <%= 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' }) %>
+      <%= f.error_message_on :tax_category %>
+    <% end %>
   </div>
 
   <div class="twelve columns alpha omega">
-    <div data-hook="admin_product_form_taxons">
-      <%= f.field_container :taxons do %>
-        <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
-        <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
-      <% end %>
-    </div>
+    <%= f.field_container :taxons do %>
+      <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
+      <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
+    <% end %>
 
-    <div data-hook="admin_product_form_option_types">
-      <%= f.field_container :option_types do %>
-        <%= f.label :option_type_ids, Spree.t(:option_types) %>
-        <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
-      <% end %>
-    </div>
+    <%= f.field_container :option_types do %>
+      <%= f.label :option_type_ids, Spree.t(:option_types) %>
+      <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
+    <% end %>
   </div>
 
+  <!-- <h2><%= Spree.t(:metadata) %></h2> -->
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
-    <div data-hook="admin_product_form_meta_keywords">
-      <%= f.field_container :meta_keywords do %>
-        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
-        <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
-      <% end %>
-    </div>
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
+    <% end %>
 
-    <div data-hook="admin_product_form_meta_description">
-      <%= f.field_container :meta_description do %>
-        <%= f.label :meta_description, Spree.t(:meta_description) %>
-        <%= f.text_field :meta_description, :class => 'fullwidth' %>
-      <% end %>
-    </div>
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, Spree.t(:meta_description) %>
+      <%= f.text_field :meta_description, :class => 'fullwidth' %>
+    <% end %>
   </div>
 
   <div class="clear"></div>

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

@@ -76,7 +76,7 @@
     </thead>
     <tbody>
       <% @collection.each do |product| %>
-          <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
+          <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td class="align-center"><%= product.sku rescue '' %></td>
             <td class="align-center"><%= mini_image(product) %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>

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

@@ -15,7 +15,7 @@
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="alpha four columns">
+        <div class="alpha four columns">
           <%= f.field_container :sku do %>
             <%= f.label :sku, Spree.t(:sku) %><br />
             <%= f.text_field :sku, :size => 16, :class => 'fullwidth' %>
@@ -24,22 +24,22 @@
         </div>
       <% end %>
 
-      <div data-hook="new_product_prototype" class="four columns">
+      <div class="four columns">
         <%= f.field_container :prototype do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %><br />
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_price" class="four columns">
+      <div class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
+          <%= f.text_field :price, :class => 'fullwidth' %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_available_on" class="omega four columns">
+      <div class="omega four columns">
         <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
@@ -50,7 +50,7 @@
     </div>
 
     <div class='row'>
-      <div data-hook="new_product_shipping_category" class="alpha four columns">
+      <div class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>

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

@@ -33,15 +33,6 @@
             <% if variant.images.present? %>
               <%= image_tag variant.images.first.attachment.url(:mini) %>
             <% end %>
-            <br/>
-            <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
-                <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                                  class: 'track_inventory_checkbox' %>
-                <%= Spree.t(:track_inventory) %>
-                <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
-                    class: 'variant_track_inventory',
-                    id: "variant_track_inventory_#{variant.id}" %>
-            <% end %>
           </td>
           <td colspan="4" class="stock_location_info">
             <table>
@@ -66,16 +57,17 @@
                     <td class="align-center"><%= item.count_on_hand %></td>
                     <td class="align-center">
                       <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                        <%= check_box_tag 'stock_item[backorderable]', 1, item.backorderable?,
+                        <%= check_box_tag 'stock_item[backorderable]', true,
+                              item.backorderable?,
                               class: 'stock_item_backorderable',
                               id: "stock_item_backorderable_#{item.stock_location.id}" %>
                       <% end %>
                     </td>
                     <td class="actions">
                       <%= link_to(icon('delete'), [:admin, item],
-                            method: :delete, remote: true, confirm: Spree.t(:are_you_sure),
+                            method: :delete, remote: true,
                             class: 'icon_link with-tip icon-trash no-text',
-                            title: Spree.t(:remove), data: { action: :remove }) %>
+                            title: Spree.t(:remove), data: { action: :remove, confirm: Spree.t(:are_you_sure) }) %>
                     </td>
                   </tr>
                 <% end %>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -5,4 +5,3 @@ $('.product_picker').productAutocomplete();
 $('.user_picker').userAutocomplete();
 
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
-$('#promotion_rule_type').select2();

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

@@ -32,7 +32,7 @@
       <%= f.field_container :description do %>
         <%= f.label :description %><br />
         <%= f.text_area :description, :rows => 7, :class => 'fullwidth' %>
-      <% end %>      
+      <% end %>
     </div>
   </div>
 
@@ -40,9 +40,11 @@
     <%= f.field_container :usage_limit do %>
       <%= f.label :usage_limit %><br />
       <%= f.number_field :usage_limit, :min => 0, :class => 'fullwidth' %><br>
-      <%= Spree.t(:current_promotion_usage, :count => @promotion.credits_count) %>
+      <span class="info">
+        <%= Spree.t(:current_promotion_usage, :count => @promotion.credits_count) %>
+      </span>
     <% end %>
-    
+
     <div id="starts_at_field" class="field">
       <%= f.label :starts_at %>
       <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :class => 'datepicker datepicker-from fullwidth' %>

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

@@ -11,7 +11,7 @@
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
         <%= f.label :property_ids, Spree.t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
       <% end %>
     </div>
   </div>
@@ -19,7 +19,7 @@
   <div class="six columns omega">
     <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
-      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <% if @prototype.option_types.present? %>
-  <h2><%= Spree.t(:variants) %></h2>
+  <h2>Variants</h2>
 
   <ul class="product-prototype-options">
     <% @prototype.option_types.each do |ot| %>

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

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

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

@@ -9,7 +9,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @return_authorization.order.shipments.shipped.collect{|s| s.inventory_units.all}.flatten.group_by(&:variant).each do | variant, units| %>
+      <% @return_authorization.order.shipments.shipped.collect{|s| s.inventory_units.to_a}.flatten.group_by(&:variant).each do | variant, units| %>
         <tr id="<%= dom_id(variant) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
           <td>
             <div class="variant-name"><%= variant.name %></div>
@@ -50,7 +50,7 @@
 
   <%= f.field_container :stock_location do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %>
-    <%= f.select :stock_location_id, Spree::StockLocation.active.all.collect{|l|[l.name, l.id]}, {:style => 'height:100px;', :class => 'fullwidth'} %>
+    <%= f.select :stock_location_id, Spree::StockLocation.active.to_a.collect{|l|[l.name, l.id]}, {:style => 'height:100px;', :class => 'fullwidth'} %>
     <%= f.error_message_on :reason %>
   <% end %>
 </div>

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

@@ -0,0 +1,23 @@
+<% if content_for?(:page_title) || content_for?(:page_actions) %>
+  <div id="content-header" data-hook>
+    <div class="container">
+      <div class="sixteen columns">
+        <div class="block-table">
+          <% if content_for?(:page_title) %>
+            <div class="table-cell">
+              <h1 class="page-title <%= yield :page_title_classes %>"><%= yield :page_title %></h1>
+            </div>
+          <% end %>
+
+          <% if content_for?(:page_actions) %>
+            <div class="page-actions table-cell toolbar" data-hook="toolbar">
+              <ul class="inline-menu">
+                <%= yield :page_actions %>
+              </ul>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -1,7 +1,16 @@
-<% success = flash.discard(:success)
-if success %>
-  console.log(show_flash)
-  show_flash('success', "<%= success %>")
-<% end %>
+notice_div = $('.flash.notice');
+<% notice = flash.discard(:notice)
+if notice %>
+  if (notice_div.length > 0) {
+    notice_div.html("<%= notice %>");
+    notice_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
+    } else {
+      $("#content h1").before('<div class="flash notice"><%= notice %></div>');
+    }
+  } <%
+end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

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

@@ -0,0 +1,9 @@
+<header id="header" data-hook>
+  <div class="container">
+    <figure data-hook="logo-wrapper" class="columns five">
+      <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path %>
+    </figure>
+
+    <nav data-hook="admin_login_navigation_bar" class="columns eleven"></nav>
+  </div>
+</header>

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

@@ -0,0 +1,9 @@
+<nav id="admin-menu" data-hook>
+  <div class="container">
+    <div class="sixteen columns main-menu-wrapper">
+      <ul data-hook="admin_tabs" class="inline-menu fullwidth-menu">
+        <%= render :partial => 'spree/admin/shared/tabs' %>
+      </ul>
+    </div>
+  </div>
+</nav>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:order)} ##{@order.number}", edit_admin_order_path(@order) %>
+  <%= Spree.t(:order) %> #<%= @order.number %>
 <% end %>
 
 <% content_for :sidebar_title do %>
@@ -47,22 +47,22 @@
           <%= link_to_with_icon 'icon-edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
         </li>
       <% end %>
-      <% if can?(:update, @order) && checkout_steps.include?("address") %>
+      <% if can? :update, @order && checkout_steps.include?("address") %>
         <li<%== ' class="active"' if current == 'Customer Details' %>>
           <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, Spree::Adjustment %>
+      <% if can? :index, @order.adjustments %>
         <li<%== ' class="active"' if current == 'Adjustments' %>>
           <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
         </li>
       <% end %>
-      <% if can?(:index, Spree::Payment) && @order.payment_required? %>
+      <% if can? :index, @order.payments && @payment_required %>
         <li<%== ' class="active"' if current == 'Payments' %>>
           <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, Spree::ReturnAuthorization %>
+      <% if can? :index, @order.return_authorizations %>
         <% if @order.completed? %>
           <li<%== ' class="active"' if current == 'Return Authorizations' %>>
             <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>

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

@@ -1,13 +1,13 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
     <div class="date-range-filter field align-center">
         <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
-        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
+        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from' %>
         
         <span class="range-divider">
           <i class="icon-arrow-right"></i>
         </span>
 
-        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
+        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to' %>
         <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
     </div>
 

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

@@ -9,6 +9,5 @@
   Spree.routes.checkouts_api = "<%= spree.api_checkouts_url(:format => 'json') %>";
   Spree.routes.stock_locations_api = "<%= spree.api_stock_locations_url(:format => 'json') %>";
   Spree.routes.variants_api = "<%= spree.api_variants_url(:format => 'json') %>";
-  Spree.routes.payments_api = "<%= spree.api_order_payments_url(:format => 'json') if params[:order_id] %>";
-  Spree.routes.stock_items_api = "<%= spree.api_stock_location_stock_items_url(:format => 'json') if params[:stock_location_id] %>";
+
 </script>

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

@@ -0,0 +1,10 @@
+<% if content_for?(:sidebar) %>
+  <aside id="sidebar" data-hook class="four columns">
+
+    <% if content_for?(:sidebar_title) %>
+      <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>
+    <% end %>
+
+    <%= yield :sidebar %>
+  </aside>
+<% end %>

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

@@ -0,0 +1,9 @@
+<% if content_for?(:sub_menu) %>
+  <nav id="sub-menu" data-hook>
+    <div class="container">
+      <div class="sixteen columns">
+        <%= yield :sub_menu %>
+      </div>
+    </div>
+  </nav>
+<% end %>

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

@@ -0,0 +1,8 @@
+<% if content_for?(:table_filter) %>
+  <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+    <fieldset>
+      <legend align="center"><%= yield :table_filter_title %></legend>
+      <%= yield :table_filter %>
+    </fieldset>
+  </div>
+<% end %>

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

@@ -10,10 +10,8 @@
     :choose_a_customer        => Spree.t(:choose_a_customer),
     :confirm_delete           => Spree.t(:confirm_delete),
     :cut                      => Spree.t(:cut),
-    :destroy                  => Spree.t(:destroy, :scope => :actions),
-    :edit                     => Spree.t(:edit,    :scope => :actions),
-    :save                     => Spree.t(:save,    :scope => :actions),
-    :cancel                   => Spree.t(:cancel,  :scope => :actions),
+    :destroy                  => Spree.t(:destroy),
+    :edit                     => Spree.t(:edit),
     :first_day                => Spree.t(:first_day,
                                          :scope => 'date_picker',
                                          :default => 0).to_i,
@@ -33,8 +31,7 @@
     :type_to_search           => Spree.t(:type_to_search),
     :taxon_placeholder        => Spree.t(:taxon_placeholder),
     :variant_placeholder      => Spree.t(:variant_placeholder),
-    :value                    => Spree.t(:value),
-    :currency_separator       => I18n.t('number.currency.format.separator'),
+    :value                    => Spree.t(:value)
   }.to_json
 %>
 </script>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
+  <div class="alpha six columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
+  <div class="omega six columns">
     <%= f.field_container :display_on do %>
       <%= f.label :display_on, Spree.t(:display) %><br />
       <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
@@ -16,7 +16,7 @@
   </div>
 
   <div class="alpha omega twelve columns">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
+    <div class="alpha six columns">
       <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %><br />
         <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
+  <div class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
@@ -54,10 +54,9 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:zones) %></legend>
       <%= f.field_container :zones do %>
-        <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>
           <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+            <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %>
             <%= zone.name %>
           <% end %>
           <br>

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

@@ -29,7 +29,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+      <% @shipping_methods.each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>