spree 0.5.1 → 0.6.0

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

@@ -1,8 +1,12 @@
-<h1><%= t("Products") %></h1>
+<h1><%= t('products') %></h1>
 <ul>
   <% for product in @products %>  
   <% content_tag_for (:li, product, :class => 'preview') do %>
-  <%= link_to image_tag ('products/' + product.filename, :size => '100x100'), product %>
+	<% if taxon.nil? %> 
+  	<%= link_to image_tag ('products/' + product.filename, :size => '100x100'), product %>
+  <% else %>
+		<%= link_to image_tag ('products/' + product.filename, :size => '100x100'), seo_url(taxon, product) %>
+	<% end %>
   <%= link_to product.name, product %>
   <b>$<%=product.price%></b>
   <% end %>

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

@@ -1,7 +1,7 @@
 <!-- no need for thumnails unless there is more then one image -->
 <% if product.images.size > 1 %>
 <% product.images.each do |i| %>  
-<%= link_to_remote image_tag(i.public_filename(:mini)), 
+<%= link_to_remote image_tag(i.attachment.url(:mini)), 
                    :url =>  change_image_product_path(product, :image_id => i) ,
                    :update => 'product-image' %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div id="product-listing">
   <%= breadcrumbs(@taxon) %>
   <br/>
-  <%= render :partial => "shared/products.html.erb", :locals => {:products => @products } %>
+  <%= render :partial => "shared/products.html.erb", :locals => {:products => @products, :taxon => @taxon } %>
 </div>
 <% content_for :sidebar do %>
   <td id="shop-by-col" valign="top">

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

@@ -11,6 +11,9 @@
     <td valign="top">
       <% form_for :order, :url => orders_url do |f| %>
 	      <table>
+          <% if @taxon %>
+            <tr><td><%= breadcrumbs(@taxon) %><br/></td></tr>
+          <%end %>
 					<tr>
 					  <td class="product-name"><%= @product.name %></td>
 					</tr>
@@ -19,12 +22,12 @@
 					</tr>
 					<tr>
 					  <td>
-					    <%="<span class='product-price'>#{t("Price")}: </span> #{product_price(@product)}" if product_price(@product) %>
+					    <%="<span class='product-price'>#{t("price")}: </span> #{product_price(@product)}" if product_price(@product) %>
 					  </td>
 					</tr>
 					<% if @product.variants? %>
 						<tr>
-						  <td class="product-variants"><%= t("Variants") %>:</td>
+						  <td class="product-variants"><%= t('variants') %>:</td>
 						</tr>
 						<tr>
 						  <td>
@@ -33,7 +36,7 @@
 										<% @product.variants.each do |v| %>
 											<% next if v.option_values.empty? %>
 											<li>
-                        <input type="radio" name="id" value="<%= v.id %>" <%= @product.variants.first == v ? 'checked="checked"' : '' %> <%= 'disabled' unless v.in_stock or Spree::Config[:show_zero_stock_products]  %> />
+                        <input type="radio" name="variant[id]" value="<%= v.id %>" <%= @product.variants.first == v ? 'checked="checked"' : '' %> <%= 'disabled' unless v.in_stock or Spree::Config[:show_zero_stock_products]  %> />
 											  <%= variant_options v %>
 											  <% if variant_price_diff v %>
 											  	<span class="price-diff"><%= variant_price_diff v %></span>
@@ -45,15 +48,15 @@
 						  </td>
 						</tr>
 					<% else %>
-	  				<tr><td><input type="hidden" name="id" value="<%=@product.variants.first.id %>"/></td></tr>
+	  				<tr><td><input type="hidden" name="variant[id]" value="<%=@product.variants.first.id %>"/></td></tr>
 					<% end%>						
 					<tr>
 					  <td>
               <%=
                 if @product.has_stock? || Spree::Config[:allow_backorders]
-                  submit_tag t('Add To Cart')
+                  submit_tag t('add_to_cart')
                 else
-                  content_tag('strong', 'Out of Stock')
+                  content_tag('strong', t('out_of_stock'))
                 end
             %>
 					  </td>

data/app/views/shared/_additional_field.html.erb

@@ -0,0 +1,7 @@
+<tr>
+  <td nowrap><%= field[:name] %>:</td>
+  <td>
+		<%=error_message_on controller.controller_name.singularize, field[:name].gsub(" ", "_").downcase%>
+    <%=text_field controller.controller_name.singularize, field[:name].gsub(" ", "_").downcase, :value => get_additional_field_value(controller, field) %>
+  </td>
+</tr>	

