spree 0.11.1 → 0.11.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.11.2
+
+* # - 1683 Credits / Charges not setting sign correctly
+
 == 0.11.1
 
 * # -  818 Migrate taxons to nested set for major performance boost

data/app/controllers/admin/overview_controller.rb

@@ -8,7 +8,7 @@ class Admin::OverviewController < Admin::BaseController
     #@users = User.find_with_deleted(:all, :order => 'updated_at desc')
 #  going to list today's orders, yesterday's orders, older orders
 # have a filter / search at the top
-    # @orders, @ 
+    # @orders, @
   end
 
 end

data/app/controllers/admin/products_controller.rb

@@ -1,5 +1,6 @@
 class Admin::ProductsController < Admin::BaseController
   resource_controller
+  before_filter :check_json_authenticity, :only => :index
   before_filter :load_data, :except => :index
 
   index.response do |wants|

data/app/controllers/admin/users_controller.rb

@@ -1,5 +1,6 @@
 class Admin::UsersController < Admin::BaseController
   resource_controller
+  before_filter :check_json_authenticity, :only => :index
   before_filter :load_roles, :only => [:edit, :new, :update, :create]
 
   create.after :save_user_roles
@@ -9,7 +10,7 @@ class Admin::UsersController < Admin::BaseController
     wants.html { render :action => :index }
     wants.json { render :json => @collection.to_json(:include => {:bill_address => {:include => [:state, :country]}, :ship_address => {:include => [:state, :country]}}) }
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
 
   private

data/app/controllers/spree/base_controller.rb

@@ -59,14 +59,20 @@ class Spree::BaseController < ActionController::Base
 
   protected
 
+  # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
+  def check_json_authenticity
+    return unless request.format.js? or request.format.json?
+    form_authenticity_token == params[request_forgery_protection_token] || raise(ActionController::InvalidAuthenticityToken)
+  end
+
   def default_title
     Spree::Config[:site_name]
   end
-  
+
   def accurate_title
     return nil
   end
-  
+
   def reject_unknown_object
     # workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?)
     begin

data/app/models/adjustment.rb

@@ -30,6 +30,8 @@ class Adjustment < ActiveRecord::Base
   belongs_to :order
   belongs_to :adjustment_source, :polymorphic => true
 
+  before_save :ensure_correct_sign
+
   validates_presence_of :description
   validates_numericality_of :amount, :allow_nil => true
 
@@ -73,4 +75,22 @@ class Adjustment < ActiveRecord::Base
   class << self
     public :subclasses
   end
+
+  private
+    # Ensure correct sign for amount field here.  Moved from seperate filters on
+    # Credit / Charge as object is an Adjustment on create, so it wasn't firing
+    #
+    def ensure_correct_sign
+      return true if self.type.blank? #is an Adjustment
+
+      if self.type.constantize.new.is_a? Credit
+        if (db_amount = read_attribute(:amount)) && db_amount > 0
+          self.amount *= -1
+        end
+      elsif self.type.constantize.new.is_a? Charge
+        if (db_amount = read_attribute(:amount)) && db_amount < 0
+          self.amount *= -1
+        end
+      end
+    end
 end

data/app/models/charge.rb

@@ -1,19 +1,3 @@
 class Charge < Adjustment
-  before_save :ensure_positive_amount
 
-  private
-  # Ensures Charge has always positive amount.
-  #
-  # Amount should be modified ONLY when it's going to be saved to the database
-  # (read_attribute returns value)
-  #
-  # WARNING! It does not protect from Credits getting negative amounts while
-  # amount is autocalculated! Descending classes should ensure amount is always
-  # negative in their calculate_adjustment methods.
-  # This method should be threated as a last resort for keeping integrity of adjustments
-  def ensure_positive_amount
-    if (db_amount = read_attribute(:amount)) && db_amount < 0
-      self.amount *= -1
-    end
-  end
-end
+end

data/app/models/credit.rb

@@ -1,19 +1,3 @@
 class Credit < Adjustment
-  before_save :ensure_negative_amount
 
