spree 0.8.5 → 0.9.0

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

@@ -0,0 +1,68 @@
+<% checkout_form.fields_for :shipment do |shipment| %>     
+  <% shipment.fields_for :address do |address| %>
+    <h2><%= t("shipping_address")%></h2>
+    <div class="inner">
+    	<p><label for="checkout_same_address" id="use_billing"><%= t("use_billing_address") %></label><input id="checkout_same_address" name="checkout_same_address" type="checkbox" /></p> 
+    	<p id="sfname">
+    		<label for="<%= t("first_name") %>"><%= t("first_name") %></label>
+    		<%= address.text_field :firstname, :class => 'required' -%><span class="req">*</span>
+    	</p>
+    	<p id="slname">
+    		<label for="<%= t("last_name") %>"><%= t("last_name") %></label>
+    		<%= address.text_field :lastname, :class => 'required' -%><span class="req">*</span>
+    	</p>
+    	<p id="saddress">
+    		<label for="<%= t("street_address") %>"><%= t("street_address") %></label>
+    		<%= address.text_field :address1, :class => 'required' -%><span class="req">*</span>
+    	</p>
+    	<p id="saddress2">
+    		<label for="<%= t("street_address_2") %>"><%= t("street_address_2") %></label>
+    		<%= address.text_field :address2 %>
+    	</p>
+    	<p id="scity">
+    		<label for="<%= t("city") %>"><%= t("city") %></label>
+    		<%= address.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="sstate">
+              <% if @checkout.shipment.address.state.present? %>
+    		<%= collection_select("checkout[shipment_attributes][address_attributes]", 
+                                      :state_id, 
+                                      @states, 
+                                      :id, 
+                                      :name, 
+                                      {:include_blank => true}, 
+                                      {:style=> 'width:150px;'}) %>
+              <% else %>
+                <%= address.text_field :state_name, :class => 'required' -%>
+              <% end %>
+            </span>
+            <span class="req">*</span>
+          </p>
+        <% end %>
+    	<p id="szip">
+    		<label for="<%=t ("zip") %>"><%= t("zip") %></label>
+    		<%= address.text_field :zipcode, :class => 'required' -%><span class="req">*</span>
+    	</p>
+    	<p id="scountry">
+    		<label for="<%= t("country") %>"><%= t("country") %></label>
+    		<span id="scountry"><%= address.collection_select :country_id, @shipping_countries, :id, :name, {}, {:style => 'width:150px;', :class => 'required'} %></span>
+    	</p>
+    	<p id="sphone">
+    		<label for="<%= t("phone") %>"><%= t("phone") %></label>
+    		<%= address.text_field :phone, :class => 'required' -%><span class="req">*</span>
+    	</p>
+    	<% if Spree::Config[:alternative_shipping_phone] %>
+            <p id="saltphone">
+              <label for=""><%= t("alternative_phone") %></label>
+              <%= address.text_field :alternative_phone -%>
+            </p>
+          <% end %>
+    	<div class="form-buttons">
+    	  <input id="continue_shipping" type="button" class="button primary" value="<%=t("continue")%>"/>
+    	</div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<h2><%= t("shipping_method") %></h2>
+<% checkout_form.fields_for :shipment do |shipment| %>     
+  <div class="inner">
+    <div id="methods"></div>
+    <div class="error">
+      <%= t('unable_ship_method') %>
+    </div>
+    <% if Spree::Config[:shipping_instructions] %>
+      <p id="minstrs">
+        <label for=""><%= t("shipping_instructions") %></label>
+        <%= checkout_form.text_area :special_instructions, :cols => 40, :rows => 7 -%>
+      </p>
+    <% end %>
+
+    <div class="form-buttons">
+      <input id="continue_shipping_method" type="button" class="button primary" value="<%=t("continue")%>"/>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,36 @@
+<h3><%= t(:order_summary) %></h3>                                                                                    
+<table>
+  <tbody>
+    <tr>
+      <td><strong><%= t('item_total') %>:</strong></td>
+      <td><strong><%= number_to_currency @order.item_total %></strong></td>
+    </tr> 
+    <tbody id="summary-order-charges">
+      <% @order.non_zero_charges.each do |charge| %>
+        <tr>
+          <td><%= charge.description %>: </td>
+          <td><%= number_to_currency charge.amount -%></td>
+        </tr>
+      <% end %>  
+    </tbody>
+    <tbody id="summary-order-credits">
+      <% @order.credits.each do |credit| %>
+        <tr>
+          <td><%= credit.description %>: </td>
+          <td>(<%= number_to_currency credit.amount %>)</td>
+        </tr>
+      <% end %>  
+    </tbody>
+    <tr>
+      <td><strong><%= t('order_total') %>:</strong></td>
+      <td><strong><span id='summary-order-total'><%= number_to_currency @order.total %></span></strong></td>
+    </tr>
+  </tbody>
+</table>
+<% form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>  
+  <label><%= t(:coupon_code) %></label>
+  <%= summary_form.text_field :coupon_code, :id => 'coupon-code', :size => 14 %>
+  <input id="post-summary" type="submit" style="display:none"/>
+  <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'coupon_busy_indicator' %>
+<% end %> 
+<div id="coupon-error"></div>

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

