railscart 0.0.2 → 0.0.3

data/starter_app/db/sample/skus.yml

@@ -1,35 +1,28 @@
 ror_tote:
-  id: 1
-  stockable_id: 1
+  stockable: ror_tote
   stockable_type: Product
   number: RR1001
 ror_bag:
-  id: 2
-  stockable_id: 2
+  stockable: ror_bag
   stockable_type: Product
   number: RR1002
 ror_baseball_jersey:
-  id: 3
-  stockable_id: 3
+  stockable: ror_baseball_jersey
   stockable_type: Product
   number: RR1003
 ror_jr_spaghetti:
-  id: 4
-  stockable_id: 4
+  stockable: ror_jr_spaghetti
   stockable_type: Product
   number: RR1004
 ror_mug:
-  id: 5
-  stockable_id: 5
+  stockable: ror_mug
   stockable_type: Product
   number: RR1005
 ror_ringer:
-  id: 6
-  stockable_id: 6
+  stockable: ror_ringer
   stockable_type: Product
   number: RR1006
 ror_stein:
-  id: 7
-  stockable_id: 7
+  stockable: ror_stein
   stockable_type: Product
   number: RR1007

data/starter_app/db/sample/variations.yml

@@ -1,20 +1,31 @@
-s:
-  id: 1 
-  name: 'Size: S'
-  variable_id: 2
-  variable_type: Category
-m:
-  id: 2 
-  name: 'Size: M'
-  variable_id: 2
-  variable_type: Category
-l:
-  id: 3 
-  name: 'Size: L'
-  variable_id: 2
-  variable_type: Category
-xl:
-  id: 4
-  name: 'Size: XL'
-  variable_id: 2
-  variable_type: Category 
+small-red-baseball:
+  product: ror_baseball_jersey
+  option_values: s, red
+small-blue-baseball:
+  product: ror_baseball_jersey
+  option_values: s, blue
+small-green-baseball:
+  product: ror_baseball_jersey
+  option_values: s, green
+med-red-baseball:
+  product: ror_baseball_jersey
+  option_values: m, red
+med-blue-baseball:
+  product: ror_baseball_jersey
+  option_values: m, blue
+med-green-baseball:
+  product: ror_baseball_jersey
+  option_values: m, green
+large-red-baseball:
+  product: ror_baseball_jersey
+  option_values: l, red
+large-blue-baseball:
+  product: ror_baseball_jersey
+  option_values: l, blue
+large-green-baseball:
+  product: ror_baseball_jersey
+  option_values: l, green
+xlarge-green-baseball:
+  product: ror_baseball_jersey
+  option_values: xl, red
+		

data/starter_app/vendor/plugins/railscart/app/controllers/admin/option_types_controller.rb

@@ -0,0 +1,70 @@
+class Admin::OptionTypesController < Admin::BaseController
+  def select
+    @product = Product.find(params[:id])
+    @option_types = OptionType.find(:all)
+    selected_option_types = []
+    @product.selected_options.each do |so| 
+      selected_option_types << so.option_type
+    end
+    @option_types.delete_if {|ot| selected_option_types.include? ot}
+    
+    render :layout => false
+  end  
+  
+  def index
+    @option_types = OptionType.find(:all)
+  end
+  
+  def new
+    if request.post?
+      @option_type = OptionType.new(params['option_type']) 
+      if @option_type.save
+        flash[:notice] = 'Option type was successfully created.'
+        redirect_to :action => 'index'    
+      else  
+        logger.error("unable to create new option type: #{@option_type.inspect}")
+        flash[:error] = 'Problem saving new option type.'
+        render :action => 'new'
+      end
+    else
+      @option_type = OptionType.new 
+    end
+  end
+  
+  def edit
+    @option_type = OptionType.find(params[:id])
+    if request.post?
+      success = @option_type.update_attributes(params[:option_type])
+      if success and params[:option_value]
+        option_value = OptionValue.new(params[:option_value])
+        @option_type.option_values << option_value
+        success = @option_type.save
+      end
+      flash[:notice] = 'Option type was successfully updated.' if success
+      flash[:error] = "Problem updating option type." if not success
+      redirect_to :action => 'edit', :id => @option_type
+    end
+  end
+  
+  def delete
+    Option.delete(params[:id])
+    redirect_to :action => 'index'
+  end  
+  
+  #AJAX support method
+  def new_option_value
+    @option_type = OptionType.find(params[:id])
+    render  :partial => 'new_option_value', 
+            :locals => {:option_type => @option_type},
+            :layout => false
+  end  
+
+  #AJAX support method
+  def delete_option_value
+    OptionValue.delete(params[:option_value_id])
+    @option_type = OptionType.find(params[:id])
+    render  :partial => 'option_values', 
+            :locals => {:option_type => @option_type},
+            :layout => false
+  end    
+end

data/starter_app/vendor/plugins/railscart/app/controllers/admin/products_controller.rb

