spree_core 1.0.7 → 1.1.0.rc1

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

@@ -21,81 +21,84 @@
   <div class="right" data-hook="admin_product_form_right">
       <%= f.field_container :price do %>
         <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
-        <%= f.text_field :price, :value => number_with_precision(@product.price, :precision => 2) %>
+        <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
         <%= f.error_message_on :price %>
       <% end %>
 
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price, t(:cost_price) %><br />
-        <%= f.text_field :cost_price, :value => number_with_precision(@product.cost_price, :precision => 2) %>
+        <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
       <%= f.error_message_on :cost_price %>
     <% end %>
 
-    <p>
+    <%= f.field_container :available_on do %>
       <%= f.label :available_on, t(:available_on) %><br />
       <%= f.error_message_on :available_on %>
       <%= f.text_field :available_on, :class => 'datepicker' %>
-    </p>
+    <% end %>
 
-    <p>
-      <%= f.label :sku, t(:sku) %><br />
-      <%= f.text_field :sku, :size => 16 %>
-    </p>
     <% unless @product.has_variants? %>
+      <%= f.field_container :sku do %>
+        <%= f.label :sku, t(:sku) %><br />
+        <%= f.text_field :sku, :size => 16 %>
+      <% end %>
+
       <% if Spree::Config[:track_inventory_levels] %>
-        <p>
+        <%= f.field_container :on_hand do %>
           <%= f.label :on_hand, t(:on_hand) %><br />
           <%= f.number_field :on_hand, :min => 0 %>
-        </p>
+        <% end %>
       <% end %>
-      <ul id="shipping-specs">
-        <li>
+
+      <ul id="shipping_specs">
+        <li id="shipping_specs_weight_field">
           <%= f.label :weight, t(:weight) %>
           <%= f.text_field :weight, :size => 4 %>
         </li>
-        <li>
+        <li id="shipping_specs_height_field">
           <%= f.label :height, t(:height) %>
           <%= f.text_field :height, :size => 4 %>
         </li>
-        <li>
+        <li id="shipping_specs_width_field">
           <%= f.label :width, t(:width) %>
           <%= f.text_field :width, :size => 4 %>
         </li>
-        <li>
+        <li id="shipping_specs_depth_field">
           <%= f.label :depth, t(:depth) %>
           <%= f.text_field :depth, :size => 4 %>
         </li>
       </ul>
     <% end %>
-    <p>
+
+    <%= f.field_container :shipping_categories do %>
       <%= f.label :shipping_category_id, t(:shipping_categories) %><br />
-      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {'style' => 'width:200px'}) %>
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
       <%= f.error_message_on :shipping_category %>
-    </p>
+    <% end %>
 
-    <p>
+    <%= f.field_container :tax_category do %>
       <%= f.label :tax_category_id, t(:tax_category) %><br />
-      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, {:include_blank => true}, {'style' => 'width:200px'}) %>
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
       <%= f.error_message_on :tax_category %>
-    </p>
+    <% end %>
   </div>
 </div>
 
 <h2><%= t(:metadata) %></h2>
 <div data-hook="admin_product_form_meta">
-  <p>
+  <%= f.field_container :meta_keywords do %>
     <%= f.label :meta_keywords, t(:meta_keywords) %><br />
     <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
-  </p>
-  <p>
+  <% end %>
+
+  <%= f.field_container :meta_description do %>
     <%= f.label :meta_description, t(:meta_description) %><br />
     <%= f.text_field :meta_description, :class => 'fullwidth' %>
-  </p>
+  <% end %>
 </div>
 
-
 <div data-hook="admin_product_form_additional_fields">
