spree 0.9.4 → 0.10.0.beta

data/db/sample/products.rb

@@ -0,0 +1,24 @@
+require 'find'
+# make sure the product images directory exists
+FileUtils.mkdir_p "#{RAILS_ROOT}/public/assets/products/"
+
+# make product images available to the app
+target = "#{RAILS_ROOT}/public/assets/products/"
+source = "#{SPREE_ROOT}/lib/tasks/sample/products/"
+
+Find.find(source) do |f|
+  # omit hidden directories (SVN, etc.)
+  if File.basename(f) =~ /^[.]/
+    Find.prune
+    next
+  end
+
+  src_path = source + f.sub(source, '')
+  target_path = target + f.sub(source, '')
+
+  if File.directory?(f)
+    FileUtils.mkdir_p target_path
+  else
+    FileUtils.cp src_path, target_path
+  end
+end

data/db/sample/products.yml

@@ -3,11 +3,13 @@ ror_tote:
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-tote
+  count_on_hand: 45
 ror_bag:
   name: Ruby on Rails Bag
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-bag
+  count_on_hand: 45
 ror_baseball_jersey:
   name: Ruby on Rails Baseball Jersey
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
@@ -18,28 +20,34 @@ ror_jr_spaghetti:
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-jr-spaghetti
+  count_on_hand: 75
 ror_mug:
   name: Ruby on Rails Mug
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-mug
+  count_on_hand: 75
 ror_ringer:
   name: Ruby on Rails Ringer T-Shirt
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-ringer-t-shirt
+  count_on_hand: 75
 ror_stein:
   name: Ruby on Rails Stein
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>  
   permalink: ruby-on-rails-stein
+  count_on_hand: 75
 ruby_baseball_jersey:
   name: Ruby Baseball Jersey
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-baseball-jersey
+  count_on_hand: 75
 apache_baseball_jersey:
   name: Apache Baseball Jersey
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: apache-baseball-jersey
+  count_on_hand: 0

data/db/sample/shipments.yml

@@ -1,7 +1,8 @@
-<% 1.upto(30) do |i| %>
+<% 1.upto(100) do |i| %>
 shipment_<%= i %>:
   number: <%= Array.new(11){rand(11)}.join %>
-  order: <%= "order_#{i}" %>
+  order: order_<%= i %>
   shipping_method: ups_ground 
-  address: frank_ship_address_<%= i %>
+  address: ship_address_<%= i %>
+  state: pending
 <% end %>

data/db/sample/taxons.rb

@@ -0,0 +1,3 @@
+# Fixtures were created for acts_as_adjency_list, but now we have nested set, so we need to rebuild it after import
+Taxon.rebuild!
+Taxon.all.each{|t| t.send(:set_permalink); t.save}

data/db/sample/taxons.yml

@@ -3,6 +3,9 @@ mc_root:
   name: Categories
   taxonomy: master_categories
   permalink: categories/
+  position: 0
+  lft: 1
+  rgt: 12
 mc_l1_n1:
   id: 1002
   name: Bags
@@ -11,6 +14,8 @@ mc_l1_n1:
   position: 1
   products: ror_tote, ror_bag
   permalink: categories/bags/
+  lft: 8
+  rgt: 9
 mc_l1_n2:
   id: 1003
   name: Mugs
@@ -19,14 +24,17 @@ mc_l1_n2:
   position: 2
   products: ror_mug, ror_stein
   permalink: categories/mugs/
+  lft: 10
+  rgt: 11
 clothing:
   id: 1001
   name: Clothing
   taxonomy: master_categories
   parent_id: 1000
   #products: ror_baseball_jersey, ror_jr_spaghetti, ror_ringer
-  position: 0
   permalink: categories/clothing/
+  lft: 2
+  rgt: 7
 shirts:
   id: 2000
   name: Shirts
@@ -35,6 +43,8 @@ shirts:
   position: 0
   products: ror_jr_spaghetti
   permalink: categories/clothing/shirts/
