railscart 0.0.2 → 0.0.3

data/starter_app/vendor/plugins/railscart/db/migrate/009_create_options.rb

@@ -1,11 +1,11 @@
 class CreateOptions < ActiveRecord::Migration
   def self.up
-	  create_table "options", :force => true do |t|
-	    t.column "name", :string, :default => "", :null => false
-	  end
+	  #create_table "options", :force => true do |t|
+	  #  t.column "name", :string, :default => "", :null => false
+	  #end
   end
 
   def self.down
-    drop_table "options"
+    #drop_table "options"
   end
 end

data/starter_app/vendor/plugins/railscart/db/migrate/015_create_variations.rb

@@ -1,14 +1,11 @@
 class CreateVariations < ActiveRecord::Migration
   def self.up
-	  create_table "variations", :force => true do |t|
-	    t.column "name", :text, :null => false
-	    t.column "price_effect", :decimal, :precision => 8, :scale => 2, :default => 0
-      t.column "variable_id", :integer, :null => false
-      t.column "variable_type", :string, :null => false
-	  end
+    create_table :variations do |t| 
+      t.integer :product_id
+    end
   end
 
   def self.down
-    drop_table "variations"
+    drop_table :variations
   end
 end

data/starter_app/vendor/plugins/railscart/db/migrate/021_create_option_types.rb

@@ -0,0 +1,13 @@
+class CreateOptionTypes < ActiveRecord::Migration
+  def self.up
+    create_table :option_types do |t|
+      t.string :name, :limit => 100
+      t.string :presentation, :limit => 100
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :option_types
+  end
+end

data/starter_app/vendor/plugins/railscart/db/migrate/022_create_product_option_types.rb

@@ -0,0 +1,14 @@
+class CreateProductOptionTypes < ActiveRecord::Migration
+  def self.up
+    create_table :product_option_types do |t|
+      t.integer :product_id
+      t.integer :option_type_id
+      t.integer :position
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :product_option_types
+  end
+end

data/starter_app/vendor/plugins/railscart/db/migrate/023_create_option_values_variations.rb

@@ -0,0 +1,12 @@
+class CreateOptionValuesVariations < ActiveRecord::Migration
+  def self.up
+    create_table :option_values_variations, :id=>false do |t| 
+      t.integer :variation_id
+      t.integer :option_value_id
+    end
+  end
+
+  def self.down
+    drop_table :option_values_variations
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railscart
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sean Schofield - Schofield Tech Works LLC
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-29 00:00:00 -05:00
+date: 2008-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,6 @@ files:
 - config/requirements.rb
 - lib/railscart.rb
 - lib/railscart/version.rb
-- log/debug.log
 - script/destroy
 - script/generate
 - script/txt2html
@@ -87,6 +86,7 @@ files:
 - starter_app/app/models/user.rb
 - starter_app/app/views/layouts/application.rhtml
 - starter_app/config/boot.rb
+- starter_app/config/database.master.yml
 - starter_app/config/database.yml
 - starter_app/config/environment.rb
 - starter_app/config/environments/development.rb
@@ -99,14 +99,15 @@ files:
 - starter_app/db/migrate/004_railscart_to_version_20.rb
 - starter_app/db/migrate/005_create_users.rb
 - starter_app/db/migrate/006_create_roles.rb
+- starter_app/db/migrate/007_railscart_to_version_23.rb
 - starter_app/db/sample/addresses.yml
 - starter_app/db/sample/categories.yml
 - starter_app/db/sample/countries.yml
 - starter_app/db/sample/line_items.yml
-- starter_app/db/sample/option_groups.yml
+- starter_app/db/sample/option_types.yml
 - starter_app/db/sample/option_values.yml
-- starter_app/db/sample/options.yml
 - starter_app/db/sample/orders.yml
+- starter_app/db/sample/product_option_types.yml
 - starter_app/db/sample/products.yml
 - starter_app/db/sample/roles.yml
 - starter_app/db/sample/skus.yml