@@ -0,0 +1,13 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'checkout', '/states' %>
+<% end %>
+<div id="checkout">
+  <h1><%= t("checkout")%></h1>
+  <% form_for @checkout, :url => object_url, :html => { :method => :put, :id => 'checkout_form'} do |checkout_form| %>
+    <%= render 'form', :checkout_form => checkout_form %>    
+    <input id="post-final" type="submit" style="display:none"/>
+  <% end %>
+</div>
+<div id="checkout-summary">
+  <%= render 'summary' %>
+</div>  

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

@@ -0,0 +1,13 @@
+<% content_for :head do %>
+  <%= javascript_include_tag 'checkout', '/states' %>
+<% end %>
+<div id="checkout">
+  <h1><%= t("checkout")%></h1>
+  <% form_for @checkout, :url => object_url, :html => { :id => 'checkout_form'} do |checkout_form| %>
+    <%= render 'form', :checkout_form => checkout_form %>    
+    <input id="post-final" type="submit" style="display:none"/>
+  <% end %>
+</div>
+<div id="checkout-summary">
+  <%= render 'summary' %>
+</div>

data/app/views/layouts/admin.html.erb

@@ -8,12 +8,18 @@
   <%= stylesheet_link_tag 'admin/admin-reset', 'admin/grids', 'admin/admin-typography', 'admin/admin-forms', 'admin/admin-tables', 'admin/admin', :cache => 'admin-all' %>
 
   <%= javascript_include_tag :defaults %> <!-- TODO: Remove.  See Issue #320 -->
-  <%= javascript_include_tag 'jquery-1.3.2.min', 'spree', 'nested-attribute', 'zone', :cache => 'jquery-and-extras' %>
-
+  <%= javascript_include_tag 'jquery-1.3.2.min', 'spree', 'nested-attribute', 'zone', 'calculator', :cache => 'jquery-and-extras' %>
+  <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>   
+  <%= javascript_include_tag 'jquery.alerts/jquery.alerts.js' %>                                           
+  
+	<%= stylesheet_link_tag '/javascripts/jquery.alerts/jquery.alerts.css' %>
+	<%= stylesheet_link_tag '/javascripts/jquery.alerts/jquery.alerts.spree.css' %>
+	
+	<%= javascript_tag "jQuery.alerts.dialogClass = 'spree';" %> 
   <%= yield :head %>
 </head>
 <body class='yui-skin-sam admin'>
-<!--[if IE 7]>
+<!--[if lte IE 7]>
 <div id='IE7'>
 <![endif]-->
 <div id='wrapper'>
@@ -27,7 +33,8 @@
       <li><%= link_to t('store'), products_path %></li>
     </ul>
     <% end -%>      
-    <h1 class='logo'><%= link_to 'Administration', admin_path %></h1>
+    <h1 class='logo'><%= link_to t("administration"), admin_path %></h1>
+    <div id="progress"><%= image_tag 'progress.gif' %> <%= t('loading') %>...</div>
   </div>
     <div id="admin-menu">
       <ul>
@@ -37,6 +44,9 @@
         <%= tab :reports %>
         <%= tab :configurations, :general_settings, :mail_settings, :tax_categories, :zones, :states, :gateway_configurations, :inventory_settings, :taxonomies, :label => 'configuration' %>
         <%= tab :users %>
+        <% @extension_tabs.each do |etab| -%>
+          <%= tab etab[0], etab[1] %>
+        <% end -%>
       </ul>
       <br class="clear" />
     </div>
@@ -69,7 +79,7 @@
     </div>
 
     <div id="footer">
-      <p>Icons by <a href='http://pinvoke.com'>pInvoke</a></p>
+      <p><%= t("icons_by") %> <a href='http://pinvoke.com'>pInvoke</a></p>
     </div>
 
 </div>

data/app/views/layouts/application.html.erb