-  private
-  # Ensures Charge always has negative amount.
-  #
-  # Amount shold be modified ONLY when it's going to be saved to the database
-  # (read_attribute returns value)
-  #
-  # WARNING! It does not protect from Credits getting positive amounts while
-  # amount is autocalculated! Descending classes should ensure amount is always
-  # negative in their calculate_adjustment methods
-  # This method should be threated as a last resort for keeping integrity of adjustments
-  def ensure_negative_amount
-    if (db_amount = read_attribute(:amount)) && db_amount > 0
-      self.amount *= -1
-    end
-  end
 end

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.11.1' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.11.2' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '11'
-      Tiny  = '1'
+      Tiny  = '2'
       Pre   = nil # 'beta'
 
       class << self

data/test/functional/admin/adjustments_controller_test.rb

@@ -113,7 +113,7 @@ class Admin::AdjustmentsControllerTest < ActionController::TestCase
       should_respond_with :redirect
 
       should_change("@order.total", :by => -5.00) { @order.total.to_f }
-      should_change("@order.credits.total", :by => 5.00) { @order.credits.total.to_f }
+      should_change("@order.credits.total", :by => -5.00) { @order.credits.total.to_f }
       should_change("Adjustment.count", :by => 1) { Adjustment.count }
       should_change("Credit.count", :by => 1) { Credit.count }
     end

data/vendor/extensions/api/app/controllers/api/base_controller.rb

@@ -25,9 +25,8 @@ class Api::BaseController < Spree::BaseController
 
     define_method :admin_token_passed_in_headers do
       token = request.headers['X-SpreeAPIKey']
-      return false unless token
-      @current_user = User.find_by_api_key(token)
-      @current_user.has_role? 'admin'
+      return access_denied unless token
+      return access_denied unless @current_user = User.find_by_api_key(token)
     end
 
     define_method :end_of_association_chain do

data/vendor/extensions/overview_dashboard/app/controllers/admin/overview_controller.rb

@@ -1,6 +1,8 @@
 # this clas was inspired (heavily) from the mephisto admin architecture
 
 class Admin::OverviewController < Admin::BaseController
+  before_filter :check_json_authenticity, :only => :get_report_data
+
   #todo, add rss feed of information that is happening
 
   def index
@@ -57,7 +59,7 @@ class Admin::OverviewController < Admin::BaseController
         ["completed_at >= ?", params[:from]]
       end
   end
-  
+
   def fill_empty_entries(orders, params)
     from_date = params[:from].to_date
     to_date = (params[:to] || Time.now).to_date

data/vendor/extensions/overview_dashboard/public/javascripts/dashboard.js