@@ -62,8 +62,10 @@ class Admin::ProductsController < Admin::BaseController
       category_id = params[:category]
       @product.category = (category_id.blank? ? nil : Category.find(params[:category]))
       
-      @product.sku.number = params[:sku][:number]
 
+      @product.sku.number = params[:sku][:number]
+      @product.sku.save
+      
       if params[:variation]
         @variation = Variation.new(params[:variation])
         unless @variation.valid?
@@ -79,16 +81,27 @@ class Admin::ProductsController < Admin::BaseController
       unless params[:tags].blank?
         @product.tag_with params[:tags]
         @product.save
-      end        
+      end
+      
+      if params[:new_variation]
+        v = Variation.new
+        params[:new_variation].each do |key, value|
+          v.option_values << OptionValue.find(value)
+        end
+        v.save
+        @product.variations << v
+        @product.save
+      end
       
       @product.tax_treatments = TaxTreatment.find(params[:tax_treatments]) if params[:tax_treatments]
       @product.save
       
-      if @product.sku.save && @product.update_attributes(params[:product])
+      #if @product.sku.save && @product.update_attributes(params[:product])
+      if @product.update_attributes(params[:product])
         flash[:notice] = 'Product was successfully updated.'
-        redirect_to :action => 'show', :id => @product
+        redirect_to :action => 'edit', :id => @product
       else
-        render :action => 'edit', :id => @product
+        flash.now[:error] = 'Problem updating product.'
       end
     else
       @product = Product.find(params[:id])
@@ -104,6 +117,26 @@ class Admin::ProductsController < Admin::BaseController
     redirect_to :action => 'index'
   end
 
+  #AJAX support method
+  def add_option_type
+    @product = Product.find(params[:id])
+    pot = ProductOptionType.new(:product => @product, :option_type => OptionType.find(params[:option_type_id]))
+    @product.selected_options << pot
+    @product.save
+    render  :partial => 'option_types', 
+            :locals => {:product => @product},
+            :layout => false
+  end  
+
+  #AJAX support method
+  def remove_option_type
+    ProductOptionType.delete(params[:product_option_type_id])
+    @product = Product.find(params[:id])
+    render  :partial => 'option_types', 
+            :locals => {:product => @product},
+            :layout => false
+  end  
+
   # AJAX method to show tax treatments based on change in category
   def tax_treatments
     product = Product.find_or_initialize_by_id(params[:id])
@@ -117,9 +150,24 @@ class Admin::ProductsController < Admin::BaseController
             :locals => {:tax_treatments => @all_tax_treatments, :selected_treatments => product.tax_treatments},
             :layout => false
   end
-     
+    
+  #AJAX method   
   def new_variation
+    @product = Product.find(params[:id])
     @variation = Variation.new    
+    render  :partial => 'new_variation', 
+            :locals => {:product => @product},
+            :layout => false    
+  end
+  
+  #AJAX method
+  def delete_variation
+    @product = Product.find(params[:id])
+    Variation.destroy(params[:variation_id])
+    flash.now[:notice] = 'Variation successfully removed.'
+    render  :partial => 'variations', 
+            :locals => {:product => @product},
+            :layout => false    
   end
 
   protected

data/starter_app/vendor/plugins/railscart/app/helpers/admin/base_helper.rb

@@ -1,5 +1,4 @@
 module Admin::BaseHelper
-
   def breadcrumb_nav category
     ancestor(category) + link_to(category.name, :id => category)
   end

data/starter_app/vendor/plugins/railscart/app/helpers/admin/products_helper.rb

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

data/starter_app/vendor/plugins/railscart/app/helpers/rails_cart/base_helper.rb

@@ -64,4 +64,14 @@ module RailsCart::BaseHelper
   def yesterdays_short_date
     utc_to_local(Time.now.utc.yesterday).to_ordinalized_s(:stub)
   end  
+  
+
+  # human readable list of variation options
+  def variation_options(v)
+    list = []
+    v.option_values.each do |ov|
+      list << ov.option_type.presentation + ": " + ov.presentation
+    end
+    list.to_sentence({:connector => ","})
+  end  
 end

data/starter_app/vendor/plugins/railscart/app/helpers/store_helper.rb

@@ -1,3 +1,3 @@
 module StoreHelper
-  
+
 end

data/starter_app/vendor/plugins/railscart/app/models/cart_item.rb

@@ -21,8 +21,9 @@ class CartItem < ActiveRecord::Base
   end
   
   def price
-    pe = self.variation ? self.variation.price_effect : 0
-    self.product.price + pe
+    self.product.price
+    #pe = self.variation ? self.variation.price_effect : 0
+    #self.product.price + pe
   end
   
 end

data/starter_app/vendor/plugins/railscart/app/models/good.rb

@@ -0,0 +1,4 @@
+class Good < ActiveRecord::Base
+  belongs_to :product
+  has_and_belongs_to_many :option_values
+end

data/starter_app/vendor/plugins/railscart/app/models/option_type.rb