@@ -1,15 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <title>Spree</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- 
-  <%= stylesheet_link_tag 'compiled/screen' %>
- 
-  <%= javascript_include_tag 'jquery-1.3.2.min', 'jquery.validate.pack.js', :cache => 'jquery-and-plugins' %>
-  <%= meta_data_tags %> 
-  <%= yield :head %>
- 
+<%= render :partial => 'shared/head'%>
 </head>
 <%
 if @body_class.nil?
@@ -30,7 +22,7 @@ end
         <%= render 'shared/store_menu' %>
       <% end %>
     </ul>
-    <%= link_to image_tag('/images/admin/bg/spree_50.png'), root_path %> 
+	<%= logo %>
   </div>
   <div id="wrapper" class="container"> 
     <% if @content_for_sidebar %>
@@ -49,7 +41,7 @@ end
       <% end %>
       <%= yield %>
     </div>
-    <%= render :partial => 'shared/footer'%>    		
+    <%= render :partial => 'shared/footer'%>
   </div>
 </body>
 </html>

data/{vendor/plugins/resource_controller/test/app/views/layouts/application.rhtml → app/views/layouts/checkouts.html.erb}

@@ -4,14 +4,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Posts: <%= controller.action_name %></title>
+  <title>Checkouts: <%= controller.action_name %></title>
   <%= stylesheet_link_tag 'scaffold' %>
 </head>
 <body>
 
 <p style="color: green"><%= flash[:notice] %></p>
 
-<%= yield  %>
+<%= yield %>
 
 </body>
 </html>

data/app/views/order_mailer/cancel.html.erb

@@ -6,10 +6,11 @@ Your order has been CANCELED.  Please retain this cancellation information for y
 Order Summary [CANCELED]
 ============================================================
 <% for item in @order.line_items -%>
-<%=item.variant.sku %> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
+<%=item.variant.sku %> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end -%>      
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>
-Tax: <%= number_to_currency @order.tax_amount %>
-Shipping: <%= number_to_currency @order.ship_amount %>
+<% @order.charges.each do |charge| %>
+<%= "#{charge.description}: #{number_to_currency charge.amount}"%>
+<% end %>
 Order Total: <%= number_to_currency @order.total %>

data/app/views/order_mailer/confirm.html.erb

@@ -6,13 +6,14 @@ Please review and retain the following order information for your records.
 Order Summary
 ============================================================
 <% for item in @order.line_items -%>
-<%=item.variant.sku %> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
+<%=item.variant.sku %> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end -%>      
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>
-Tax: <%= number_to_currency @order.tax_amount %>
-Shipping: <%= number_to_currency @order.ship_amount %>
+<% @order.adjustments.each do |adjustment| %>
+<%= "#{adjustment.description}: #{number_to_currency adjustment.amount}"%>
+<% end %>
 Order Total: <%= number_to_currency @order.total %>
 
 
-Thank you for your business.
+Thank you for your business.

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

@@ -8,7 +8,10 @@
     </tr>
   </thead>
   <tbody id="line_items">
-		<%= f.render_associated_form(@order.line_items) %>
+    <% order_form.fields_for :line_items do |item_form| %>
+      <%= render 'line_item', :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form %>
+    <% end %>
+		
 		<tr id="none">
 		  <td colspan="5"><%= @order.line_items.empty? ? t("your_cart_is_empty.") : "" %></td>
 		</tr>

data/app/views/orders/_google_order.html.erb

@@ -10,8 +10,8 @@
   "<%= order.number %>",		//Order Number
   "",		//Affiliation
   "<%= order.total %>",		//Order total
-  "<%= order.tax_amount %>",		//Tax Amount
-  "<%= order.ship_amount %>",		//Ship Amount
+  "<%= order.tax_charges.sum(:amount).to_s %>",		//Tax Amount
+  "<%= order.shipping_charges.sum(:amount).to_s %>",		//Ship Amount
   "",		//City
   "",		//State
   ""		//Country

data/app/views/orders/_line_item.html.erb

@@ -1,7 +1,10 @@
-<% variant = line_item.variant -%>
 <tr class="<%= cycle('', 'alt') %>">
   <td>
-    <%= small_image(line_item.variant.product) %>
+    <% if variant.images.length == 0 %>
+      <%= small_image(variant.product) %>
+    <% else %>
+      <%=  image_tag variant.images.first.attachment.url(:small)   %>
+    <% end %>
   </td>
   <td>              
     <h4><%= link_to variant.product.name,  product_path(variant.product) %></h4>
