spree 0.0.7 → 0.0.8

data/starter-app/vendor/plugins/spree/app/controllers/cart_controller.rb

@@ -15,14 +15,8 @@ class CartController < Spree::BaseController
   end
   
   def add
-    product = Product.find(params[:product][:id])
-    variation_id = params[:variation_id]
-    if variation_id.blank? 
-      variation = nil
-    else
-      variation = Variation.find(variation_id)
-    end
-    item = @cart.add_product(product, variation)
+    variant = Variant.find(params[:id])
+    item = @cart.add_variant(variant)
     @cart.save
     item.save
     

data/starter-app/vendor/plugins/spree/app/helpers/admin/products_helper.rb

@@ -1,6 +1,6 @@
 module Admin::ProductsHelper
   def option_type_select(so)
-    select(:new_variation, 
+    select(:new_variant, 
            so.option_type.presentation, 
            so.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] })
   end

data/starter-app/vendor/plugins/spree/app/helpers/spree/base_helper.rb

@@ -65,8 +65,8 @@ module Spree::BaseHelper
   end  
   
 
-  # human readable list of variation options
-  def variation_options(v)
+  # human readable list of variant options
+  def variant_options(v)
     list = []
     v.option_values.each do |ov|
       list << ov.option_type.presentation + ": " + ov.presentation

data/starter-app/vendor/plugins/spree/app/models/cart.rb

@@ -1,11 +1,7 @@
 class Cart < ActiveRecord::Base
   has_many :cart_items, :dependent => :destroy do
-    def in_cart(product, variation = nil)
-      if variation
-        find :first, :conditions => ['product_id = ? and variation_id = ?', product.id, variation.id]
-      else
-        find :first, :conditions => ['product_id = ?', product.id]
-      end
+    def in_cart(variant)
+      find :first, :conditions => ['variant_id = ?', variant.id]
     end
   end
   has_many :products, :through => :cart_items
@@ -14,24 +10,15 @@ class Cart < ActiveRecord::Base
     cart_items.inject(0) {|sum, n| n.price * n.quantity + sum}
   end
   
-  def add_product(product, variation = nil)
-    current_item = cart_items.in_cart(product, variation)
+  def add_variant(variant, quantity=1)
+    current_item = cart_items.in_cart(variant)
     if current_item
-      current_item.increment_quantity
+      current_item.increment_quantity unless quantity > 1
+      current_item.quantity = (current_item.quantity + quantity) if quantity > 1
     else
-      current_item = CartItem.new(:quantity => 1, :product => product, :variation => variation)
+      current_item = CartItem.new(:quantity => quantity, :variant => variant)
       cart_items << current_item
     end
     current_item
   end
-  
-  def remove_product(product, variation = nil)
-    current_item = cart_items.in_cart(product, variation)
-    if current_item.quantity > 1
-      current_item.decrement_quantity
-    else
-      CartItem.destroy(current_item.id)
-    end
-    current_item
-  end
 end

data/starter-app/vendor/plugins/spree/app/models/cart_item.rb

@@ -1,9 +1,8 @@
 class CartItem < ActiveRecord::Base
-  belongs_to :product
-  belongs_to :variation
+  belongs_to :variant
   belongs_to :cart
   
-  validates_presence_of :product, :quantity
+  validates_presence_of :variant, :quantity
   validates_numericality_of :quantity, :only_integer => true
   
   def validate
@@ -21,9 +20,7 @@ class CartItem < ActiveRecord::Base
   end
   
   def price
-    self.product.price
-    #pe = self.variation ? self.variation.price_effect : 0
-    #self.product.price + pe
+    self.variant.product.price
   end
   
 end

data/starter-app/vendor/plugins/spree/app/models/category.rb

@@ -3,7 +3,6 @@ class Category < ActiveRecord::Base
   acts_as_list :scope => :parent_id
   acts_as_tree :order => :position
   has_and_belongs_to_many :tax_treatments
-  has_many :variations, :as => :variable, :dependent => :destroy
   validates_presence_of :name
   
   def ancestors_name
@@ -21,21 +20,6 @@ class Category < ActiveRecord::Base
   def before_save
     self.parent = nil if parent == self
   end