data/app/views/shared/_address.html.erb

@@ -0,0 +1,35 @@
+<%
+# HACK - in_place_editor field works only with instance variables and not local variables  
+# See http://dev.rubyonrails.org/ticket/3094 for details
+
+@address = address 
+%>
+
+<table cellpadding="0" cellspacing="0">
+  <tr>
+    <td><%="#{address.firstname} #{address.lastname}" %></td>
+  </tr>
+  <tr>
+    <td>
+       <%= address.address1 %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= address.address2 %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= "#{address.city}, #{address.state_name || address.state.abbr} #{address.zipcode}" %>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <%= address.country.name %>       
+    </td>
+  </tr>
+  <tr>
+    <td><%= address.phone %></td>
+  </tr>
+</table>

data/app/views/shared/_edit_resource_links.html.erb

@@ -1 +1 @@
-<%= submit_tag t("Update") %> or <%= link_to t("Cancel"), collection_url %>
+<%= submit_tag t("update") %> or <%= link_to t("cancel"), collection_url %>

data/app/views/shared/_form_address.html.erb

@@ -0,0 +1,46 @@
+<table>
+  <tr>
+    <td width="150"><%= t("first_name") %></td>
+    <td><%= f.text_field :address_firstname %></td>
+  </tr>
+  <tr>
+    <td><%= t("last_name") %></td>
+    <td><%= f.text_field :address_lastname %></td>
+  </tr>
+  <tr>
+    <td><%= t("street_address") %></td>
+    <td><%= f.text_field :address_address1 %></td>
+  </tr>
+  <tr>
+    <td><%= t("street_address_2") %></td>
+    <td><%= f.text_field :address_address2 %></td>
+  </tr>
+  <tr>
+    <td><%= t("city") %></td>
+    <td><%= f.text_field :address_city %></td>
+  </tr>
+  <tr id="address_states_row">
+		<%= render :partial => "shared/states", :locals => {:presenter_type => presenter_type} %>
+  </tr>
+  <tr>
+    <td><%= t("zip") %></td>
+    <td><%= f.text_field :address_zipcode %></td>
+  </tr>
+  <tr>
+    <td><%= t("country") %></td>
+    <td>
+			<%= f.collection_select :address_country_id, @countries, :id, :name, {}, {:style => 'width:150px;'} %>
+			<%= observe_field "#{presenter_type}_presenter_address_country_id", 
+			  :url => {:action => :country_changed },
+	    	:update => 'address_states_row',
+	  		:on => "changed",
+		 		:with => "#{presenter_type}_presenter[address_country_id]",
+				:loading => "$('address_states_row').childElements()[1].update('Loading...');"
+			%>       
+    </td>
+  </tr>
+  <tr>
+    <td><%= t("phone") %></td>
+    <td><%= f.text_field :address_phone %></td>
+  </tr>
+</table>

data/app/views/shared/_login.html.erb

@@ -1,17 +1,17 @@
 <% form_tag '/login' do %>
   <table>
     <tr>
-      <td><%= t("Email") %>: </td>
+      <td><%= t("email") %>: </td>
       <td>
         <%= text_field_tag 'email' %>
       </td>
     </tr>
     <tr>
-      <td><%= t("Password") %>:</td>
+      <td><%= t("password") %>:</td>
       <td>
         <%= password_field_tag 'password' %>
       </td>
     </tr>
   </table>
-  <p><%= submit_tag t("Log In") %>
+  <p><%= submit_tag t("log_in") %>
 <% end %>

data/app/views/shared/_new_resource_links.html.erb

@@ -1 +1 @@
-<%= submit_tag t("Create") %> or <%= link_to t("Cancel"), collection_url %>
+<%= submit_tag t("actions.create") %> or <%= link_to t("actions.cancel"), collection_url %>

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

