spree 0.10.2 → 0.11.0

data/config/locales/{en-US.yml → en_spree.yml}

@@ -1,5 +1,5 @@
 ---
-en-US: 
+en:
   'no': "No"
   'yes': "Yes"
   5_biggest_spenders: "5 Biggest Spenders"
@@ -9,6 +9,7 @@ en-US:
   account: Account
   account_updated: "Account updated!"
   action: Action
+  alt_text: Alternative Text
   actions:
     cancel: Cancel
     create: Create
@@ -26,7 +27,9 @@ en-US:
         city: City
         country: "Country"
         first_name: "First Name"
+        first_name_begins_with: "First Name Begins With"
         last_name: "Last Name"
+        last_name_begins_with: "Last Name Begins With"
         phone: Phone
         state: "State"
         zipcode: "Zip Code"
@@ -247,12 +250,14 @@ en-US:
   available_taxons: "Available Taxons"
   awaiting_return: Awaiting Return
   back: Back
+  back_end: Back End
   back_to_store: "Go Back To Store"
   backordered: Backordered
   backordering_is_allowed: "Backordering {{not}} allowed"
   balance_due: "Balance Due"
   best_selling_products: "Best Selling Products"
   best_selling_taxons: "Best Selling Taxons"
+  both: Both
   bill_address: "Bill Address"
   billing: Billing
   billing_address: "Billing Address"
@@ -262,6 +267,7 @@ en-US:
   cancel: cancel
   canceled: Canceled
   cannot_create_returns: Cannot create returns as this order has not shipped yet.
+  cannot_destory_line_item_as_inventory_units_have_shipped: Cannot destory line item as some inventory units have shipped.
   capture: Capture
   card_code: "Card Code"
   card_details: "Card details"
@@ -289,8 +295,6 @@ en-US:
   clone: Clone
   code: Code
   combine: Combine
-  comp_order: "Comp Order"
-  comp_order_confirmation: "Customer will not be charged.  Are you sure you want to comp this order?"
   complete: complete
   complete_list: "Complete List"
   configuration: Configuration
@@ -332,6 +336,7 @@ en-US:
   date_created: Date created
   date_range: "Date Range"
   debit: Debit
+  default: Default
   delete: Delete
   depth: Depth
   description: Description
@@ -375,12 +380,14 @@ en-US:
   expiration_year: "Expiration Year"
   extension: Extension
   extensions: Extensions
+  front_end: Front End
   filename: Filename
   final_confirmation: "Final Confirmation"
   finalize: Finalize
   finalized_payments: Finalized Payments
   first_item: First Item Cost
   first_name: "First Name"
+  first_name_begins_with: "First Name Begins With"
   flat_percent: "Flat Percent"
   flat_rate_amount: Amount
   flat_rate_per_item: "Flat Rate (per item)"
@@ -402,12 +409,14 @@ en-US:
   google_analytics_id: "Analytics ID"
   google_analytics_new: "New Google Analytics Account"
   google_analytics_setting_description: "Manage Google Analytics ID"
+  guest_checkout: Guest Checkout
   guest_user_account: Checkout as a Guest
   has_no_shipped_units: has no shipped units
   height: Height
   hello_user: "Hello User"
   history: History
   home: "Home"
+  icon: "Icon"
   icons_by: "Icons by"
   image: Image
   images: Images
@@ -434,6 +443,7 @@ en-US:
   last_7_days: "Last 7 Days"
   last_month: "Last Month"
   last_name: "Last Name"
+  last_name_begins_with: "Last Name Begins With"
   last_year: "Last Year"
   list: List
   listing_categories: "Listing Categories"
@@ -474,6 +484,7 @@ en-US:
   my_account: "My Account"
   my_orders: "My Orders"
   name: Name
+  name_or_sku: "Name or SKU"
   new: New
   new_adjustment: "New Adjustment"
   new_billing_integration: New Billing Integration
@@ -484,6 +495,7 @@ en-US:
   new_option_type: "New Option Type"
   new_option_value: "New Option Value"
   new_order: "New Order"
+  new_order_completed: "New Order Completed"
   new_payment: "New Payment"
   new_payment_method: New Payment Method
   new_product: "New Product"
