spree 0.7.1 → 0.8.0

data/config/routes.rb

@@ -23,25 +23,28 @@ ActionController::Routing::Routes.draw do |map|
   # map.connect '/locale/:new_locale', :controller => 'locale', :action => 'set_session_locale'
 
   map.root :controller => "products", :action => "index"
+
+  map.resource :user_session, :member => {:login_bar => :get}
+  map.resource :account, :controller => "users"
+  map.resources :password_resets
   
   # login mappings should appear before all others
-  map.login '/login', :controller => 'account', :action => 'login'
-  map.logout '/logout', :controller => 'account', :action => 'logout'
+  map.login '/login', :controller => 'user_sessions', :action => 'new'
+  map.logout '/logout', :controller => 'user_sessions', :action => 'destroy'
   map.signup '/signup', :controller => 'users', :action => 'new'
   map.admin '/admin', :controller => 'admin/overview', :action => 'index'  
   
-  # custom route for checkout since its not really a resource
-  map.checkout 'orders/:order_number/checkout', :controller => 'checkout', :action => 'new'
-  map.checkout 'orders/:order_number/complete', :controller => 'checkout', :action => 'create'
-  map.checkout 'orders/:order_number/checkout/:action', :controller => 'checkout'
-  
   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 :addresses
-  map.resources :orders, :member => {:address_info => :get, :checkout => :get}, :has_many => [:line_items, :creditcards, :creditcard_payments]
+  map.resources :orders, :member => {:address_info => :get, :checkout => :any}, :has_many => [:line_items, :creditcards, :creditcard_payments]
+  map.resources :orders, :member => {:fatal_shipping => :get} do |order|
+    order.resources :shipments, :member => {:shipping_method => :get}
+  end
+  #map.resources :shipments, :member => {:shipping_method => :any}
 
   # route globbing for pretty nested taxon and product paths
   map.taxons_with_product '/t/*taxon_path/p/:id', :controller => 'products', :action => 'show'
@@ -69,6 +72,7 @@ ActionController::Routing::Routes.draw do |map|
     admin.resource :mail_settings
     admin.resource :inventory_settings
     admin.resources :google_analytics
+    admin.resources :orders, :has_many => :shipments
     admin.resources :orders, :has_many => [:payments, :creditcards], :member => {:fire => :put, :resend => :post}
     admin.resources :orders do |order|
       order.resources :creditcard_payments, :member => {:capture => :get}
@@ -78,7 +82,12 @@ ActionController::Routing::Routes.draw do |map|
       taxonomy.resources :taxons
     end 
     admin.resources :reports, :only => [:index, :show], :collection => {:sales_total => :get}
+
+    admin.resources :shipments
+    admin.resources :shipping_methods
+    admin.resources :shipping_categories  
   end                   
+
   
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'  

data/config/spree_permissions.yml

@@ -53,12 +53,15 @@
     options :
       except : [new, create]   
       unless : "current_user.id == object.id"
-# Users can only see their own orders
 'OrdersController':
   permission1:
+    roles : [user]
+    options :
+      for : [checkout]   
+      unless : "Spree::Config[:allow_guest_checkout]"
+  permission2:
+    # Users can only see their own orders
     roles : [admin]
     options :
-      except : [new, create]   
-      unless : "object.user_id == nil || current_user.id == object.user_id"
-      
-# TODO - restrict orders
+      except : [new, create, cvv]   
+      unless : can_access?  #orders_controller may grant access based on presence of token, etc.

data/db/migrate/20090302221152_give_all_users_user_role.rb

@@ -1,4 +1,5 @@
 class GiveAllUsersUserRole < ActiveRecord::Migration
+  require 'authlogic'
   def self.up
     user_role = Role.find_by_name("user")
     users = User.find(:all)

data/db/migrate/20090320113300_authlogic_changes.rb

@@ -0,0 +1,24 @@
+class AuthlogicChanges < ActiveRecord::Migration
+  def self.up
+      change_table :users do |t| 
+          t.string    :persistence_token  
+          t.string    :single_access_token 
+          t.string    :perishable_token    
+          t.integer   :login_count,         :null => false, :default => 0 
+          t.integer   :failed_login_count,  :null => false, :default => 0 
+          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                                      
+      end     
+      change_column :users, :crypted_password, :string, :limit => 128,
+                    :null => false, :default => ""
+      change_column :users, :salt, :string, :limit => 128,
+                    :null => false, :default => ""                    
+      User.reset_column_information 
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20090324164010_create_option_types_prototypes.rb