@@ -274,9 +275,7 @@ files:
 - starter_app/vendor/plugins/railscart/app/controllers/account_controller.rb
 - starter_app/vendor/plugins/railscart/app/controllers/admin/base_controller.rb
 - starter_app/vendor/plugins/railscart/app/controllers/admin/categories_controller.rb
-- starter_app/vendor/plugins/railscart/app/controllers/admin/option_groups_controller.rb
-- starter_app/vendor/plugins/railscart/app/controllers/admin/option_values_controller.rb
-- starter_app/vendor/plugins/railscart/app/controllers/admin/options_controller.rb
+- starter_app/vendor/plugins/railscart/app/controllers/admin/option_types_controller.rb
 - starter_app/vendor/plugins/railscart/app/controllers/admin/orders_controller.rb
 - starter_app/vendor/plugins/railscart/app/controllers/admin/overview_controller.rb
 - starter_app/vendor/plugins/railscart/app/controllers/admin/products_controller.rb
@@ -290,10 +289,10 @@ files:
 - starter_app/vendor/plugins/railscart/app/helpers/account_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/base_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/categories_helper.rb
-- starter_app/vendor/plugins/railscart/app/helpers/admin/option_groups_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/option_values_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/orders_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/overview_helper.rb
+- starter_app/vendor/plugins/railscart/app/helpers/admin/products_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/users_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/admin/variations_helper.rb
 - starter_app/vendor/plugins/railscart/app/helpers/cart_helper.rb
@@ -306,14 +305,15 @@ files:
 - starter_app/vendor/plugins/railscart/app/models/cart_item.rb
 - starter_app/vendor/plugins/railscart/app/models/category.rb
 - starter_app/vendor/plugins/railscart/app/models/country.rb
+- starter_app/vendor/plugins/railscart/app/models/good.rb
 - starter_app/vendor/plugins/railscart/app/models/line_item.rb
-- starter_app/vendor/plugins/railscart/app/models/option.rb
-- starter_app/vendor/plugins/railscart/app/models/option_group.rb
+- starter_app/vendor/plugins/railscart/app/models/option_type.rb
 - starter_app/vendor/plugins/railscart/app/models/option_value.rb
 - starter_app/vendor/plugins/railscart/app/models/order.rb
 - starter_app/vendor/plugins/railscart/app/models/order_mailer.rb
 - starter_app/vendor/plugins/railscart/app/models/payment.rb
 - starter_app/vendor/plugins/railscart/app/models/product.rb
+- starter_app/vendor/plugins/railscart/app/models/product_option_type.rb
 - starter_app/vendor/plugins/railscart/app/models/search_criteria.rb
 - starter_app/vendor/plugins/railscart/app/models/sku.rb
 - starter_app/vendor/plugins/railscart/app/models/state.rb
@@ -327,16 +327,14 @@ files:
 - starter_app/vendor/plugins/railscart/app/views/admin/categories/edit.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/categories/list.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/categories/new.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_groups/_form.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_groups/new.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_values/_form.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_values/edit.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_values/list.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/option_values/new.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/options/_form.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/options/edit.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/options/list.rhtml
-- starter_app/vendor/plugins/railscart/app/views/admin/options/new.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/_form.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/_new_option_value.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/_option_values.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/edit.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/index.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/new.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/select.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/option_types/test.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/orders/_address.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/orders/index.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/orders/show.rhtml
@@ -344,6 +342,8 @@ files:
 - starter_app/vendor/plugins/railscart/app/views/admin/products/_form.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/products/_menu.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/products/_new_variation.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/products/_option_types.rhtml
+- starter_app/vendor/plugins/railscart/app/views/admin/products/_variations.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/products/edit.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/products/index.rhtml
 - starter_app/vendor/plugins/railscart/app/views/admin/products/new.rhtml
@@ -380,7 +380,6 @@ files:
 - starter_app/vendor/plugins/railscart/app/views/shared/_paginate.rhtml
 - starter_app/vendor/plugins/railscart/app/views/shared/_report_criteria.rhtml
 - starter_app/vendor/plugins/railscart/app/views/shared/_tax_treatments.rhtml