@@ -1,35 +1,37 @@
-<table class="order-summary">
-  <tr>
-    <th colspan="4" id="order-num"><%= t('Order') %> # <%=@order.number%></th>
-  </tr>
-  <tr>
-    <th><%= t('Item Description') %></th>
-    <th><%= t('Price') %></th>
-    <th><%= t('Qty') %></th>
-    <th><%= t('Total') %></th>
-  </tr>
-  <% @order.line_items.each do |item| %>
-  <tr >
-    <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-    <td valign="top"><%= number_to_currency item.price -%></td>
-    <td valign="top"><%=item.quantity-%></td>
-    <td valign="top"><%= number_to_currency (item.price * item.quantity)-%></td>
-  </tr>
-  <% end %>      
-  <tr id="subtotal-row">
-    <td colspan="3"><b><%= t('Subtotal') %>:</b></td>
-    <td><%= number_to_currency @order.item_total -%></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('Tax') %>:</b></td>
-    <td><%= number_to_currency @order.tax_amount -%></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('Shipping') %>:</b></td>
-    <td><%= number_to_currency @order.ship_amount -%></td>
-  </tr>
-  <tr>
-    <td colspan="3"><b><%= t('Order Total') %>:</b></td>
-    <td><%= number_to_currency @order.total -%></td>
-  </tr>
-</table>
+<table class="order-summary">
+<!-->
+  <tr>
+    <th colspan="4" id="order-num"><%= t('order') %> # <%=@order.number%></th>
+  </tr>
+-->
+  <tr>
+    <th><%= t('item_description') %></th>
+    <th><%= t('price') %></th>
+    <th><%= t('qty') %></th>
+    <th><%= t('total') %></th>
+  </tr>
+  <% @order.line_items.each do |item| %>
+  <tr >
+    <td width="300"><%=item.variant.product.name-%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+    <td valign="top"><%= number_to_currency item.price -%></td>
+    <td valign="top"><%=item.quantity-%></td>
+    <td valign="top"><%= number_to_currency (item.price * item.quantity)-%></td>
+  </tr>
+  <% end %>      
+  <tr id="subtotal-row">
+    <td colspan="3"><b><%= t('subtotal') %>:</b></td>
+    <td><%= number_to_currency @order.item_total -%></td>
+  </tr>
+  <tr>
+    <td colspan="3"><b><%= t('tax') %>:</b></td>
+    <td><%= number_to_currency @order.tax_amount -%></td>
+  </tr>
+  <tr>
+    <td colspan="3"><b><%= t('shipping') %>:</b> (<%= @order.shipment.shipping_method.name %>)</td>
+    <td><%= number_to_currency @order.ship_amount -%></td>
+  </tr>
+  <tr>
+    <td colspan="3"><b><%= t('order_total') %>:</b></td>
+    <td><%= number_to_currency @order.total -%></td>
+  </tr>
+</table>

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

@@ -0,0 +1,32 @@
+<table width="100%">
+  <tr>
+    <td id="order-num"><%= t('order') %> # <%=@order.number%></td>
+    <td align="right">
+      <b><%= @order.state.titleize %></b>
+    </td>
+  </tr>
+</table>
+<div id="tab-container">
+  <ul id="tabnav">
+  	<li>
+  	  <%= link_to t("order_details"), 
+  	              admin_order_url(@order), 
+  	              :class => (current == "Order Details" ? "active" : "") %>
+  	</li>
+  	<li>
+  	  <%= link_to t("payments"), 
+  	              admin_order_payments_url(@order), 
+  	              :class => (current == "Payments" ? "active" : "") %>
+  	</li>
+		<% if @order_admin_tabs && @order_admin_tabs.size > 0
+			@order_admin_tabs.each do |extension| %>
+	     <li>
+	  	  <%= link_to extension[:name].titleize.pluralize, 
+	  	              eval(extension[:url] + " @order") ,
+										:class => (current == extension[:name].titleize.pluralize ? "active" : "") %>
+	  	</li>
+	   <% end
+		end %>
+		
+  </ul>
+</div>

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

@@ -1,10 +1,10 @@
 <% content_for :sub_menu do %>
   <table cellspacing="0" cellpadding="0" id="sub-menu">
     <tr>
-      <td><%= link_to t("Products"), admin_products_url %></td>
-      <td><%= link_to t("Option Types"), admin_option_types_url %></td>
-      <td><%= link_to t("Properties"), admin_properties_url %></td>
-      <td><%= link_to t("Prototypes"), admin_prototypes_url %></td>
+      <td><%= link_to t("products"), admin_products_url %></td>
+      <td><%= link_to t("option_types"), admin_option_types_url %></td>
+      <td><%= link_to t("properties"), admin_properties_url %></td>
+      <td><%= link_to t("prototypes"), admin_prototypes_url %></td>
     </tr>
   </table>
 <% end %>

data/app/views/shared/_product_tabs.html.erb