@@ -0,0 +1,4 @@
+class OptionType < ActiveRecord::Base
+  has_many :option_values, :order => :position, :dependent => :destroy
+  validates_presence_of :name
+end

data/starter_app/vendor/plugins/railscart/app/models/option_value.rb

@@ -1,4 +1,5 @@
 class OptionValue < ActiveRecord::Base
-  has_many :option_groups
-  has_many :options, :through => :option_groups
+  belongs_to :option_type
+  acts_as_list :scope => :option_type
+  has_and_belongs_to_many :variations
 end

data/starter_app/vendor/plugins/railscart/app/models/order_mailer.rb

@@ -1,4 +1,6 @@
 class OrderMailer < ActionMailer::Base
+  helper "rails_cart/base"
+  
   def confirm(order, resend = false)
     @subject    = (resend ? "[RESEND] " : "") 
     @subject    += 'Order Confirmation #' + order.number

data/starter_app/vendor/plugins/railscart/app/models/product.rb

@@ -1,12 +1,17 @@
 class Product < ActiveRecord::Base
-  has_many :variations, :as => :variable, :dependent => :destroy
+  has_many :product_option_types, :dependent => :destroy
+  has_many :option_types, :through => :product_option_types
+  has_many :variations, :dependent => :destroy
   belongs_to :category
   has_and_belongs_to_many :tax_treatments
+  #has_many :variations, :as => :variable, :dependent => :destroy
   has_one :sku, :as => :stockable, :dependent => :destroy
   validates_presence_of :name
   validates_presence_of :description
   validates_presence_of :price
   
+  alias :selected_options :product_option_types
+  
   def file=(incoming_file) 
     @temp_file = incoming_file
     #manually set the ActiveRecord field since its the file that is posted (and not filename)
@@ -29,11 +34,11 @@ class Product < ActiveRecord::Base
   # previous category
   def before_update
     return if self.category.nil?
-    unless self.category.variations.empty? 
-      self.ar_variations.each do |v|
-        v.destroy
-      end
-    end
+    #unless self.category.variations.empty? 
+    #  self.ar_variations.each do |v|
+    #    v.destroy
+    #  end
+    #end
     ar_tax_treatments.clear unless self.category.tax_treatments.empty? 
   end
   
@@ -44,19 +49,19 @@ class Product < ActiveRecord::Base
   
   # 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 categories variations if they are present.
-  alias :ar_variations :variations
-  def variations
-    v = ar_variations
-    return v unless v.empty?
-    return v if self.category.nil?
-    if self.category.variations.empty?
+  #alias :ar_variations :variations
+  #def variations
+    #v = ar_variations
+    #return v unless v.empty?
+    #return v if self.category.nil?
+    #if self.category.variations.empty?
       # return the products variations
-      return v
-    else
+      #return v
+    #else
       # return a frozen copy of the cateogires variations
-      return Array.new(self.category.variations).freeze   
-    end
-  end   
+      #return Array.new(self.category.variations).freeze   
+    #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 categories treatments if they are present.

data/starter_app/vendor/plugins/railscart/app/models/product_option_type.rb

@@ -0,0 +1,5 @@
+class ProductOptionType < ActiveRecord::Base
+  belongs_to :product
+  belongs_to :option_type
+  acts_as_list :scope => :product
+end

data/starter_app/vendor/plugins/railscart/app/models/variation.rb

@@ -1,5 +1,8 @@
 class Variation < ActiveRecord::Base
-  has_one :sku
-  belongs_to :variable, :polymorphic => true
-  validates_presence_of :name  
+  belongs_to :product
+  has_and_belongs_to_many :option_values
+  validates_presence_of :product
+  #has_one :sku
+  #belongs_to :variable, :polymorphic => true
+  #validates_presence_of :name  
 end

data/starter_app/vendor/plugins/railscart/app/views/admin/option_types/_form.rhtml

@@ -0,0 +1,16 @@
+<!--[form:option]-->
+<p>
+	<%=error_message_on :option_type, :name%>  
+  Name: <%= text_field 'option_type', 'name' -%>
+</p>
+<p>
+  Presentation: <%= text_field 'option_type', 'presentation' -%>
+</p>
+
+<br/>
+<div id="option-value-listing">
+	<%= render :partial => 'option_values', :locals => {:option_type => @option_type} -%>
+</div>
+<br/>
+
+<!--[eoform:option]-->

data/starter_app/vendor/plugins/railscart/app/views/admin/option_types/_new_option_value.rhtml

@@ -0,0 +1,13 @@
+<h3>New Option Value</h3>
+<% fields_for :option_value, @option_value do |ov| %>
+	<table class="basic-table">
+		<tr>
+			<td>Name</td>
+			<td><%= ov.text_field :name %></td>
+		</tr>
+		<tr>
+			<td>Display</td>
+			<td><%= ov.text_field :presentation %></td>
+	  </tr>
+	</table>
+<% end %>