spree 0.8.5 → 0.9.0

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

@@ -21,7 +21,7 @@
   </thead>
   <tbody>
     <% @tax_categories.each do |tax_category|%>
-      <tr>
+      <tr id="<%= dom_id tax_category %>">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.description %></td>
         <td class="actions">

data/app/views/admin/tax_rates/_form.html.erb

@@ -0,0 +1,16 @@
+<table>
+  <tr>
+    <td><%=t("zone")%>:</td>
+    <td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
+  </tr>
+  <tr>
+    <td><%=t("tax_category")%>:</td>
+    <td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
+  </tr>
+  <tr>
+    <td><%=t("rate")%>:</td>
+    <td><%= f.text_field :amount %></td>
+  </tr>  
+</table>
+
+<%= render "admin/shared/calculator_fields", :f => f %>

data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/edit.html.erb

@@ -1,6 +1,6 @@
-<h1><%= t("ext_tax_calculator_editing_tax_rate") %></h1>
+<h1><%= t("editing_tax_rate") %></h1>
 <%= error_messages_for :tax_rate %>
-<% form_for(:tax_rate, :url => object_url, :html => { :method => :put }) do |f| %>
+<% form_for(@tax_rate, :url => object_url, :html => { :method => :put }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>
     <%=submit_tag t("update")%>

data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/index.html.erb

@@ -6,22 +6,22 @@
   </ul>
   <br class='clear' />
 </div>
-<h1><%=t("ext_tax_calculator_tax_rates") %></h1>
+<h1><%=t("tax_rates") %></h1>
 <table class="index">
   <thead>                        
     <th><%=t("zone")%></th>
     <th><%=t("category")%></th>
     <th><%=t("amount")%></th>
-    <th><%=t("tax_type")%></th>
+    <th><%=t("calculator")%></th>
     <th><%=t("action")%></th>
   </thead>
   <tbody>
     <% @tax_rates.each do |tax_rate|%>
-    <tr>
+    <tr id="<%= dom_id tax_rate %>">
       <td><%=tax_rate.zone.name %></td>
       <td><%=tax_rate.tax_category.name %></td>
       <td><%=tax_rate.amount %></td>
-      <td><%=TaxRate::TaxType.from_value tax_rate.tax_type %></td>
+      <td><%=tax_rate.calculator.to_s %></td>
       <td>
       	<%= link_to_edit tax_rate %> &nbsp;
       	<%= link_to_delete tax_rate %>

data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/edit.html.erb

@@ -5,13 +5,13 @@
 <% form_tag(admin_tax_settings_path, :method => :put) do -%>
 
   <p>
-	<label><%= t("show_price_incl_vat") %></label>
+	<label><%= t("show_price_inc_vat") %></label>
     <input name="preferences[show_price_inc_vat]" type="hidden" value="0" />
-	<%= check_box_tag('preferences[show_price_inc_vat]', "1",  Spree::Tax::Config[:show_price_inc_vat]) %>
+	<%= check_box_tag('preferences[show_price_inc_vat]', "1",  Spree::Config[:show_price_inc_vat]) %>
   </p>
 
   <p class="form-buttons">
     <%= button t('update') %> 
-    or <%= link_to t("cancel"), admin_tax_settings_url %>
+    <%= t("or") %> <%= link_to t("cancel"), admin_tax_settings_url %>
   </p>
 <% end -%>

data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/show.html.erb

@@ -5,7 +5,7 @@
 <table>
   <tr>
     <th scope="row"><%= t("show_price_inc_vat") %>:</th> 
-    <td><%=  Spree::Tax::Config[:show_price_inc_vat] %></td>
+    <td><%=  Spree::Config[:show_price_inc_vat] %></td>
   </tr>
 </table>
 

data/app/views/admin/taxonomies/_js_head.html.erb

@@ -0,0 +1,13 @@
+<% content_for :head do %>
+	<%= stylesheet_link_tag '/javascripts/jsTree/source/tree_component.css' %>
+	<%= javascript_include_tag 'jsTree/source/_lib.js' %>
+	<%= javascript_include_tag 'jsTree/source/tree_component.js' %>
+ 
+  <%= javascript_tag "var taxonomy_id = #{@taxonomy.id}; 
+    var loading = '#{t('loading')}'; 
+    var new_taxon = '#{t('new_taxon')}';
+    var server_error = '#{t('server_error')}';
+    var taxonomy_tree_error = '#{t('taxonomy_tree_error')}';" 
+  %> 
+  <%= javascript_include_tag 'taxonomy' %>
+<% end %>

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

@@ -4,9 +4,9 @@
     <th></th>
   </tr>
 <% for taxonomy in @taxonomies %>
-  <tr>
-	<td>
-	  <%= taxonomy.name %>
+  <tr id="<%= dom_id taxonomy %>">
+	  <td>
+	    <%= taxonomy.name %>
     </td>
     <td class="actions">
       <%= link_to_edit taxonomy.id %> &nbsp; <%= link_to_delete taxonomy %>

data/app/views/admin/taxonomies/_taxon.html.erb

@@ -0,0 +1,12 @@
+<% if taxon.children.length != 0 %>
+  <ul>
+    <% taxon.children.each do |child| %>
+      <li id="<%= child.id %>" rel="taxon">
+        <a href="#"><%= child.name %></a>
+        <% if child.children.length > 0 %>
+          <%= render :partial => "taxon", :locals => {:taxon => child} %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/admin/taxonomies/edit.html.erb

@@ -1,20 +1,30 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<%= render :partial => "yui_head" %>
+<%= render :partial => "js_head" %>
 
-<h1>Edit Taxonomy</h1>
+<h1><%= t("taxonomy_edit")%></h1>
+
+<p id="ajax_error" class="errorExplanation" style="display:none;"></p>
 
 <% form_for(:taxon, :url => admin_taxonomy_url, :html => { :method => :put }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
-
 	  <div>
 	    <label><%= t("tree")%></label><br />
-    	<%= yui_tree_helper @taxonomy %>
+      <div id="taxonomy_tree" class="tree">
+        <ul>
+          <li id="<%= @taxonomy.root.id %>" class="open" rel="root">
+            <a href="#"><%= @taxonomy.root.name %></a>
+            <%= render :partial => "taxon", :locals => {:taxon => @taxonomy.root} %>
+          </li>
+        </ul>
+      </div>
   	</div>
-    <p><small>* Right click a child in the tree to access the menu for adding, deleting or sorting a child.</small></p>
+  	<p id="progress" style="display:none;">
+      <img src="/images/spinner.gif?1234540747" alt="Spinner" style="vertical-align:bottom;"/> <%= t('updating') %>..
+    </p>
+    <p><br/><small><%= t("taxonomy_tree_instruction")%></small></p>
 
 	<p class="form-buttons">
-	  <%= button t("update") %> or <%= link_to t("cancel"), admin_taxonomies_path %>
+	  <%= button t("update") %> <%= t("or") %> <%= link_to t("cancel"), admin_taxonomies_path %>
   </p>
-
 <% end %>

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

@@ -13,12 +13,12 @@
 
 <table class="index">
   <thead>
-    <th><%= order_by_link :email, :text => t("user") %></th>
+    <th><%= order @search, :by => :email, :as => t("user") %></th>
     <th><%= t("action") %></th>
   </thead>
   <tbody>
     <%- @collection.each do |user|%>
-    <tr>
+    <tr id="<%= dom_id user %>">
       <td width="350px"><%=link_to user.email, object_url(user) %></td>
       <td>
       	<%= link_to_edit user %> &nbsp;
@@ -29,22 +29,20 @@
   </tbody>
 </table>
 
-<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
+<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
 
 
 <% content_for :sidebar do %>
 
-  <% form_for [:admin, @search] do |f| %>
+  <% form_for @search do |f| %>
     <div class="box">
       <h3><%= t(:search) %></h3>
-    <% f.fields_for @search.conditions do |user| %>
       <p>
         <%= t("email") %><br />
-        <%= user.text_field :lower_of_email, :size=>18 %>
+        <%= f.text_field :email_contains, :size=>18 %>
       </p>
       <p><%= button t("search") %></p>
-  	<% end %>
-  	</div>
+    </div>
   <% end %>
 
-<% end %>
+<% end %>

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

@@ -32,7 +32,7 @@
   </div>
   <div class="yui-u">
 
-    <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
+    <% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
       <%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
     <% end %>
 

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

@@ -16,7 +16,7 @@
   <% @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 <%= 'style="color:red;"' unless variant.deleted_at.nil? %>>
+    <tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' unless variant.deleted_at.nil? %>>
     	<td><%= variant_options variant %></td>
     	<td><%= variant.price %></td>
       <td><%= variant.sku %></td>
@@ -31,7 +31,7 @@
 	    </td>        
     </tr>
   <% end %>
-  <% unless @product.variants? %>
+  <% unless @product.has_variants? %>
     <tr><td colspan="5"><%= t("none") %>.</td></tr>
   <% end %>
 </table>

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

@@ -14,14 +14,14 @@
 <table class="index">
   <thead>
     <tr>
-      <th><%= order_by_link :name, :text => t("name") %></th>
-      <th><%= order_by_link :description, :text => t("description") %></th>
+      <th><%= order @search, :by => :name,        :as => t("name") %></th>
+      <th><%= order @search, :by => :description, :as => t("description") %></th>
       <th></th>
     </tr>
   </thead>
   <tbody>
     <% @collection.each do |zone| %>
-      <tr>
+      <tr id="<%= dom_id zone %>">
         <td><%=zone.name %></td>
         <td><%=zone.description %></td>
         <td class="actions">
@@ -36,5 +36,5 @@
   </tbody>
 </table>
 
-<%= page_links(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") if @search.page_count > 1 %>
+<%= will_paginate(:prev => "&#171; #{t('previous')}", :next => "#{t('next')} &#187;") %>
 

data/app/views/checkouts/_billing.html.erb

@@ -0,0 +1,66 @@
+<% checkout_form.fields_for :bill_address do |bill_form| %>
+  <h2><%= t("billing_address")%></h2>
+  <div class="inner">
+    <p id="bfname">
+      <label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+      <%= bill_form.text_field :firstname, :class => 'required' -%><span class="req">*</span>
+    </p>
+    <p id="blname">
+      <label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+      <%= bill_form.text_field :lastname, :class => 'required' -%><span class="req">*</span>
+    </p>
+    <p id="baddress">
+      <label for="<%= t("street_address") %>"><%= t("street_address") %></label>
+      <%= bill_form.text_field :address1, :class => 'required' -%><span class="req">*</span>
+    </p>
+    <p id="baddress2">
+      <label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
+      <%= bill_form.text_field :address2 %>
+    </p>
+    <p id="bcity">
+      <label for="<%= t("city") %>"><%= t("city") %></label>
+      <%= bill_form.text_field :city, :class => 'required' -%><span class="req">*</span>
+    </p>                        
+    <% if Spree::Config[:address_requires_state] %>
+      <p>
+        <label for="<%= t("state") %>"><%= t("state") %></label>
+        <span id="bstate">
+          <% if @checkout.bill_address.country.states.empty? %>
+            <%= bill_form.text_field :state_name, :class => 'required' -%>
+          <% else %>
+            <%= collection_select("checkout[bill_address_attributes]", 
+                                  :state_id, 
+                                  @states, 
+                                  :id, 
+                                  :name, 
+                                  {:include_blank => true}, 
+                                  {:style=> 'width:150px;'}) %>
+          <% end %>
+        </span>
+        <span class="req">*</span>
+      </p>
+    <% end %>
+    <p id="bzip">
+      <label for="<%= t("zip") %>"><%= t("zip") %></label>
+      <%= bill_form.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
+    </p>    
+    <p id="bcountry">
+      <label for="<%= t("country") %>"><%= t("country") %></label>
+      <span id="bcountry"><%= bill_form.collection_select :country_id, @countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+    </p>
+    <p id="bphone">
+      <label for="<%= t("phone") %>"><%= t("phone") %></label>
+      <%= bill_form.text_field :phone, :class => 'required' -%><span class="req">*</span>
+        </p>
+        <% if Spree::Config[:alternative_billing_phone] %>
+          <p id="baltphone">
+            <label for=""><%= t("alternative_phone") %></label>
+            <%= bill_form.text_field :alternative_phone -%>
+          </p>
+        <% end %>
+
+    <div class="form-buttons">
+      <input id="continue_billing" type="button" class="button primary" value="<%=t("continue")%>"/>
+    </div>
+  </div>
+<% end %>

data/app/views/checkouts/_confirmation.html.erb

@@ -0,0 +1,11 @@
+<h2><%= t("confirm") %></h2>
+<div class="inner">         
+	<input id="final_answer" name="final_answer" type="hidden">
+	<div id="bdisplay"><h3><%= t("billing_address")%></h3> <div><img src="/images/ajax_loader.gif" id="bconfirm_loader" /></div></div>
+	<div id="sdisplay"><h3><%= t("shipping_address")%></h3> <div><img src="/images/ajax_loader.gif" id="sconfirm_loader" /></div></div>
+	<div class="clear"></div>
+	<%= render :partial => 'shared/order_details', :locals => {:order => @order} -%>      
+  <div class="form-buttons">
+    <%= submit_tag t('place_order'), {:id => "continue_confirmation", :class => "button primary"}  %>
+  </div>
+</div>

data/app/views/checkouts/_form.html.erb

@@ -0,0 +1,20 @@
+<% content_for :head do %>
+  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> 
+  <script type="text/javascript">
+    var regions = new Array(<%= checkout_steps.collect {|step| "\'#{step}\'"}.join(",") %>);
+  </script>
+<% end %>                 
+
+<%= error_messages_for :checkout %>
+
+<% checkout_steps.each do |step| %>
+  <div id="<%=step%>" class="checkout disabled">
+    <%= render step, :checkout_form => checkout_form %>  
+  </div>
+<% end %>
+
+<input type="hidden" id="hidden_bcountry" name="hidden_bcountry" value="<%= @checkout.bill_address.country_id %>" />
+<input type="hidden" id="hidden_bstate" name="hidden_bstate" value="<%= @checkout.bill_address.country.states.empty? ? @checkout.bill_address.state_name : @checkout.bill_address.state_id %>" />
+
+<input type="hidden" id="hidden_scountry" name="hidden_scountry" value="<%= @checkout.shipment.address.country_id %>" />
+<input type="hidden" id="hidden_sstate" name="hidden_sstate" value="<%= @checkout.shipment.address.country.states.empty? ? @checkout.shipment.address.state_name : @checkout.shipment.address.state_id %>" />

data/app/views/checkouts/_payment.html.erb

@@ -0,0 +1,45 @@
+<% checkout_form.fields_for :creditcard do |creditcard_form| %> 
+  <h2><%= t("payment_information") %></h2>
+  <div class="inner">
+  	<p>
+  		<%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
+  	</p>
+  	<p>
+  		<label for=""><%= t("card_number") %></label>
+		<%= creditcard_form.text_field :number, :size=> 19, :max_length => 19, :class => 'required' -%><span class="req">*</span>
+                &nbsp; 
+                <span id="card_type" style="display:none;">
+                  ( <span id="looks_like" ><%= t('card_type_is') %> <span id="type"></span></span>
+                    <span id="unrecognized"><%= t('unrecognized_card_type') %></span>
+                  )
+                </span>
+  	</p>
+  	<p id="maestro_extra" style="display: none;">
+		<label for=""><%= t("maestro_or_solo_cards") %> </label>
+		<%= t("issue_number") %>
+		<%= creditcard_form.text_field :issue_number, {:style => 'width:40px', :title => t('enter_exactly_as_shown_on_card') + ', e.g. 2, 01.' } -%>
+		&nbsp;<strong>OR</strong>&nbsp;
+		<%= t('start_date') %>
+		<%= select_month(@date, :prefix => 'checkout[creditcard]', :field_name => 'start_month', :use_month_numbers => true, :include_blank => true) -%>
+		<%= select_year(@date, :prefix => 'checkout[creditcard]', :field_name => 'start_year', :start_year => Date.today.year - 15, :end_year => Date.today.year, :include_blank => true) -%>
+	</p>
+  	<p>
+  		<label for=""><%= t("expiration") %></label>  		
+  		<%= select_month(Date.today, :prefix => 'checkout[creditcard]', :field_name => 'month', :use_month_numbers => true, :class => 'required') -%>
+  		<%= select_year(Date.today, :prefix => 'checkout[creditcard]', :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') -%>
+  		<span class="req">*</span>
+  	</p>
+  	<p>
+  		<label for=""><%= t("card_code") %></label>
+  		<%= creditcard_form.text_field :verification_value, {:style => 'width:40px', :class => 'required'} -%><span class="req">*</span>
+  		<a href="" onclick="window.open('/content/cvv','mywin','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
+  			(<%= t("whats_this") %>)
+  		</a>
+  	</p>
+  	<div class="form-buttons">
+  		<input id="continue_payment" type="button" class="button primary" value="<%=t("continue")%>"/>
+  	</div>
+  	<%= creditcard_form.hidden_field :first_name -%>
+    <%= creditcard_form.hidden_field :last_name -%>  	
+  </div>    
+<% end %>

data/app/views/{orders → checkouts}/_registration.html.erb

@@ -5,15 +5,15 @@
     <h3><%= t("register_or_guest") %></h3>    
     <p>
       <input id="choose_register" type="radio" name="choose_registration" value="register" />
-      <label for="<%= t("register") %>"><%= t("register") %></label>
+      <label for="choose_register"><%= t("register") %></label>
     </p>    	 
     <p>
       <input id="choose_existing" type="radio" name="choose_registration" value="existing"/>
-      <label for="<%= t("existing_customer") %>"><%= t("existing_customer") %></label>
+      <label for="choose_existing"><%= t("existing_customer") %></label>
     </p>    	 
     <p>
       <input id="choose_guest" type="radio" name="choose_registration" value="guest"/>
-      <label for="<%= t("proceed_as_guest") %>"><%= t("proceed_as_guest") %></label>
+      <label for="choose_guest"><%= t("proceed_as_guest") %></label>
     </p>    	 
   </div>
   <div id="registration_input">
@@ -49,7 +49,7 @@
         <h3><%= t("guest_user_account") %></h3>
         <p>
           <label for="<%= t("email") %>"><%= t("email") %></label> 
-          <%= order_form.text_field :email, :class => 'required' -%><span class="req">*</span>
+          <%= checkout_form.text_field :email, :class => 'required' -%><span class="req">*</span>
         </p>
       </div>
     </div>