+  lft: 3
+  rgt: 6
 t_shirts:
   id: 3000
   name: T-Shirts
@@ -43,11 +53,15 @@ t_shirts:
   products: ror_baseball_jersey, ror_ringer, apache_baseball_jersey, ruby_baseball_jersey
   position: 0
   permalink: categories/clothing/shirts/t-shirts/
+  lft: 4
+  rgt: 5
 brand_root:
   id: 20000
   name: Brands
   taxonomy: brand
   permalink: brands/
+  lft: 13
+  rgt: 20
 ruby:
   name: Ruby
   taxonomy: brand
@@ -55,6 +69,8 @@ ruby:
   position: 0
   products: ruby_baseball_jersey
   permalink: brands/ruby/
+  lft: 16
+  rgt: 17
 rails:
   name: Ruby on Rails
   taxonomy: brand
@@ -62,10 +78,14 @@ rails:
   position: 1
   products: ror_baseball_jersey, ror_jr_spaghetti, ror_ringer, ror_stein, ror_bag, ror_tote, ror_mug
   permalink: brands/ruby-on-rails/
+  lft: 14
+  rgt: 15
 apache:
   name: Apache
   taxonomy: brand
   parent_id: 20000
   position: 2
   products: apache_baseball_jersey
-  permalink: brands/apache/
+  permalink: brands/apache/
+  lft: 18
+  rgt: 19

data/db/sample/users.rb

@@ -0,0 +1,58 @@
+# HACK - need to add all sample users to the 'user' role (can't do this in sample fixtures because user role is seed data)
+user_role = Role.find_by_name "user"
+if user_role
+  User.all.each { |u| u.roles << user_role unless u.has_role?("user") } 
+end
+
+# see last line where we create an admin if there is none, asking for email and password
+
+def prompt_for_admin_password
+  password = ask('Password [spree]: ', String) do |q|
+    q.echo = false
+    q.validate = /^(|.{5,40})$/
+    q.responses[:not_valid] = "Invalid password. Must be at least 5 characters long."
+    q.whitespace = :strip
+  end
+  password = "spree" if password.blank?
+  password
+end
+ 
+def prompt_for_admin_email
+  email = ask('Email [spree@example.com]: ', String) do |q|
+    q.echo = true
+    q.whitespace = :strip
+  end
+  email = "spree@example.com" if email.blank?
+  email
+end  
+
+def create_admin_user
+  if ENV['AUTO_ACCEPT']
+    password =  "spree"
+    email =  "spree@example.com"          
+  else
+    require 'highline/import' 
+    puts "Create the admin user (press enter for defaults)."
+    #name = prompt_for_admin_name unless name
+    email = prompt_for_admin_email 
+    password = prompt_for_admin_password 
+  end
+  attributes = {
+    :password => password,
+    :password_confirmation => password,
+    :email => email,
+    :login => email
+  }
+  require File.join(SPREE_ROOT, 'app/models/user.rb')
+  if User.find_by_login(email)
+    say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake db:admin:create again with a different email.\n\n"
+  else
+    admin = User.create(attributes)
+    # create an admin role and and assign the admin user to that role
+    role = Role.find_or_create_by_name "admin"
+    admin.roles << role
+    admin.save
+  end      
+end
+
+create_admin_user unless User.first(:include => :roles, :conditions => ["roles.name = 'admin'"])     

data/db/sample/users.yml

@@ -1,5 +1,13 @@
-frank:
-  email: frank.foo@example.com  
-  login: frank.foo@example.com
+<%
+require 'faker'
+1.upto(500) do |i|
+email = Faker::Internet.email
+%>
+user_<%= i %>:
+  email: <%= email %>
+  login: <%= email %>
   salt: 54340fb3737c0d1af17fe73b02d50f4350618c76
-  crypted_password: 5531faf8d0c82af323af307cf8aebcf4499af3a8
+  crypted_password: 5531faf8d0c82af323af307cf8aebcf4499af3a8
+  ship_address: ship_address_<%= i %>
+  bill_address: bill_address_<%= i %>
+<% end %>