@@ -12,7 +15,7 @@
     <%= product_price(line_item) %>
   </td>
   <td>
-    <%= f.text_field :quantity, :size => 3 %>
+    <%= item_form.text_field :quantity, :size => 3 %>
   </td>
   <td>
     <%= format_price(product_price(line_item, :format_as_currency => false) * line_item.quantity) unless line_item.quantity.nil? %>

data/app/views/orders/edit.html.erb

@@ -2,14 +2,14 @@
 
 <h1><%= t("shopping_cart")%></h1>
 
-<% form_for(:order, :url => object_url, :html => { :method => :put, :id => 'updatecart' }) do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
+<% form_for(@order, :url => object_url, :html => { :method => :put, :id => 'updatecart' }) do |order_form| %>
+  <%= render :partial => 'form', :locals => {:order_form => order_form} %>
   <% unless @order.line_items.empty? -%>
   <div id="subtotal">
     <h3><%= "#{t("subtotal")}: #{order_price(@order)}" %></h3>
     <div class="links">
       <%= link_to image_tag('/images/update.png') + t("update"), '#', :class => 'button checkout primary', :onclick => "$('form#updatecart').submit(); return false;" %>
-      <%= link_to image_tag('/images/checkout.png') + t("checkout"), checkout_order_url(@order), :class => 'button checkout primary' %>
+      <%= link_to image_tag('/images/checkout.png') + t("checkout"), edit_order_checkout_url(@order), :class => 'button checkout primary' %>
     </div>
   </div>
   <% end -%>

data/app/views/orders/new.html.erb

@@ -2,8 +2,8 @@
 
 <h1><%= t("shopping_cart")%></h1>
 
-<% form_for(:order, :url => object_url, :html => { :method => :put}) do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
+<% form_for(@order, :url => object_url, :html => { :method => :put}) do |order_form| %>
+  <%= render :partial => 'form', :locals => {:order_form => order_form} %>
 <% end %>
 
 <p><%=link_to t("continue_shopping"), products_path %></p>

data/app/views/products/_cart_form.html.erb

@@ -8,10 +8,9 @@
   </p>
   <% end %>
 
-  <% if @product.variants? %>
+  <% if @product.has_variants? %>
   <div id="product-variants">
     <h2><%= t('variants') %></h2>
-    <p>Quantity: <%= text_field_tag :quantity, 1 %></p>
     <ul>
       <%  has_checked = false
           @product.variants.active.each_with_index do |v,index|
@@ -27,20 +26,52 @@
             <% end %>
           </label>
         </li>
+        
+        <% content_for :head do %>
+          <script type="text/javascript">
+            jQuery(document).ready(function(){  
+
+              jQuery("#products_<%= @product.id %>_<%= v.id %>").click(function (event) { 
+                  jQuery("#variant-thumbnails").empty();
+                  
+                  jQuery("#variant-images").html('<%= t('images_for') %>: <%= v.options_text %>')
+                  
+                  if(images[<%= v.id %>].length > 0){
+                    <% v.images.each do |i| %>
+                       jQuery("#variant-thumbnails").append('<li><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>');
+                    <% end %>
+                    
+                    jQuery("#variant-images").show();
+                  }else{
+                    jQuery("#variant-images").hide();
+                  }
+                  
+                  add_image_handlers();
+                  
+                  var link = jQuery("#variant-thumbnails a")[0];
+  
+                  jQuery("#main-image img").attr({src: jQuery(link).attr('href')});  
+                  jQuery('ul.thumbnails li').removeClass('selected');
+                  jQuery(link).parent('li').addClass('selected');
+               });
+
+            });
+          </script>
+        <% end %>
       <% end%>
     </ul>
   </div>
-
-  <% else %>
-    <%= text_field_tag "variants[#{@product.variant.id}]", 1 , :class => "title", :size => 3%>
   <% end%>						
-  &nbsp;
-  <%=
-    if @product.has_stock? || Spree::Config[:allow_backorders]
-      "<button type='submit' class='large primary'>#{image_tag('/images/add-to-cart.png')} #{t('add_to_cart')}</button"
-    else
-      content_tag('strong', t('out_of_stock'))
-    end
-  %>
-
+  <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
+      <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"), 
+                     1, :class => "title", :size => 3 %>
+      &nbsp;
+      <button type='submit' class='large primary'>
+        <%= image_tag('/images/add-to-cart.png') + t('add_to_cart') %>
+      </button>
+  <% else %>
+      <%= content_tag('strong', t('out_of_stock')) %>
+  <% end %>
 <% end %>
+
+