-  
-  # Serious Ruby hacking going on here.  We alias the original method for the association as added by 
-  # ActiveRecord and then override it so we can return the parent category's variations if they are present.
-  alias :ar_variations :variations
-  def variations
-    v = ar_variations
-    return v unless v.empty?
-    if self.parent and not self.parent.variations.empty?
-      # return a frozen copy of the parent category's variations
-      return Array.new(self.parent.variations).freeze   
-    else
-      # return category variations
-      return v
-    end
-  end   
 
   # Serious Ruby hacking going on here.  We alias the original method for the association as added by 
   # ActiveRecord and then override it so we can return the parent category's treatments if they are present.
@@ -56,11 +40,11 @@ class Category < ActiveRecord::Base
   # the previous parent-child relationship 
   def before_update
     return if self.parent.nil?
-    return if self.variations.frozen? and self.tax_treatments.frozen? # variations and treatments were inherited from previous parent - leave them alone
-    unless self.parent.variations.empty? # new parent has no variations to inherit - leave the current ones alone
-      self.ar_variations.each do |v|
-        v.destroy
-      end
-    end
+    return if self.tax_treatments.frozen? # tax treatments were inherited from previous parent - leave them alone
+    #unless self.parent.variations.empty? # new parent has no variations to inherit - leave the current ones alone
+    #  self.ar_variations.each do |v|
+    #    v.destroy
+    #  end
+    #end
   end
 end

data/starter-app/vendor/plugins/spree/app/models/line_item.rb

@@ -1,18 +1,16 @@
 class LineItem < ActiveRecord::Base
   belongs_to :order
-  belongs_to :product
-  belongs_to :variation
+  belongs_to :variant
 
-  validates_presence_of :product
+  validates_presence_of :variant
   validates_numericality_of :quantity
   validates_numericality_of :price
   
   def self.from_cart_item(cart_item)
     line_item = self.new
-    line_item.product = cart_item.product
     line_item.quantity = cart_item.quantity
     line_item.price = cart_item.price
-    line_item.variation = cart_item.variation
+    line_item.variant = cart_item.variant
     line_item
   end  
   

data/starter-app/vendor/plugins/spree/app/models/option_value.rb

@@ -1,5 +1,5 @@
 class OptionValue < ActiveRecord::Base
   belongs_to :option_type
   acts_as_list :scope => :option_type
-  has_and_belongs_to_many :variations
+  has_and_belongs_to_many :variants
 end

data/starter-app/vendor/plugins/spree/app/models/product.rb

@@ -1,7 +1,7 @@
 class Product < ActiveRecord::Base
   has_many :product_option_types, :dependent => :destroy
   has_many :option_types, :through => :product_option_types
-  has_many :variations, :dependent => :destroy
+  has_many :variants, :dependent => :destroy
   belongs_to :category
   has_and_belongs_to_many :tax_treatments
   has_many :images, :as => :viewable, :dependent => :destroy
@@ -9,9 +9,18 @@ class Product < ActiveRecord::Base
   validates_presence_of :name
   validates_presence_of :description
   validates_presence_of :price
+  before_create :empty_variant
   
   alias :selected_options :product_option_types
   
+  # checks is there are any meaningful variants (ie. variants with at least one option value)
+  def variants?
+    self.variants.each do |v|
+      return true unless v.option_values.empty?
+    end
+    false
+  end
+  
   # if product has a new category then we may need to delete tax_treatments associated with the  
   # previous category
   def before_update
@@ -35,8 +44,15 @@ class Product < ActiveRecord::Base
       # return empty array (does not need to be frozen since category has none)
       return tt
     else
-      # return a frozen copy of the cateogires variations
+      # return a frozen copy of the category tax treatments
       return Array.new(self.category.tax_treatments).freeze   
     end
   end  
+  
+  private
+  
+      # all products must have an "empty variant" (this variant will be ignored if meaningful ones are added later)
+      def empty_variant
+        self.variants << Variant.new
+      end
 end

data/starter-app/vendor/plugins/spree/app/models/variant.rb

@@ -0,0 +1,5 @@
+class Variant < ActiveRecord::Base
+  belongs_to :product
+  has_and_belongs_to_many :option_values
+  validates_presence_of :product
+end

data/starter-app/vendor/plugins/spree/app/views/admin/categories/_form.rhtml

@@ -12,11 +12,7 @@
                   :url => {:action => :tax_treatments}, 
                   :with => "'category_id=#{@category.id}&parent_id=' + encodeURIComponent(value)",
                   :on => 'changed' -%>