data/db/sample/variants.yml

@@ -3,93 +3,131 @@ small-red-baseball:
   option_values: s, red
   sku: ROR-00001
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 small-blue-baseball:
   product: ror_baseball_jersey
   option_values: s, blue
   sku: ROR-00002
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 small-green-baseball:
   product: ror_baseball_jersey
   option_values: s, green
-  sku: ROR-00003  
+  sku: ROR-00003
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 med-red-baseball:
   product: ror_baseball_jersey
   option_values: m, red
   sku: ROR-00004
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 3
 med-blue-baseball:
   product: ror_baseball_jersey
   option_values: m, blue
   sku: ROR-00005
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 med-green-baseball:
   product: ror_baseball_jersey
   option_values: m, green
   sku: ROR-00006
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 14
 large-red-baseball:
   product: ror_baseball_jersey
   option_values: l, red
   sku: ROR-00007
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 1
 large-blue-baseball:
   product: ror_baseball_jersey
   option_values: l, blue
   sku: ROR-00008
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 large-green-baseball:
   product: ror_baseball_jersey
   option_values: l, green
   sku: ROR-00009
   price: 19.99
+  cost_price: 17.00
+  count_on_hand: 10
 xlarge-green-baseball:
   product: ror_baseball_jersey
   option_values: xl, red
   sku: ROR-00010
   price: 21.99
+  cost_price: 20.00
+  count_on_hand: 10
 ror_baseball_jersey:
   product: ror_baseball_jersey
   sku: ROR-001
   price: 19.99
+  cost_price: 17.00
   is_master: true
+  count_on_hand: 10
 ror_tote_v:
   product: ror_tote
   sku: ROR-00011
   price: 15.99
+  cost_price: 13.00
   is_master: true
+  count_on_hand: 10
 ror_bag_v:
   product: ror_bag
   sku: ROR-00012
   price: 22.99
+  cost_price: 21.00
   is_master: true
+  count_on_hand: 10
 ror_jr_spaghetti_v:
   product: ror_jr_spaghetti
   sku: ROR-00013
-  price: 19.99  
+  price: 19.99
+  cost_price: 17.00
   is_master: true
+  count_on_hand: 10
 ror_mug_v:
-  product: ror_mug  
+  product: ror_mug
   sku: ROR-00014
   price: 13.99
+  cost_price: 11.00
   is_master: true
+  count_on_hand: 10
 ror_ringer_v:
-  product: ror_ringer  
+  product: ror_ringer
   sku: ROR-00015
   price: 17.99
+  cost_price: 17.00
   is_master: true
+  count_on_hand: 10
 ror_stein_v:
-  product: ror_stein  
+  product: ror_stein
   sku: ROR-00016
   price: 16.99
+  cost_price: 15.00
   is_master: true
+  count_on_hand: 10
 apache_baseball_v:
   product: apache_baseball_jersey
   sku: APC-00001
   price: 19.99
+  cost_price: 17.00
   is_master: true
+  count_on_hand: 10
 ruby_baseball_v:
   product: ruby_baseball_jersey
   sku: RUB-00001
   price: 19.99
+  cost_price: 17.00
   is_master: true
+  count_on_hand: 10

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091126190904) do
+ActiveRecord::Schema.define(:version => 20100301163454) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"
@@ -39,14 +39,16 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.string   "adjustment_source_type"
   end
 
+  add_index "adjustments", ["order_id"], :name => "index_adjustments_on_order_id"
+
   create_table "assets", :force => true do |t|
     t.integer  "viewable_id"
-    t.string   "viewable_type"
+    t.string   "viewable_type",           :limit => 50
     t.string   "attachment_content_type"
     t.string   "attachment_file_name"
     t.integer  "attachment_size"
     t.integer  "position"
-    t.string   "type"
+    t.string   "type",                    :limit => 75
     t.datetime "attachment_updated_at"
     t.integer  "attachment_width"
     t.integer  "attachment_height"