@@ -523,7 +535,7 @@ en-US:
     product_not_deleted: "Product could not be deleted"
     track_me_in_GA: "Track Me in GA"
     variant_deleted: "Variant has been deleted"
-    variant_not_deleted: "Variant could not be deleted"    
+    variant_not_deleted: "Variant could not be deleted"
   on_hand: "On Hand"
   operation: Operation
   option_Values: "Option Values"
@@ -798,6 +810,7 @@ en-US:
   shop_by_taxonomy: "Shop by {{taxonomy}}"
   shopping_cart: "Shopping Cart"
   show: Show
+  show_active: "Show Active"
   show_deleted: "Show Deleted"
   show_incomplete_orders: "Show Incomplete Orders"
   show_only_complete_orders: "Only show complete orders"
@@ -901,6 +914,7 @@ en-US:
     is_too_large: "is too large -- stock on hand cannot cover requested quantity!"
     must_be_int: "must be an integer"
     must_be_non_negative: "must be a non-negative value"
+    cannot_be_less_than_shipped_units: "cannot be less than the number of shipped units."
   value: Value
   variants: Variants
   vat: "VAT"

data/config/routes.rb

@@ -34,12 +34,13 @@ ActionController::Routing::Routes.draw do |map|
   map.logout '/logout', :controller => 'user_sessions', :action => 'destroy'
   map.signup '/signup', :controller => 'users', :action => 'new'
   map.admin '/admin', :controller => 'admin/overview', :action => 'index'
+  map.set_locale '/locale/set', :controller => 'locale', :action => 'set', :method => :get
 
   map.resources :tax_categories
   map.resources :countries, :has_many => :states, :only => :index
   map.resources :states, :only => :index
   map.resources :users
-  map.resources :products, :member => {:change_image => :post}
+  map.resources :products
   map.resources :orders, :member => {:address_info => :get}, :has_many => [:line_items, :creditcards, :creditcard_payments]
   map.resources :orders, :member => {:fatal_shipping => :get} do |order|
     order.resources :shipments, :member => {:shipping_method => :get}

data/db/migrate/20100317120946_add_alt_text_to_images.rb

@@ -0,0 +1,9 @@
+class AddAltTextToImages < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :alt, :text
+  end
+
+  def self.down
+    remove_column :assets, :alt
+  end
+end

data/db/migrate/20100427121301_add_display_to_payment_methods.rb

@@ -0,0 +1,9 @@
+class AddDisplayToPaymentMethods < ActiveRecord::Migration
+  def self.up
+    add_column :payment_methods, :display, :string, :default => nil
+  end
+
+  def self.down
+    remove_column :payment_methods, :display
+  end
+end

data/db/migrate/20100504142133_add_addresses_checkouts_indexes.rb

@@ -0,0 +1,16 @@
+class AddAddressesCheckoutsIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :addresses, :firstname
+    add_index :addresses, :lastname
+    add_index :checkouts, :order_id
+    add_index :checkouts, :bill_address_id
+  end
+
+  def self.down
+    remove_index :checkouts, :bill_address_id
+    remove_index :checkouts, :order_id
+    remove_index :addresses, :lastname
+    remove_index :addresses, :firstname
+  end
+end
+

data/db/migrate/20100506180619_add_icon_to_taxons.rb

@@ -0,0 +1,18 @@
+class AddIconToTaxons < ActiveRecord::Migration
+    def self.up
+      # skip this migration if the attribute already exists because of advanced taxon extension
+      return if Taxon.new.respond_to? :icon_file_name
+      add_column :taxons, :icon_file_name,    :string
+      add_column :taxons, :icon_content_type, :string
+      add_column :taxons, :icon_file_size,    :integer
+      add_column :taxons, :icon_updated_at,   :datetime
+    end
+
+    def self.down
+      remove_column :taxons, :icon_file_name
+      remove_column :taxons, :icon_content_type
+      remove_column :taxons, :icon_file_size
+      remove_column :taxons, :icon_updated_at
+    end
+
+end

data/db/migrate/20100506185838_add_description_to_taxons.rb

@@ -0,0 +1,11 @@
+class AddDescriptionToTaxons < ActiveRecord::Migration
+    def self.up
+      # skip this migration if the attribute already exists because of advanced taxon extension
+      return if Taxon.new.respond_to? :description
+      add_column :taxons, :description, :text
+    end
+
+    def self.down
+      remove_column :taxons, :description
+    end
+end