-<%= observe_field :category_parent_id, 
-                  :update => 'variationsWrapper', 
-                  :url => {:controller => :variations, :action => :category_variations}, 
-                  :with => "'category_id=#{@category.id}&parent_id=' + encodeURIComponent(value)", 
-                  :on => 'changed' -%>                   
+             
 <div id="treatmentWrapper">
   <%= render :partial => 'shared/tax_treatments', :locals => {:tax_treatments => @all_tax_treatments, :selected_treatments => @category.tax_treatments} -%>
 </div>

data/starter-app/vendor/plugins/spree/app/views/admin/overview/index.rhtml

@@ -0,0 +1,3 @@
+<h2>Overview</h2>
+
+Welcome to the Overview Page.  This is a placeholder for some real content.  Eventually we envision a bunch of "widgets" summarizing recent activity and other elements of interest.  

data/starter-app/vendor/plugins/spree/app/views/admin/products/_form.rhtml

@@ -35,8 +35,8 @@
                     :on => 'changed' -%> 
 </p>
 <br/>
-<div id="variation-listing">
-	<%= render :partial => 'variations', :locals => {:product => @product} -%>
+<div id="variant-listing">
+	<%= render :partial => 'variants', :locals => {:product => @product} -%>
 </div>
 <br/>
 <div id="option-type-listing">

data/starter-app/vendor/plugins/spree/app/views/admin/products/{_new_variation.rhtml → _new_variant.rhtml}

@@ -1,4 +1,4 @@
-<h3>New Variation</h3>
+<h3>New Variant</h3>
 <table>
 	<% @product.selected_options.each do |so| %>
 		<tr>

data/starter-app/vendor/plugins/spree/app/views/admin/products/_variants.rhtml

@@ -0,0 +1,43 @@
+<h2>Variants</h2>
+<%=error_message_on :product, :variants %>
+<table class="basic-table">
+	<thead>
+		<tr>
+			<th>Options</th>
+			<th>Action</th>
+		</tr>
+	</thead>
+	<tbody>
+	  <% if @product.variants? %>
+  		<% @product.variants.each do |v| %>
+  			<tr>
+  			  <% next if v.option_values.empty? %>
+  				<td><%= variant_options v %></td>
+  				<td>
+  				  <%= link_to_remote "Remove",
+  				                     :url => {:action => 'delete_variant', :id=> @product, :variant_id => v},
+  				                     :before => "Element.show('busy_indicator')", 
+  				                     :complete => "Element.hide('busy_indicator')",
+  				                     :update => 'variant-listing' %>
+  				</td>
+  			</tr>
+  		<% end %>
+		<% else %>
+			<tr>
+				<td colspan="3">None Available.</td>
+			</tr>
+		<% end %>
+	</tbody>
+</table>
+<% unless @product.new_record? or @product.selected_options.empty? %>
+  <span id="new-var-link">
+	  <%= link_to_remote "New Product Variant",
+	                     :url => {:controller => 'products', :action => 'new_variant', :id=> @product},
+	                     :before => "Element.hide('new-var-link');Element.show('var_busy_indicator')", 
+	                     :complete => "Element.hide('var_busy_indicator')",
+	                     :update => 'new-variant' %>
+  </span>
+	<%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'var_busy_indicator' %>
+<% end %>
+
+<div id="new-variant"></div>

data/starter-app/vendor/plugins/spree/app/views/cart/index.rhtml

@@ -17,12 +17,12 @@
       <% for @item in @cart.cart_items %>
         <tr class="<%= cycle('even', 'odd') %>">
           <td width="100">
-            <%= small_image(@item.product) %>
+            <%= small_image(@item.variant.product) %>
           </td>
           <td valign="top">              
-            <%=link_to @item.product.name, :controller => 'store', :action => 'show', :id => @item.product-%>
-            <%= variation_options @item.variation if @item.variation %><br/>
-            <%=truncate(@item.product.description, length = 100, truncate_string = "...")-%>
+            <%=link_to @item.variant.product.name, :controller => 'store', :action => 'show', :id => @item.variant.product %>
+            <%= variant_options @item.variant %><br/>
+            <%=truncate(@item.variant.product.description, length = 100, truncate_string = "...")-%>
           </td>
           <td valign="top" width="75">$ <%= sprintf("%0.2f", @item.price) %></td>
           <td valign="top" width="50"><%= text_field "item[]", :quantity, :size => 1 -%></td>

data/starter-app/vendor/plugins/spree/app/views/layouts/admin.rhtml