@@ -95,15 +95,15 @@ jQuery(document).ready(function(){
 	
 		jQuery.ajax({
 	       type: 'GET',
-	       url: 'admin/overview/get_report_data',
-	       data: ({report: 'orders_by_day', name: report, value: value, authenticity_token: AUTH_TOKEN}),
+	       url: 'admin/overview/get_report_data?authenticity_token=' + AUTH_TOKEN,
+	       data: ({report: 'orders_by_day', name: report, value: value}),
 	       success: handle_orders_by_day
 		});
 		
 		jQuery.ajax({
 	       type: 'GET',
-	       url: 'admin/overview/get_report_data',
-	       data: ({report: 'orders_totals', name: report, authenticity_token: AUTH_TOKEN}),
+	       url: 'admin/overview/get_report_data?authenticity_token=' + AUTH_TOKEN,
+	       data: ({report: 'orders_totals', name: report}),
 	       success: handle_orders_total
 		});
 

data/vendor/extensions/theme_default/app/views/shared/_admin_head.html.erb

@@ -8,7 +8,7 @@
 <%= javascript_include_tag('jquery.template') unless controller.controller_name == "overview" %>
 <%= javascript_include_tag 'spree', 'nested-attribute', 'zone', 'calculator', 'gateway' %>
 <%= javascript_tag "$ = jQuery;" %>
-<%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
+<%= javascript_tag "var AUTH_TOKEN = encodeURIComponent(#{form_authenticity_token.inspect});" %>
 <%= javascript_include_tag 'jquery.alerts/jquery.alerts.js' %>
 <%= javascript_include_tag 'jquery.autocomplete.min.js' %>
 
@@ -17,5 +17,5 @@
 <%= stylesheet_link_tag 'jquery.autocomplete.css' %>
 
 <%= javascript_tag "jQuery.alerts.dialogClass = 'spree';" %>
-<%= unobtrusive_datepicker_includes %>	
+<%= unobtrusive_datepicker_includes %>
 <%= yield :head %>

data/vendor/extensions/theme_default/public/javascripts/admin/checkouts/edit.js

@@ -40,7 +40,7 @@ jQuery(document).ready(function(){
     });
   }
 
-  $("#customer_search").autocomplete("/admin/users.json", {
+  $("#customer_search").autocomplete("/admin/users.json?authenticity_token=" + AUTH_TOKEN, {
     minChars: 5,
     delay: 1500,
     parse: prep_autocomplete_data,

data/vendor/extensions/theme_default/public/javascripts/admin/orders/edit.js

@@ -75,7 +75,7 @@ jQuery(document).ready(function(){
     });
   }
 
-  $("#add_product_name").autocomplete("/admin/products.json", {
+  $("#add_product_name").autocomplete("/admin/products.json?authenticity_token=" + AUTH_TOKEN, {
       parse: prep_autocomplete_data,
       formatItem: function(item) {
         return format_autocomplete(item);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-11-01 00:00:00 -04:00
 default_executable: spree
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -469,7 +469,6 @@ files:
 - bin/spree
 - config/boot.rb
 - config/cucumber.yml
-- config/database.yml
 - config/database.yml.example
 - config/environment.rb
 - config/environments/cucumber.rb
@@ -576,7 +575,6 @@ files:
 - db/sample/users.rb
 - db/sample/users.yml
 - db/sample/variants.yml
-- db/schema.rb
 - db/seeds.rb
 - features/checkout.feature
 - features/create_admin_user.feature
@@ -2141,8 +2139,6 @@ rdoc_options:
 - --exclude
 - log
 - --exclude
-- pkg
-- --exclude
 - public
 - --exclude
 - script

data/config/database.yml

@@ -1,7 +0,0 @@
-development:
-  adapter: sqlite3
-  database: db/dev.sqlite3
-
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3

data/db/schema.rb

@@ -1,555 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20100624123336) do
-
-  create_table "addresses", :force => true do |t|
-    t.string   "firstname"
-    t.string   "lastname"
-    t.string   "address1"
-    t.string   "address2"
-    t.string   "city"
-    t.integer  "state_id"
-    t.string   "zipcode"
-    t.integer  "country_id"
-    t.string   "phone"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state_name"
-    t.string   "alternative_phone"
-  end
-
-  add_index "addresses", ["firstname"], :name => "index_addresses_on_firstname"
-  add_index "addresses", ["lastname"], :name => "index_addresses_on_lastname"
-
-  create_table "adjustments", :force => true do |t|
-    t.integer  "order_id"
-    t.string   "type"
-    t.decimal  "amount"
-    t.string   "description"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "adjustment_source_id"
-    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",           :limit => 50
-    t.string   "attachment_content_type"
-    t.string   "attachment_file_name"
-    t.integer  "attachment_size"
-    t.integer  "position"
-    t.string   "type",                    :limit => 75
-    t.datetime "attachment_updated_at"
-    t.integer  "attachment_width"
-    t.integer  "attachment_height"
-    t.text     "alt"
-  end
-
-  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 "calculators", :force => true do |t|
-    t.string   "type"
-    t.integer  "calculable_id",   :null => false
-    t.string   "calculable_type", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "checkouts", :force => true do |t|
-    t.integer  "order_id"
-    t.string   "email"
-    t.string   "ip_address"
-    t.text     "special_instructions"
-    t.integer  "bill_address_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.integer  "ship_address_id"
-    t.integer  "shipping_method_id"
-  end
-
-  add_index "checkouts", ["bill_address_id"], :name => "index_checkouts_on_bill_address_id"
-  add_index "checkouts", ["order_id"], :name => "index_checkouts_on_order_id"
-
-  create_table "configurations", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",       :limit => 50
-  end
-
-  add_index "configurations", ["name", "type"], :name => "index_configurations_on_name_and_type"
-
-  create_table "countries", :force => true do |t|
-    t.string  "iso_name"
-    t.string  "iso"
-    t.string  "name"
-    t.string  "iso3"
-    t.integer "numcode"
-  end
-
-  create_table "coupons", :force => true do |t|
-    t.string   "code"
-    t.string   "description"
-    t.integer  "usage_limit"
-    t.boolean  "combine"
-    t.datetime "expires_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "starts_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   "last_digits"
-    t.string   "first_name"
-    t.string   "last_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "start_month"
-    t.string   "start_year"
-    t.string   "issue_number"
-    t.integer  "address_id"
-    t.string   "gateway_customer_profile_id"
-    t.string   "gateway_payment_profile_id"
-  end
-
-  create_table "gateways", :force => true do |t|
-    t.string   "type"
-    t.string   "name"
-    t.text     "description"
-    t.boolean  "active",      :default => true
-    t.string   "environment", :default => "development"
-    t.string   "server",      :default => "test"
-    t.boolean  "test_mode",   :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "inventory_units", :force => true do |t|
-    t.integer  "variant_id"
-    t.integer  "order_id"
-    t.string   "state"
-    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|
-    t.integer  "order_id"
-    t.integer  "variant_id"
-    t.integer  "quantity",                                 :null => false
-    t.decimal  "price",      :precision => 8, :scale => 2, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "line_items", ["order_id"], :name => "index_line_items_on_order_id"
-  add_index "line_items", ["variant_id"], :name => "index_line_items_on_variant_id"
-
-  create_table "open_id_authentication_associations", :force => true do |t|
-    t.integer "issued"
-    t.integer "lifetime"
-    t.string  "handle"
-    t.string  "assoc_type"
-    t.binary  "server_url"
-    t.binary  "secret"
-  end
-
-  create_table "open_id_authentication_nonces", :force => true do |t|
-    t.integer "timestamp",  :null => false
-    t.string  "server_url"
-    t.string  "salt",       :null => false
-  end
-
-  create_table "option_types", :force => true do |t|
-    t.string   "name",         :limit => 100
-    t.string   "presentation", :limit => 100
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "option_types_prototypes", :id => false, :force => true do |t|
-    t.integer "prototype_id"
-    t.integer "option_type_id"
-  end
-
-  create_table "option_values", :force => true do |t|
-    t.integer  "option_type_id"
-    t.string   "name"
-    t.integer  "position"
-    t.string   "presentation"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "option_values_variants", :id => false, :force => true do |t|
-    t.integer "variant_id"
-    t.integer "option_value_id"
-  end
-
-  add_index "option_values_variants", ["variant_id", "option_value_id"], :name => "index_option_values_variants_on_variant_id_and_option_value_id"
-  add_index "option_values_variants", ["variant_id"], :name => "index_option_values_variants_on_variant_id"
-
-  create_table "orders", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "number",           :limit => 15
-    t.decimal  "item_total",                     :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.decimal  "total",                          :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "state"
-    t.string   "token"
-    t.decimal  "adjustment_total",               :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.decimal  "credit_total",                   :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.datetime "completed_at"
-  end
-
-  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"
-    t.string   "display_on"
-  end
-
-  create_table "payments", :force => true do |t|
-    t.integer  "payable_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.decimal  "amount",            :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",  :limit => 100, :null => false
-    t.integer  "owner_id",   :limit => 30,  :null => false
-    t.string   "owner_type", :limit => 50,  :null => false
-    t.integer  "group_id"
-    t.string   "group_type", :limit => 50
-    t.text     "value",      :limit => 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "product_groups", :force => true do |t|
-    t.string "name"
-    t.string "permalink"
-    t.string "order"
-  end
-
-  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"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "product_properties", :force => true do |t|
-    t.integer  "product_id"
-    t.integer  "property_id"
-    t.string   "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "product_properties", ["product_id"], :name => "index_product_properties_on_product_id"
-
-  create_table "product_scopes", :force => true do |t|
-    t.integer "product_group_id"
-    t.string  "name"
-    t.text    "arguments"
-  end
-
-  add_index "product_scopes", ["name"], :name => "index_product_scopes_on_name"
-  add_index "product_scopes", ["product_group_id"], :name => "index_product_scopes_on_product_group_id"
-
-  create_table "products", :force => true do |t|
-    t.string   "name",                 :default => "", :null => false
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "permalink"
-    t.datetime "available_on"
-    t.integer  "tax_category_id"
-    t.integer  "shipping_category_id"
-    t.datetime "deleted_at"
-    t.string   "meta_description"
-    t.string   "meta_keywords"
-    t.integer  "count_on_hand",        :default => 0,  :null => false
-  end
-
-  add_index "products", ["available_on"], :name => "index_products_on_available_on"
-  add_index "products", ["deleted_at"], :name => "index_products_on_deleted_at"
-  add_index "products", ["name"], :name => "index_products_on_name"
-  add_index "products", ["permalink"], :name => "index_products_on_permalink"
-
-  create_table "products_taxons", :id => false, :force => true do |t|
-    t.integer "product_id"
-    t.integer "taxon_id"
-  end
-
-  add_index "products_taxons", ["product_id"], :name => "index_products_taxons_on_product_id"
-  add_index "products_taxons", ["taxon_id"], :name => "index_products_taxons_on_taxon_id"
-
-  create_table "properties", :force => true do |t|
-    t.string   "name"
-    t.string   "presentation", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "properties_prototypes", :id => false, :force => true do |t|
-    t.integer "prototype_id"
-    t.integer "property_id"
-  end
-
-  create_table "prototypes", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "queued_mails", :force => true do |t|
-    t.text   "object"
-    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
-
-  create_table "roles_users", :id => false, :force => true do |t|
-    t.integer "role_id"
-    t.integer "user_id"
-  end
-
-  add_index "roles_users", ["role_id"], :name => "index_roles_users_on_role_id"
-  add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
-
-  create_table "shipments", :force => true do |t|
-    t.integer  "order_id"
-    t.integer  "shipping_method_id"
-    t.string   "tracking"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "number"
-    t.decimal  "cost",               :precision => 8, :scale => 2
-    t.datetime "shipped_at"
-    t.integer  "address_id"
-    t.string   "state"
-  end
-
-  add_index "shipments", ["number"], :name => "index_shipments_on_number"
-
-  create_table "shipping_categories", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "shipping_methods", :force => true do |t|
-    t.integer  "zone_id"
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "display_on"
-  end
-
-  create_table "shipping_rates", :force => true do |t|
-    t.integer "shipping_category_id"
-    t.integer "shipping_method_id"
-  end
-
-  create_table "state_events", :force => true do |t|
-    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|
-    t.string  "name"
-    t.string  "abbr"
-    t.integer "country_id"
-  end
-
-  create_table "tax_categories", :force => true do |t|
-    t.string   "name"
-    t.string   "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "is_default",  :default => false
-  end
-
-  create_table "tax_rates", :force => true do |t|
-    t.integer  "zone_id"
-    t.decimal  "amount",          :precision => 8, :scale => 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "tax_category_id"
-  end
-
-  create_table "taxonomies", :force => true do |t|
-    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  "parent_id"
-    t.integer  "position",          :default => 0
-    t.string   "name",                             :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "permalink"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.string   "icon_file_name"
-    t.string   "icon_content_type"
-    t.integer  "icon_file_size"
-    t.datetime "icon_updated_at"
-    t.text     "description"
-  end
-
-  add_index "taxons", ["parent_id"], :name => "index_taxons_on_parent_id"
-  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",                     :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",          :limit => 128
-    t.string   "salt",                      :limit => 128
-    t.string   "remember_token"
-    t.string   "remember_token_expires_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    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.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
-    t.string   "login"
-    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"
-  add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token"
-
-  create_table "variants", :force => true do |t|
-    t.integer  "product_id"
-    t.string   "sku",                                         :default => "",    :null => false
-    t.decimal  "price",         :precision => 8, :scale => 2,                    :null => false
-    t.decimal  "weight",        :precision => 8, :scale => 2
-    t.decimal  "height",        :precision => 8, :scale => 2
-    t.decimal  "width",         :precision => 8, :scale => 2
-    t.decimal  "depth",         :precision => 8, :scale => 2
-    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"
-
-  create_table "zone_members", :force => true do |t|
-    t.integer  "zone_id"
-    t.integer  "zoneable_id"
-    t.string   "zoneable_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "zones", :force => true do |t|
-    t.string   "name"
-    t.string   "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end