@@ -55,20 +57,10 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   add_index "assets", ["viewable_id"], :name => "index_assets_on_viewable_id"
   add_index "assets", ["viewable_type", "type"], :name => "index_assets_on_viewable_type_and_type"
 
-  create_table "billing_integrations", :force => true do |t|
-    t.string   "type"
-    t.string   "name"
-    t.text     "description"
-    t.boolean  "active",      :default => true
-    t.string   "environment", :default => "development"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "calculators", :force => true do |t|
     t.string   "type"
-    t.integer  "calculable_id",                   :null => false
-    t.string   "calculable_type", :default => "", :null => false
+    t.integer  "calculable_id",   :null => false
+    t.string   "calculable_type", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -82,13 +74,15 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "state"
+    t.integer  "ship_address_id"
+    t.integer  "shipping_method_id"
   end
 
   create_table "configurations", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "type"
+    t.string   "type",       :limit => 50
   end
 
   add_index "configurations", ["name", "type"], :name => "index_configurations_on_name_and_type"
@@ -112,24 +106,13 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.datetime "starts_at"
   end
 
-  create_table "creditcard_txns", :force => true do |t|
-    t.integer  "creditcard_payment_id"
-    t.decimal  "amount",                :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.integer  "txn_type"
-    t.string   "response_code"
-    t.text     "avs_response"
-    t.text     "cvv_response"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "creditcards", :force => true do |t|
     t.text     "number"
     t.string   "month"
     t.string   "year"
     t.text     "verification_value"
     t.string   "cc_type"
-    t.string   "display_number"
+    t.string   "last_digits"
     t.string   "first_name"
     t.string   "last_name"
     t.datetime "created_at"
@@ -138,7 +121,8 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.string   "start_year"
     t.string   "issue_number"
     t.integer  "address_id"
-    t.integer  "checkout_id"
+    t.string   "gateway_customer_profile_id"
+    t.string   "gateway_payment_profile_id"
   end
 
   create_table "gateways", :force => true do |t|
@@ -157,12 +141,15 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.integer  "variant_id"
     t.integer  "order_id"
     t.string   "state"
-    t.integer  "lock_version", :default => 0
+    t.integer  "lock_version",            :default => 0
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "shipment_id"
+    t.integer  "return_authorization_id"
   end
 
   add_index "inventory_units", ["order_id"], :name => "index_inventory_units_on_order_id"
+  add_index "inventory_units", ["shipment_id"], :name => "index_inventory_units_on_shipment_id"
   add_index "inventory_units", ["variant_id"], :name => "index_inventory_units_on_variant_id"
 
   create_table "line_items", :force => true do |t|
@@ -187,9 +174,9 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   end
 
   create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",                  :null => false
+    t.integer "timestamp",  :null => false
     t.string  "server_url"
-    t.string  "salt",       :default => "", :null => false
+    t.string  "salt",       :null => false
   end
 
   create_table "option_types", :force => true do |t|
@@ -237,21 +224,34 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
 
   add_index "orders", ["number"], :name => "index_orders_on_number"
 
+  create_table "payment_methods", :force => true do |t|
+    t.string   "type"
+    t.string   "name"
+    t.text     "description"
+    t.boolean  "active",      :default => true
+    t.string   "environment", :default => "development"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "deleted_at"
+  end
+
   create_table "payments", :force => true do |t|
-    t.integer  "order_id"
+    t.integer  "payable_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.decimal  "amount",        :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.integer  "creditcard_id"
-    t.string   "type"
+    t.decimal  "amount",            :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.string   "payable_type"
+    t.integer  "source_id"
+    t.string   "source_type"
+    t.integer  "payment_method_id"
   end
 
   create_table "preferences", :force => true do |t|
-    t.string   "attribute",  :default => "", :null => false
-    t.integer  "owner_id",                   :null => false
-    t.string   "owner_type", :default => "", :null => false
+    t.string   "attribute",  :limit => 100, :null => false
+    t.integer  "owner_id",                  :null => false
+    t.string   "owner_type", :limit => 50,  :null => false
     t.integer  "group_id"