data/db/migrate/20100528155333_index_for_shipments_number.rb

@@ -0,0 +1,9 @@
+class IndexForShipmentsNumber < ActiveRecord::Migration
+  def self.up
+    add_index :shipments, :number
+  end
+
+  def self.down
+    remove_index :shipments, :number
+  end
+end

data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb

@@ -0,0 +1,9 @@
+class AddIndexOnUsersPersistenceToken < ActiveRecord::Migration
+  def self.up
+    add_index :users, :persistence_token
+  end
+
+  def self.down
+    remove_index :users, :persistence_token
+  end
+end

data/db/migrate/20100605152042_add_default_to_tax_categories.rb

@@ -0,0 +1,9 @@
+class AddDefaultToTaxCategories < ActiveRecord::Migration
+  def self.up
+    add_column :tax_categories, :is_default, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :tax_categories, :is_default
+  end
+end

data/db/sample/payment_methods.yml

@@ -20,4 +20,11 @@ bogus_prod:
   description: Bogus payment gateway for production.
   environment: production
   active: true
-  type: Gateway::Bogus
+  type: Gateway::Bogus
+bogus_prod:
+  name: Credit Card
+  description: Bogus payment gateway for staging.
+  environment: staging
+  active: true
+  type: Gateway::Bogus
+  

data/db/sample/shipments.yml

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

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 => 20100317120946) do
+ActiveRecord::Schema.define(:version => 20100605152042) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"
@@ -27,10 +27,13 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     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",                 :precision => 8, :scale => 2
+    t.decimal  "amount"
     t.string   "description"
     t.integer  "position"
     t.datetime "created_at"
@@ -79,6 +82,9 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     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"
@@ -126,14 +132,34 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     t.string   "gateway_payment_profile_id"
   end
 
+  create_table "gateway_configurations", :force => true do |t|
+    t.integer  "gateway_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "gateway_option_values", :force => true do |t|
+    t.integer  "gateway_configuration_id"
+    t.integer  "gateway_option_id"
+    t.text     "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "gateway_options", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "gateway_id"
+    t.boolean  "textarea",    :default => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "gateways", :force => true do |t|
-    t.string   "type"
+    t.string   "clazz"
     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.boolean  "active"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -234,13 +260,14 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
+    t.string   "display"
   end
 
   create_table "payments", :force => true do |t|
     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.decimal  "amount",            :default => 0.0, :null => false
     t.string   "payable_type"
     t.integer  "source_id"
     t.string   "source_type"
@@ -249,17 +276,15 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
 
   create_table "preferences", :force => true do |t|
     t.string   "attribute",  :limit => 100, :null => false
-    t.integer  "owner_id",                  :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"
+    t.text     "value",      :limit => 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "preferences", ["owner_id", "owner_type", "attribute", "group_id", "group_type"], :name => "index_preferences_on_owner_and_attribute_and_preference", :unique => true
-
   create_table "product_groups", :force => true do |t|
     t.string "name"
     t.string "permalink"
@@ -387,6 +412,8 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     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"
@@ -426,6 +453,7 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
     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|
@@ -443,15 +471,20 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
   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",                       :null => false
+    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"
@@ -467,7 +500,7 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
   end
 
   create_table "transactions", :force => true do |t|
-    t.decimal  "amount",                     :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.decimal  "amount",                     :default => 0.0, :null => false
     t.integer  "txn_type"
     t.string   "response_code"
     t.text     "avs_response"
@@ -481,8 +514,8 @@ ActiveRecord::Schema.define(:version => 20100317120946) do
 
   create_table "users", :force => true do |t|
     t.string   "email"
-    t.string   "crypted_password"
-    t.string   "salt"
+    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"
@@ -490,8 +523,8 @@ ActiveRecord::Schema.define(:version => 20100317120946) 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"
@@ -501,10 +534,10 @@ ActiveRecord::Schema.define(:version => 20100317120946) 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"
+  add_index "users", ["persistence_token"], :name => "index_users_on_persistence_token"
 
   create_table "variants", :force => true do |t|
     t.integer  "product_id"