-- starter_app/vendor/plugins/railscart/app/views/shared/_variations.rhtml
 - starter_app/vendor/plugins/railscart/app/views/store/_menu.rhtml
 - starter_app/vendor/plugins/railscart/app/views/store/_products.rhtml
 - starter_app/vendor/plugins/railscart/app/views/store/list.rhtml
@@ -445,6 +444,9 @@ files:
 - starter_app/vendor/plugins/railscart/db/migrate/018_create_countries.rb
 - starter_app/vendor/plugins/railscart/db/migrate/019_create_states.rb
 - starter_app/vendor/plugins/railscart/db/migrate/020_modify_users.rb
+- starter_app/vendor/plugins/railscart/db/migrate/021_create_option_types.rb
+- starter_app/vendor/plugins/railscart/db/migrate/022_create_product_option_types.rb
+- starter_app/vendor/plugins/railscart/db/migrate/023_create_option_values_variations.rb
 - starter_app/vendor/plugins/railscart/init.rb
 - starter_app/vendor/plugins/railscart/install.rb
 - starter_app/vendor/plugins/railscart/lib/constants/enumerable_constants.rb

data/starter_app/db/sample/option_groups.yml

@@ -1,16 +0,0 @@
-size_s:
-  id: 1
-  option_id: 1
-  option_value_id: 1
-size_m:
-  id: 2
-  option_id: 1
-  option_value_id: 2
-size_l:
-  id: 3
-  option_id: 1
-  option_value_id: 3
-size_xl:
-  id: 4
-  option_id: 1
-  option_value_id: 4      

data/starter_app/db/sample/options.yml

@@ -1,3 +0,0 @@
-size:
-  id: 1
-  name: Size

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

@@ -1,36 +0,0 @@
-class Admin::OptionGroupsController < Admin::BaseController
-
-  def new
-    #note: its the option id being passed even though we're in the option group controller 
-    @option = Option.find(params[:id])
-    #messy SQL but there doesn't seem to be an easier way (at least that i know of)
-    @all_option_values = OptionValue.find_by_sql(["SELECT * FROM option_values WHERE id NOT IN (SELECT option_value_id FROM option_groups WHERE option_id = ? ORDER BY name)", 
-                                                 @option.id])
-  end
-  
-  def create
-    @option = Option.find(params[:id])
-    @option_value = OptionValue.find(params[:option_value])
-    option_group = OptionGroup.new
-    option_group.option = @option
-    option_group.option_value = @option_value
-    option_group.save!
-    flash[:notice] = 'Option group was successfully created.'
-    redirect_to :controller => 'options', :action => 'edit', :id => @option    
-  rescue Exception => e
-    logger.error("unable to create/update option group")
-    logger.error("message: " + e.message)
-    flash[:error] = ' Problem saving option group'
-    render :action => 'new'
-  end
-
-  def destroy
-    group = OptionGroup.find(params[:id])
-    option = group.option
-    group.destroy
-    #OptionGroup.destroy(params[:id])
-    flash[:notice] = 'Option group successfully deleted'
-    redirect_to :controller => 'options', :action => 'edit', :id => option
-  end
-
-end

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

@@ -1,42 +0,0 @@
-class Admin::OptionValuesController < Admin::BaseController
-  
-  def index
-    list
-    render :action => 'list'
-  end  
-  
-  def list
-    @option_values =  OptionValue.find(:all, :page => {:size => 10, :current =>params[:page], :first => 1})
-  end
-
-  def create
-	@option_value = OptionValue.new(@params['option_value'])
-    @option_value.save!
-    flash[:notice] = 'Option value was successfully created.'
-    redirect_to :action => 'list'    
-  rescue
-    logger.error("unable to create new option value: #{@option_value.inspect}")
-    flash[:error] = ' Problem saving new option value'
-    # error occurred while saving, give user a chance to save again
-    render :action => 'new'
-  end    
-
-  def edit
-    @option_value = OptionValue.find(@params[:id])
-  end
-  
-  def update
-    @option_value = OptionValue.find(@params[:id])
-    if @option_value.update_attributes(@params[:option_value])
-      flash[:notice] = 'Option value was successfully updated.'
-      redirect_to :action => 'list'
-    else
-      render :action => 'list'
-    end
-  end
-  
-  def destroy
-    OptionValue.find(params[:id]).destroy
-    redirect_to :action => 'list'
-  end
-end

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