-    t.string   "group_type"
+    t.string   "group_type", :limit => 50
     t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -268,6 +268,11 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   add_index "product_groups", ["name"], :name => "index_product_groups_on_name"
   add_index "product_groups", ["permalink"], :name => "index_product_groups_on_permalink"
 
+  create_table "product_groups_products", :id => false, :force => true do |t|
+    t.integer "product_id"
+    t.integer "product_group_id"
+  end
+
   create_table "product_option_types", :force => true do |t|
     t.integer  "product_id"
     t.integer  "option_type_id"
@@ -325,7 +330,7 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
 
   create_table "properties", :force => true do |t|
     t.string   "name"
-    t.string   "presentation", :default => "", :null => false
+    t.string   "presentation", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -346,6 +351,16 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.string "mailer"
   end
 
+  create_table "return_authorizations", :force => true do |t|
+    t.string   "number"
+    t.decimal  "amount",     :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.integer  "order_id"
+    t.text     "reason"
+    t.string   "state"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "roles", :force => true do |t|
     t.string "name"
   end
@@ -368,6 +383,7 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.decimal  "cost",               :precision => 8, :scale => 2
     t.datetime "shipped_at"
     t.integer  "address_id"
+    t.string   "state"
   end
 
   create_table "shipping_categories", :force => true do |t|
@@ -389,12 +405,13 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   end
 
   create_table "state_events", :force => true do |t|
-    t.integer  "order_id"
+    t.integer  "stateful_id"
     t.integer  "user_id"
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "previous_state"
+    t.string   "stateful_type"
   end
 
   create_table "states", :force => true do |t|
@@ -419,16 +436,16 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   end
 
   create_table "taxonomies", :force => true do |t|
-    t.string   "name",       :default => "", :null => false
+    t.string   "name",       :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "taxons", :force => true do |t|
-    t.integer  "taxonomy_id",                 :null => false
+    t.integer  "taxonomy_id",                :null => false
     t.integer  "parent_id"
     t.integer  "position",    :default => 0
-    t.string   "name",        :default => "", :null => false
+    t.string   "name",                       :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "permalink"
@@ -440,6 +457,27 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
   add_index "taxons", ["permalink"], :name => "index_taxons_on_permalink"
   add_index "taxons", ["taxonomy_id"], :name => "index_taxons_on_taxonomy_id"
 
+  create_table "trackers", :force => true do |t|
+    t.string   "environment"
+    t.string   "analytics_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "transactions", :force => true do |t|
+    t.decimal  "amount",                     :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.integer  "txn_type"
+    t.string   "response_code"
+    t.text     "avs_response"
+    t.text     "cvv_response"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "original_creditcard_txn_id"
+    t.integer  "payment_id"
+    t.string   "type"
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email"
     t.string   "crypted_password"
@@ -451,8 +489,8 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.string   "persistence_token"
     t.string   "single_access_token"
     t.string   "perishable_token"
-    t.integer  "login_count",               :default => 0, :null => false
-    t.integer  "failed_login_count",        :default => 0, :null => false
+    t.integer  "login_count",                             :default => 0, :null => false
+    t.integer  "failed_login_count",                      :default => 0, :null => false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
@@ -462,6 +500,7 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.integer  "ship_address_id"
     t.integer  "bill_address_id"
     t.string   "openid_identifier"
+    t.string   "api_key",                   :limit => 40
   end
 
   add_index "users", ["openid_identifier"], :name => "index_users_on_openid_identifier"
@@ -477,6 +516,7 @@ ActiveRecord::Schema.define(:version => 20091126190904) do
     t.datetime "deleted_at"
     t.boolean  "is_master",                                   :default => false
     t.integer  "count_on_hand",                               :default => 0,     :null => false
+    t.decimal  "cost_price",    :precision => 8, :scale => 2
   end
 
   add_index "variants", ["product_id"], :name => "index_variants_on_product_id"