@@ -0,0 +1,12 @@
+class CreateOptionTypesPrototypes < ActiveRecord::Migration
+  def self.up
+    create_table :option_types_prototypes, :id => false do |t|
+      t.integer :prototype_id
+      t.integer :option_type_id
+    end
+  end
+
+  def self.down
+    drop_table :option_types_prototypes
+  end
+end

data/db/migrate/20090401120636_meta_data_fields_for_products.rb

@@ -0,0 +1,11 @@
+class MetaDataFieldsForProducts < ActiveRecord::Migration
+  def self.up
+    add_column "products", "meta_description", :string
+    add_column "products", "meta_keywords", :string
+  end
+
+  def self.down
+    remove_column "products", "meta_description"
+    remove_column "products", "meta_keywords"
+  end
+end

data/db/migrate/20090401203712_remove_hmp_stuff_in_zones.rb

@@ -0,0 +1,12 @@
+class RemoveHmpStuffInZones < ActiveRecord::Migration
+  def self.up                          
+    change_table :zone_members do |t|
+      t.rename :parent_id, :zone_id  
+      t.rename :member_id, :zoneable_id
+      t.rename :member_type, :zoneable_type
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/{20080706233224_create_eu_vat_zone.rb → 20090401223217_create_eu_vat_zone_again.rb}

@@ -1,7 +1,12 @@
-class CreateEuVatZone < ActiveRecord::Migration
+class CreateEuVatZoneAgain < ActiveRecord::Migration
   def self.up
     # create an EU VAT zone (for optional use with EU VAT)
-    zone = Zone.create :name => "EU_VAT", :description => "Countries that make up the EU VAT zone."
+    zone = Zone.find_or_create_by_name_and_description "EU_VAT", "Countries that make up the EU VAT zone."
+
+    unless zone.id
+      say "Zone EU_VAT ID not found"
+    end
+
     countries = []
     %w[AT BE BG CY CZ DK EE FI FR DE HU IE IT LV LT LU MT NL PL PT RO SK SI ES SE GB].each do |iso|
       countries << Country.find_by_iso(iso)
@@ -9,7 +14,7 @@ class CreateEuVatZone < ActiveRecord::Migration
     
     # manually create the countries (instead of using ActiveRecord method due to some apparent issues with HMP plugin)
     countries.each do |country|