@@ -1,52 +0,0 @@
-class Admin::OptionsController < Admin::BaseController
-  
-  def index
-    list
-    render :action => 'list'
-  end  
-  
-  def new
-    @option = Option.new
-  end
-  
-  def list
-    @options =  Option.find(:all, :page => {:size => 10, :current =>params[:page], :first => 1})
-  end
-  
-  def create
-    @option = Option.new(@params['option'])
-    @option.option_values = OptionValue.find(params[:option_values]) if params[:option_values]
-    @option.save!
-    flash[:notice] = 'Option was successfully created.'
-    redirect_to :action => 'index'    
-  rescue
-    logger.error("unable to create new option: #{@option.inspect}")
-    flash[:notice] = 'ERROR - Problem saving new option'
-    # error occurred while saving, give user a chance to save again
-    render :action => 'new'
-  end    
-  
-  def edit
-    @option = Option.find(@params[:id])
-  end
-  
-  def show
-    @option = Option.find(@params[:id])
-  end
-  
-  def update
-    @option = Option.find(@params[:id])
-    if @option.update_attributes(@params[:option])
-      flash[:notice] = 'Option was successfully updated.'
-      redirect_to :action => 'index', :id => @option
-    else
-      render :action => 'edit'
-    end
-  end
-  
-  def destroy
-    Option.find(params[:id]).destroy
-    redirect_to :action => 'index'
-  end
-  
-end

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

@@ -1,2 +0,0 @@
-module OptionGroupsHelper
-end

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

@@ -1,4 +0,0 @@
-class Option < ActiveRecord::Base
-  has_many :option_groups, :dependent => :destroy
-  has_many :option_values, :through => :option_groups
-end

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

@@ -1,6 +0,0 @@
-class OptionGroup < ActiveRecord::Base
-  belongs_to :option
-  belongs_to :option_value
-  
-  validates_presence_of :option, :option_value
-end

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

@@ -1,19 +0,0 @@
-<%= error_messages_for 'option' %>
-
-<!--[form:attribute]-->
-<table>
-  <tr>
-    <td>Option Name: </td>
-    <td><%= @option.name -%></td>
-  </tr>
-	<tr>
-		<td>Option Value:	</td>
-		<td>
-			<select name="option_value" id="option_value">
-			  <%= options_from_collection_for_select(@all_option_values, :id, :name) -%>
-			</select>
-		</td>
-	</tr>
-</table>
-</p>
-<!--[eoform:attribute]-->

data/starter_app/vendor/plugins/railscart/app/views/admin/option_groups/new.rhtml

@@ -1,8 +0,0 @@
-<%= render :partial => 'admin/products/menu' %>
-
-<h1>New Option Group</h1>
-
-<% form_tag( {:action => 'create', :id => @option} ) do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag "Create" %>
-<% end %>

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

@@ -1,8 +0,0 @@
-<%= error_messages_for 'option_value' %>
-
-<!--[form:option_value]-->
-<p>
-  <label for="option_value_name">Name</label><br/>
-  <%= text_field 'option_value', 'name'  %>
-</p>
-<!--[eoform:option_value]-->

data/starter_app/vendor/plugins/railscart/app/views/admin/option_values/edit.rhtml

@@ -1,8 +0,0 @@
-<%= render :partial => 'admin/products/menu' %>
-
-<h1>Editing Option Value</h1>
-
-<% form_tag :action => 'update', :id => @option_value do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag 'Update' %>
-<% end %>