-  <% Spree::Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
+  <% Spree::Variant.additional_fields.select { |af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
     <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
   <% end %>
 </div>

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

@@ -16,12 +16,12 @@
 <table class="index" id="listing_products">
   <tr data-hook="admin_products_index_headers">
     <th><%= t(:sku) %></th>
-    <th><%= sort_link @search,:name, t(:name), {}, {:title => 'admin_products_listing_name_title'} %></th>
+    <th><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
     <th><%= sort_link @search,:master_price, t(:master_price) %></th>
     <th data-hook="admin_products_index_header_actions"></th>
   </tr>
 <% @collection.each do |product| %>
-  <tr <%= "style='color: red;'" if product.deleted? %> id="<%= dom_id product %>" data-hook="admin_products_index_rows">
+  <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows">
     <td><%= product.sku rescue '' %></td>
     <td><%= product.name rescue '' %></td>
     <td><%= number_to_currency product.price rescue '' %></td>
@@ -39,23 +39,23 @@
 
 <% content_for :sidebar do %>
   <div data-hook="admin_products_sidebar">
-    <%= form_for [:admin, @search] do |f| %>
+    <%= search_form_for [:admin, @search] do |f| %>
       <div class="box">
         <h3><%= t(:search) %></h3>
 
         <%- locals = {:f => f} %>
         <div data-hook="admin_products_index_search">
           <p>
-            <%= f.label :name_contains, t(:name) %><br />
-            <%= f.text_field :name_contains, :size => 15 %>
+            <%= f.label :name_cont, t(:name) %><br />
+            <%= f.text_field :name_cont, :size => 15 %>
           </p>
           <p>
-            <%= f.label :variants_including_master_sku_contains, t(:sku) %><br />
-            <%= f.text_field :variants_including_master_sku_contains, :size => 15 %>
+            <%= f.label :variants_including_master_sku_cont, t(:sku) %><br />
+            <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
           </p>
           <p>
-            <%= f.label :deleted_at_is_null, t(:show_deleted) %><br />
-            <%= f.check_box :deleted_at_is_null, {:checked => params[:search][:deleted_at_is_null].blank?}, '', '1' %>
+            <%= f.label :deleted_at_null, t(:show_deleted) %><br />
+            <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null].blank?}, '', '1' %>
           </p>
         </div>
 

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

@@ -4,7 +4,7 @@
 
 <%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
 <fieldset data-hook="new_product">
-
+  
   <%= f.field_container :name do %>
     <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= f.text_field :name, :class => 'fullwidth title' %>
@@ -22,10 +22,10 @@
         <% end %>
       <% end %>
 
-      <p>
+      <%= f.field_container :prototype do %>
         <%= f.label :prototype_id, t(:prototype) %><br />
         <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, :include_blank => true %>
-      </p>
+      <% end %>
 
     </div>
     <div class="right">
@@ -45,8 +45,32 @@
 
     </div>
   </div>
+  
+  <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
+    <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
+  </div>
 
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-
+  
 </fieldset>
 <% end %>
+
+<script type="text/javascript">
+//<![CDATA[
+  (function($){
+    var base_url = "<%= admin_prototypes_url %>";
+    var prototype_select = $('#product_prototype_id');    
+    prototype_select.change(function() {
+      var id = prototype_select.val();
+      if (id.length) {
+        $('#product-from-prototype').load([ base_url, id ].join("/"));
+      } else {
+        $('#product-from-prototype').empty();
+      }
+    })
+    if (prototype_select.html() == "") {
+      prototype_select.change();
+    }
+  })(jQuery);
+//]]>
+</script>

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

@@ -1,3 +1,3 @@
-$("#new_product").html('<%= escape_javascript(render :template => "spree/admin/products/new.html.erb") %>');
+$("#new_product").html('<%= escape_javascript(render :template => "spree/admin/products/new", :formats => [:html], :handlers => [:erb]) %>');
 handle_date_picker_fields();
 $("#admin_new_product").parent().hide();

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

@@ -25,7 +25,7 @@
   </thead>
   <tbody>
     <% @properties.each do |property| %>
-      <tr id="<%= dom_id property %>" data-hook="listing_properties_row">
+      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
         <td><%= property.name %></td>
         <td><%= property.presentation %></td>
         <td class="actions">

data/app/views/spree/admin/properties/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_property").html('<%= escape_javascript(render :template => "spree/admin/properties/new.html.erb") %>');
+$("#new_property").html('<%= escape_javascript(render :template => "spree/admin/properties/new", :formats => [:html], :handlers => [:erb]) %>');
 $("#new_property_link").parent().hide();

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

@@ -24,7 +24,7 @@
   </thead>
   <tbody>
     <% @prototypes.each do |prototype| %>
-      <tr id="<%= dom_id prototype %>" data-hook="prototypes_row">
+      <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
         <td><%= prototype.name %></td>
         <td class="actions">
           <%= link_to_edit(prototype, :class => 'admin_edit_prototype') %>