@@ -20,7 +20,7 @@
       <% end -%>      
       <table width="780">
         <tr>
-          <td rowspan="3"><%= image_tag "spree/spree_logo142x65.gif", :plugin=>"spree" %></td>
+          <td rowspan="3"><%= image_tag "spree/spree.jpg", :plugin=>"spree" %></td>
           <td>
             <!-- TODO: may want to restrict to admin users only (instead of any authenticated user) -->
             <% if logged_in? -%>

data/starter-app/vendor/plugins/spree/app/views/order_mailer/cancel.rhtml

@@ -6,7 +6,7 @@ Your order has been CANCELED.  Please retain this cancellation information for y
 Order Summary [CANCELED]
 ============================================================
 <% for item in @order.line_items -%>
-<%=item.product.sku if item.product.sku-%> <%=item.product.name-%> <%= variation_options(item.variation) if item.variation -%> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
+<%=item.variant.product.sku if item.variant.product.sku-%> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
 <% end -%>      
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>

data/starter-app/vendor/plugins/spree/app/views/order_mailer/confirm.rhtml

@@ -6,7 +6,7 @@ Please review and retain the following order information for your records.
 Order Summary
 ============================================================
 <% for item in @order.line_items -%>
-<%=item.product.sku if item.product.sku-%> <%=item.product.name-%> <%= variation_options(item.variation) if item.variation -%> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
+<%=item.variant.product.sku if item.variant.product.sku-%> <%=item.variant.product.name-%> <%= variant_options(item.variant) %> (<%=item.quantity-%>) @ $ <%= sprintf("%0.2f", item.price) %> = $ <%= sprintf("%0.2f", item.price * item.quantity) %>
 <% end -%>      
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>

data/starter-app/vendor/plugins/spree/app/views/shared/_order_details.rhtml

@@ -10,7 +10,7 @@
   </tr>
   <% for item in @order.line_items %>
     <tr >
-      <td width="300"><%=item.product.name-%> <%= "(" + variation_options(item.variation) + ")" if item.variation %></td>
+      <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>

data/starter-app/vendor/plugins/spree/app/views/store/show.rhtml

@@ -23,37 +23,38 @@
 					</td>
 				</tr>
 				<% form_for :product, :url => {:controller => :cart, :action => :add} do |f| %>
-					<input type="hidden" name="product_id" value="<%= @product.id %>"/>
-					<%= f.hidden_field :id %>
-						<% unless @product.variations.empty? %>
+					<% if @product.variants? %>
 						<tr>
-							<td class="product-variations">Variations:</td>
+							<td class="product-variants">Variants:</td>
 						</tr>
-							<tr>
-								<td>
-							    <div id="variations">
-							      <ul>
-							        <% @product.variations.each do |v| %>
-							          <li>
-							            <input type="radio" name="variation_id" value="<%= v.id %>" <%= @product.variations.first == v ? 'checked' : '' %>"/>
-							            <%= variation_options v%>
-							          </li>
-							        <% end%>
-							      </ul>
-							    </div>
-								</td>
-							</tr>
-						<% end%>						
-					  <% if @product.tags.size > 0 %>
-							<tr>
-								<td>
-								  <div id="Related Products">
-								  	<h4>Related Products</h4>
-								    [TODO - list related products]
-								  </div>							
-								</td>
-							</tr>
-					  <% end %>
+						<tr>
+							<td>
+						    <div id="variants">
+						      <ul>
+						        <% @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' : '' %>/>
+						            <%= variant_options v%>
+						          </li>
+						        <% end%>
+						      </ul>
+						    </div>
+							</td>
+						</tr>
+					<% else %>
+					  <input type="hidden" name="id" value=<%=@product.variants.first.id %>/>
+					<% end%>						
+				  <% if @product.tags.size > 0 %>
+						<tr>
+							<td>
+							  <div id="Related Products">
+							  	<h4>Related Products</h4>
+							    [TODO - list related products]
+							  </div>							
+							</td>
+						</tr>
+				  <% end %>
 					<tr>
 						<td>
 							<%= submit_tag 'Add To Cart' %>

data/starter-app/vendor/plugins/spree/assets/stylesheets/spree-admin.css

@@ -19,7 +19,7 @@ a:hover, a:active {
 }
 
 a:link, a:visited {
-  color:#265E15;
+  color:#3875D7;
 }
 
 img {