-      execute "INSERT INTO zone_members (parent_id, member_id, member_type, created_at, updated_at) 
+      execute "INSERT INTO zone_members (zone_id, zoneable_id, zoneable_type, created_at, updated_at) 
                VALUES (#{zone.id}, #{country.id}, 'Country', '#{Time.now.to_s(:db)}', '#{Time.now.to_s(:db)}')"
     end
   end

data/db/migrate/20090402002244_add_user_login.rb

@@ -0,0 +1,17 @@
+class AddUserLogin < ActiveRecord::Migration
+  def self.up   
+    change_table :users do |t|
+      t.string :login, :unique => true
+    end
+
+    User.reset_column_information
+
+    execute "UPDATE users SET login = email"
+  end
+
+  def self.down                       
+    change_table :users do |t|
+      t.remove :login
+    end
+  end
+end

data/db/migrate/20090402161055_add_order_token.rb

@@ -0,0 +1,13 @@
+class AddOrderToken < ActiveRecord::Migration
+  def self.up 
+    change_table :orders do |t|
+      t.string :token
+    end
+  end
+
+  def self.down      
+    change_table :orders do |t|
+      t.remove :token
+    end
+  end
+end

data/db/migrate/20090402200317_add_email_to_order.rb

@@ -0,0 +1,19 @@
+class AddEmailToOrder < ActiveRecord::Migration
+  def self.up        
+    change_table :orders do |t|
+      t.string :email
+    end       
+    Order.reset_column_information
+    # update legacy orders
+    Order.find(:all, :include => :user, :conditions => "checkout_complete IS NOT NULL").each do |order|
+      order.email = order.user.email
+      order.save
+    end
+  end
+
+  def self.down      
+    change_table :orders do |t|
+      t.remove :email
+    end    
+  end
+end

data/db/migrate/20090406174645_refactor_addresses.rb

@@ -0,0 +1,53 @@
+class RefactorAddresses < ActiveRecord::Migration
+  def self.up  
+    change_table :orders do |t|
+      t.integer :bill_address_id
+      t.integer :ship_address_id
+    end                              
+    change_table :shipments do |t|
+      t.references :address
+    end
+    change_table :creditcards do |t|
+      t.references :address
+    end    
+
+    Order.reset_column_information
+    Shipment.reset_column_information
+    Creditcard.reset_column_information
+    
+    Address.find_in_batches do |addresses|
+      addresses.each do |address|
+        if address.addressable_type == "Creditcard"
+          creditcard = Creditcard.find address.addressable_id
+          creditcard.address = address
+          creditcard.save
+          order = creditcard.order
+
+          if order
+            order.bill_address = address
+            order.save
+		      end
+
+        elsif address.addressable_type == "Shipment"
+          shipment = Shipment.find address.addressable_id 
+          shipment.address = address
+          shipment.save
+          order = shipment.order
+          if order
+            order.ship_address = address
+            order.save
+          end
+        end
+      end
+    end
+
+    change_table :addresses do |t|
+      t.remove :addressable_id
+      t.remove :addressable_type
+    end    
+
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20090420021303_remove_viewable_id_from_products.rb

@@ -0,0 +1,10 @@
+class RemoveViewableIdFromProducts < ActiveRecord::Migration
+  def self.up       
+    change_table :products do |t|
+      t.remove :viewable_id
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20090427000000_upgrade_taxons.rb

@@ -0,0 +1,14 @@
+
+class UpgradeTaxons < ActiveRecord::Migration
+  def self.up
+    Taxonomy.find(:all).each do |taxonomy|
+        next if (taxonomy.taxons.find_by_parent_id(nil))
+        taxon = Taxon.new(:name => taxonomy.name, :taxonomy_id => taxonomy.id, :position => 1 )
+        taxon.save
+    end
+  end
+
+  def self.down
+  end
+
+end

data/db/sample/addresses.yml

@@ -1,14 +1,24 @@
-<% 1.upto(30) do |i| %>
-frank_cc_address_<%= i %>:
-  firstname: Frank
-  lastname: Foo
-  address1: 123 Foo St.
-  address2: Apt. F
-  city: Fooville
-  state: new_york
-  zipcode: 16804
-  country_id: 214
-  phone: 614-555-1212
-  addressable: card_<%= i %>
-  addressable_type: Creditcard
-<% end %>
+<% 1.upto(30) do |i| %>
+frank_ship_address_<%= i %>:
+  firstname: Betty
+  lastname: Bar
+  address1: 123 Foo St.
+  address2: Apt. F
+  city: Fooville
+  state: new_york
+  zipcode: 16804
+  country_id: 214
+  phone: 614-555-1212
+<% end %>
+<% 1.upto(30) do |i| %>
+frank_bill_address_<%= i %>:
+  firstname: Frank
+  lastname: Foo
+  address1: 123 Foo St.
+  address2: Apt. F
+  city: Fooville
+  state: new_york
+  zipcode: 16804
+  country_id: 214
+  phone: 614-555-1212
+<% end %>

data/db/sample/creditcards.yml

@@ -6,5 +6,6 @@ card_<%= i %>:
   display_number: XXXX-XXXX-XXXX-1111
   first_name: Sean
   last_name: Schofield
-  order: order_<%= i %>
+  order: order_<%= i %>  
+  address: frank_bill_address_<%= i %>
 <% end %>

data/db/sample/orders.yml

@@ -8,5 +8,8 @@ order_<%= i %>:
   item_total: 37.97
   total: 45.75
   ip_address: 127.0.0.1
-  checkout_complete: true
+  checkout_complete: true 
+  ship_address: frank_ship_address_<%= i %>
+  bill_address: frank_bill_address_<%= i %>
+  email: frank.foo@example.com
 <% end %>

data/db/sample/products.yml

@@ -2,53 +2,53 @@ ror_tote:
   name: Ruby on Rails 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.
   master_price: 15.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-tote
 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.
   master_price: 22.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-bag
 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.
   master_price: 19.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-baseball-jersey
 ror_jr_spaghetti:
   name: Ruby on Rails 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.
   master_price: 19.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-jr-spaghetti
 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.
   master_price: 13.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-mug
 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.
   master_price: 17.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-on-rails-ringer-t-shirt
 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.
   master_price: 16.99
-  available_on: <%= Time.now.to_s(:db) %>  
+  available_on: <%= Time.zone.now.to_s(:db) %>  
   permalink: ruby-on-rails-stein
 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.
   master_price: 19.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: ruby-baseball-jersey
 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.
   master_price: 19.99
-  available_on: <%= Time.now.to_s(:db) %>
+  available_on: <%= Time.zone.now.to_s(:db) %>
   permalink: apache-baseball-jersey