data/app/views/spree/admin/prototypes/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new.html.erb") %>');
+$("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
 $("#new_prototype_link").parent().hide();

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

@@ -0,0 +1,42 @@
+<% if @prototype.option_types.present? %>
+  <h2>Variants</h2>
+
+  <ul class="product-prototype-options">
+    <% @prototype.option_types.each do |ot| %>
+      <li class="option-type-field">
+        <b>
+          <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
+          <%= label_tag "option_type_#{ot.id}", ot.presentation %>
+        </b>      
+        <ul class="option-type-values">
+        <% ot.option_values.each do |ov| %>
+          <li>
+            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
+            <%= label_tag "option_value_#{ov.id}", ov.presentation %>
+          </li>
+        <% end %>
+        </ul>
+      </li>
+    <% end %>
+  </ul>
+
+  <script type="text/javascript">
+  //<![CDATA[
+    (function($){
+
+      $("input.option-type").change(function() {
+        $(this).parents("li").find("input.option-value").attr("checked", this.checked);
+      });
+
+      $("input.option-value").change(function() {
+        var any_checked = false;
+        $(this).parents(".option-type-values").find("input.option-value").each(function(i, el) {
+          any_checked = any_checked || el.checked;
+        });
+        $(this).parents(".option-type-field").find("input.option-type").attr("checked", any_checked);
+      });
+
+    })(jQuery);
+  //]]>
+  </script>
+<% end %>

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

@@ -20,7 +20,7 @@
     <th></th>
   </tr>
   <% @return_authorizations.each do |return_authorization| %>
-    <tr id="<%= dom_id(return_authorization) %>" data-hook="rma_row">
+    <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
       <td><%= return_authorization.number %></td>
       <td><%= t(return_authorization.state.downcase) %></td>
       <td><%= number_to_currency return_authorization.amount %></td>

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

@@ -5,7 +5,7 @@
         <%= name %>
         <span class="right">
           <% if use_billing %>
-            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> 
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %> 
             <%= label_tag 'order[use_billing]', t(:use_billing_address) %>
           <% end %>
         </span>

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

@@ -2,8 +2,8 @@
   <legend><%= t(:calculator) %></legend>
   <div id="preference-settings" data-hook>
     <p>
-      <%= f.label(:calc_type, t(:calculator), :for => 'calc-type') %>
-      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc-type'}) %>
+      <%= f.label(:calculator_type, t(:calculator), :for => 'calc_type') %>
+      <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, :id => 'calc_type') %>
     </p>
     <% if !@object.new_record? %>
       <div class="calculator-settings">

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

@@ -5,9 +5,9 @@
 
 <%= javascript_tag do %>
   ajax_urls = <%== {
-    :product_search_json       => spree.admin_products_path(:format => 'json'),
-    :product_search_basic_json => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
-    :user_search_json          => spree.admin_users_path(:format => 'json', :limit => 10)
+    :product_search_json       => spree.admin_products_url(:format => 'json'),
+    :product_search_basic_json => spree.admin_products_url(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search_basic_json    => spree.admin_users_url(:format => 'json', :json_format => 'basic', :limit => 10)
   }.to_json %>;
 
   strings = <%==

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

@@ -9,7 +9,7 @@
 
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
-        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %></td>
         <td class="price"><%= number_to_currency item.price %></td>
         <td class="qty"><%= item.quantity %></td>
         <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>

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

@@ -1,13 +1,13 @@
-<h1><%= t(:order) + " #{@order.number}" %></h1>
+<h1><%= t(:order) %> <%= @order.number %></h1>
 
 <% content_for :sidebar do %>
   <div id="order_tab_summary" data-hook>
-    <h3 id="order_number" data-hook><%= "#{t(:order)} ##{@order.number} " %></h3>
-    <h5 id="order_status" data-hook><%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %></h5>
-    <h5 id="order_total" data-hook><%= "#{t(:total)}: #{number_to_currency @order.total}" %></h5>
+    <h3 id="order_number" data-hook><%= t(:order) %> #<%= @order.number%></h3>
+    <h5 id="order_status" data-hook><%= t(:status) %>: <%= t(@order.state, :scope => :order_state) %></h5>
+    <h5 id="order_total" data-hook><%= t(:total) %>: <%= number_to_currency @order.total %></h5>
     <% if @order.completed? %>
-      <h5 id="shipment_status"><%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}" %></h5>
-      <h5 id="payment_status"><%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}" %></h5>
+      <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></h5>
+      <h5 id="payment_status"><%= t(:payment) %>: <%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></h5>
     <% end %>
     <br class="clear" />
   </div>

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

@@ -4,6 +4,5 @@
     <%= tab :option_types, :match_path => '/option_types' %>
     <%= tab :properties %>
     <%= tab :prototypes %>
-    <%= tab :product_groups, :match_path => '/product_groups', :css_class => 'last' %>
   </ul>
 <% end %>

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

@@ -1,12 +1,12 @@
-<%= form_for @search, :url => sales_total_admin_reports_path  do |s| %>
+<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
     <%= label_tag nil, t(:date_range) %><br />
     <div class="date-range-filter">
       <div class="left sub-field">