@@ -1,29 +1,39 @@
 <div id="tab-container">
   <ul id="tabnav">
   	<li>
-  	  <%= link_to t("Product Details"), 
+  	  <%= link_to t("product_details"), 
   	              edit_admin_product_url(@product), 
   	              :class => (current == "Product Details" ? "active" : "") %>
   	</li>
   	<li>
-  	  <%= link_to t("Variants"), 
+  	  <%= link_to t("variants"), 
   	              admin_product_variants_url(@product), 
   	              :class => (current == "Variants" ? "active" : "") %>
     </li>
   	<li>
-  	  <%= link_to t("Option Types"), 
+  	  <%= link_to t("option_types"), 
   	              selected_admin_product_option_types_url(@product),
   	              :class => (current == "Option Types" ? "active" : "") %>
   	</li>
   	<li>
-  	  <%= link_to t("Product Properties"), 
+  	  <%= link_to t("product_properties"), 
   	              admin_product_product_properties_url(@product),
   	              :class => (current == "Product Properties" ? "active" : "") %>
   	</li>
   	<li>
-  	  <%= link_to t("Taxons"), 
+  	  <%= link_to t("taxons"), 
   	              selected_admin_product_taxons_url(@product),
   	              :class => (current == "Taxons" ? "active" : "") %>
   	</li>
+		<% if @product_admin_tabs && @product_admin_tabs.size > 0
+			@product_admin_tabs.each do |extension| %>
+	     <li>
+	  	  <%= link_to extension[:name].capitalize.pluralize, 
+	  	              eval(extension[:url] + " @product") ,
+										:class => (current == extension[:name].capitalize.pluralize ? "active" : "") %>
+	  	</li>
+	   <% end
+		end %>
+		
   </ul>
 </div>

data/app/views/shared/_products.html.erb

@@ -3,8 +3,13 @@
     <% products.each do |product| %>
       <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
         <li class="product preview" id="product_<%= product.id %>">
-          <%= link_to small_image(product), product %>
-          <%= link_to product.name, product %>
+					<% if taxon.nil? %>
+				  	  <%= link_to small_image(product), product %>
+							<%= link_to product.name, product %>
+				  <% else %>
+			     		<%= link_to small_image(product), seo_url(taxon, product) %>
+							<%= link_to product.name, seo_url(taxon, product) %>
+					<% end %>
           <b><%= product_price(product) %></b>
         </li>
       <% end %>

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

@@ -3,31 +3,31 @@
 <% end %>
 <td valign="top">
   <% form_for :search do |f| %>
-  <div id="report-search">
+  <div id="report-search">         
     <table class="admin-search">
       <thead>
         <tr>
-          <th colspan="2"><%= t("Date Range") %></th>
+          <th colspan="2"><%= t("date_range") %></th>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td><%= t("Start") %>:</td>
+          <td><%= t("start") %>:</td>
           <td>
-            <%= error_message_on :search, :start%>
-            <%= calendar_date_select :search, :start, :style=>"width:100px" %>
+            <%= error_message_on :filter, :start%>
+            <%= calendar_date_select :filter, :start, :style=>"width:100px" %>
           </td>
-	</tr>
-	<tr>
-	  <td><%= t("Stop") %>:</td>
-	  <td>
-	    <%= error_message_on :search, :stop%>
-	    <%= calendar_date_select :search, :stop, :style=>"width:100px" %>
-	  </td>
-	</tr>
+        </tr>
+        <tr>
+          <td><%= t("stop") %>:</td>
+          <td>
+            <%= error_message_on :filter, :stop%>
+            <%= calendar_date_select :filter, :stop, :style=>"width:100px" %>
+          </td>
+        </tr>
       </tbody>
-    </table>
-    <%=submit_tag t("Search") %>
+    </table>    
+    <%=submit_tag t('search') %>
   </div>
   <% end %>
 </td>

data/app/views/shared/_show_resource_links.html.erb

@@ -1,3 +1,3 @@
-<%= link_to t("Edit"), edit_object_url %> |
-<%= link_to t("Back"), collection_url %> |
-<%= link_to t("Delete"), object_url, :confirm => 'Are you sure you want to delete this record?', :method => :delete %>
+<%= link_to t("edit"), edit_object_url %> |
+<%= link_to t("back"), collection_url %> |
+<%= link_to t("delete"), object_url, :confirm => t('are_you_sure_you_want_to_delete_this_record'), :method => :delete %>