-        <%= s.text_field :created_at_greater_than, :class => 'datepicker' %><br />
+        <%= s.text_field :created_at_gt, :class => 'datepicker' %><br />
         <%= label_tag nil, t(:start), :class => 'sub' %>
       </div>
       <div class="right sub-field">
-        <%= s.text_field :created_at_less_than, :class => 'datepicker' %><br />
+        <%= s.text_field :created_at_lt, :class => 'datepicker' %><br />
         <%= label_tag nil, t(:stop) %>
       </div>
     </div>

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

@@ -1,6 +1,6 @@
 <%= tab :overview, :route => :admin %>
 <%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations %>
-<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :product_groups, :taxons %>
+<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
 <%= tab :reports %>
 <%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
 <%= tab :users %>

data/app/views/spree/admin/shared/_update_order_state.js

@@ -1,6 +1,7 @@
-$('#order_tab_summary h5#order_status').html('<%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %>');
-$('#order_tab_summary h5#order_total').html('<%= "#{t(:total)}: #{number_to_currency @order.total}" %>');
+$('#order_tab_summary h5#order_status').html('<%= j t(:status) %>: <%= j t(@order.state, :scope => :order_state) %>');
+$('#order_tab_summary h5#order_total').html('<%= j t(:total) %>: <%= j number_to_currency(@order.total) %>');
+
 <% if @order.completed? %>
-$('#order_tab_summary h5#payment_status').html('<%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}" %>');
-$('#order_tab_summary h5#shipment_status').html('<%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}" %>');
+  $('#order_tab_summary h5#payment_status').html('<%= j t(:payment) %>: <%= j t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>');
+  $('#order_tab_summary h5#shipment_status').html('<%= j t(:shipment) %>: <%= j t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %>');
 <% end %>

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

@@ -20,7 +20,7 @@
     </th>
   </tr>
   <% @shipments.each do |shipment| %>
-    <tr id="<%= dom_id shipment %>" data-hook="admin_shipments_index_rows">
+    <tr id="<%= spree_dom_id shipment %>" data-hook="admin_shipments_index_rows">
       <td><%= shipment.number %></td>
       <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
       <td><%= number_to_currency shipment.cost %></td>

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

@@ -17,7 +17,7 @@
   </thead>
   <tbody>
     <% @shipping_categories.each do |shipping_category|%>
-    <tr id="<%= dom_id shipping_category %>" data-hook="category_row">
+    <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
       <td style="width:350px;"><%= shipping_category.name %></td>
       <td>
         <%= link_to_edit shipping_category %> &nbsp;

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

@@ -23,7 +23,7 @@
   </thead>
   <tbody>
     <% @shipping_methods.each do |shipping_method|%>
-      <tr id="<%= dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
+      <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
         <td><%= shipping_method.name %></td>
         <td><%= shipping_method.zone.name if shipping_method.zone %></td>
         <td><%= shipping_method.calculator.description %></td>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -11,7 +11,7 @@
          @edit_url = admin_country_state_path(@country, state)
          @delete_url = admin_country_state_path(@country, state)
     %>
-      <tr id="<%= dom_id state %>" data-hook="states_row">
+      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
         <td><%= state.name %></td>
         <td><%= state.abbr %></td>
         <td class="actions">

data/app/views/spree/admin/states/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_state").html("<%= escape_javascript(render :template => 'spree/admin/states/new.html.erb') %>");
+$("#new_state").html("<%= escape_javascript(render :template => 'spree/admin/states/new', :formats => [:html], :handlers => [:erb]) %>");
 $("#new_state_link").parent().hide();

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

@@ -26,7 +26,7 @@
          @edit_url = edit_admin_tax_category_path(tax_category)
          @delete_url = admin_tax_category_path(tax_category)
     %>
-      <tr id="<%= dom_id tax_category %>" data-hook="tax_row">
+      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.description %></td>
         <td><%= tax_category.is_default.to_s.titleize %></td>
@@ -36,7 +36,7 @@
       </tr>
     <% end %>
     <% if @tax_categories.empty? %>
-      <tr data-hook="tax_none"><td colspan="3"><%= t(:none) %></td></tr>
+      <tr data-hook="tax_none"><td colspan="4"><%= t(:none) %></td></tr>
     <% end %>
   </tbody>
 </table>

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

@@ -20,9 +20,9 @@
   </thead>
   <tbody>
     <% @tax_rates.each do |tax_rate|%>
-    <tr id="<%= dom_id tax_rate %>" data-hook="rate_row">
+    <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
       <td><%=tax_rate.zone.name %></td>
-      <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
+      <td><%=tax_rate.tax_category.try(:name) || "N/A" %></td>
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.included_in_price %></td>
       <td><%=tax_rate.calculator.to_s %></td>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -4,7 +4,7 @@
     <th></th>
   </tr>
 <% @taxonomies.each do |taxonomy| %>
-  <tr id="<%= dom_id taxonomy %>" data-hook="taxonomies_row">
+  <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
     <td>
       <%= taxonomy.name %>
     </td>

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

@@ -6,7 +6,7 @@
   <tr data-hook="environment">
     <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:tracker, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
+      <%= collection_select(:tracker, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
     </td>
   </tr>
   <tr data-hook="active">

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

@@ -22,7 +22,7 @@
   </thead>
   <tbody>
     <% @trackers.each do |tracker|%>
-      <tr id="<%= dom_id tracker %>" data-hook="admin_trackers_index_rows">
+      <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows">
         <td><%= tracker.analytics_id %></td>
         <td><%= tracker.environment.to_s.titleize %></td>
         <td><%= tracker.active ? t(:yes) : t(:no) %></td>

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

@@ -16,19 +16,4 @@
     <%= f.password_field :password_confirmation %>
     <%= f.error_message_on :password_confirmation %>
   <% end %>
-</div>
-
-
-<% if @user.respond_to?(:roles) %>
-  <div data-hook="admin_user_form_roles">
-    <p>
-      <%= label_tag nil, t(:roles) %><br />
-      <% @roles.each do |role| %>
-        <label class="sub">
-          <%= check_box_tag "user[role][#{role.name}]", 1, @user.has_role?(role.name) %>
-          <%= role.name %>
-        </label> &nbsp;
-      <% end %>
-    </p>
-  </div>
-<% end %>
+</div>

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

@@ -18,7 +18,7 @@
   </thead>
   <tbody>
     <% @users.each do |user|%>
-      <tr id="<%= dom_id user %>" data-hook="admin_users_index_rows">
+      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
         <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
         <td data-hook="admin_users_index_row_actions">
           <%= link_to_edit user, :class => 'edit' %> &nbsp;
@@ -35,11 +35,10 @@
 <% content_for :sidebar do %>
   <div class="box" data-hook="admin_users_index_search">
     <h3><%= t(:search) %></h3>
-    <% @search = Spree::User.search %>
-    <%= form_for [:admin, @search] do |f| %>
+    <%= search_form_for [:admin, @search] do |f| %>
       <p>
         <%= t(:email) %><br />
-        <%= f.text_field :email_contains, :size =>18 %>
+        <%= f.text_field :email_cont, :size =>18 %>
       </p>
       <div data-hook="admin_users_index_search_buttons">
         <p><%= button t(:search) %></p>

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

@@ -16,9 +16,9 @@
   <% @variants.each do |variant| %>
     <!-- you can skip variant with no options: that's just the default variant that all products have -->
     <% next if variant.option_values.empty? %>
-    <tr id="spree_variant_<%= variant.id %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
+    <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
       <td><span class="handle"></span> <%= variant.options_text %></td>
-      <td><%= variant.price %></td>
+      <td><%= number_to_currency variant.price %></td>
       <td><%= variant.sku %></td>
       <% Spree::Variant.additional_fields.select { |f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
         <td><%= variant[field[:name].gsub(" ", "_").downcase] %></td>

data/app/views/spree/admin/variants/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_variant").html('<%= escape_javascript(render :template => 'spree/admin/variants/new.html.erb') %>');
+$("#new_variant").html('<%= escape_javascript(render :template => 'spree/admin/variants/new', :formats => [:html], :handlers => [:erb]) %>');
 $("#new_var_link").hide();

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

@@ -24,7 +24,7 @@
   </thead>
   <tbody>
     <% @zones.each do |zone| %>
-      <tr id="<%= dom_id zone %>" data-hook="zones_row">
+      <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
         <td><%=zone.name %></td>
         <td><%=zone.description %></td>
         <td><%=zone.default_tax %></td>

data/app/views/spree/checkout/_address.html.erb

@@ -86,7 +86,7 @@
   <%= form.fields_for :ship_address do |ship_form| %>
     <legend><%= t(:shipping_address) %></legend>
     <p class="field checkbox" data-hook="use_billing">
-      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> 
+      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %> 
       <%= label_tag :order_use_billing, t(:use_billing_address), :id => 'use_billing' %>
     </p>
     <div class="inner" data-hook="shipping_inner">