spree 0.10.0.beta → 0.10.0

data/README.markdown

@@ -5,42 +5,24 @@ Spree is a complete open source commerce solution for Ruby on Rails.
 It was developed by Sean Schofield under the original name of Rails
 Cart before changing its name to Spree.
 
-QUICK START
-===========
-
-Running from sources (latest and greatest features)
----------------------------------------------------
-
-1. Clone the git repo
-
-        git clone git://github.com/railsdog/spree.git spree
+Refer to the [Spree ecommerce project page](http://spreecommerce.com) 
+to learn more.
 
-2. Create the necessary config/database.yml file
-        
-3. Install the gem dependencies
 
-        rake gems:install
-        
-4. Bootstrap the database (run the migrations, create admin account, optionally load sample data.)
-
-        rake db:bootstrap
-
-5. Start the server
-
-        script/server
+QUICK START
+===========
 
 Running the Gem
 ---------------
 
-1. Install spree Gem
-
-        sudo gem install spree
+1. Install spree Gem (can take a while to install missing gem dependencies)
 
-    **NOTE:** This may take a while. The gem currently includes a frozen version of Rails 2.0.2
+        (sudo) gem install spree
 
-2. Create Spree Application
+2. Create Spree Application 
 
         spree <app_name>
+        cd <app-name>
 
 3. Create your database and edit the _config/database.yml_ to taste.
 
@@ -50,21 +32,45 @@ Running the Gem
 
 4. Bootstrap
 
-        cd <app-name>
         rake db:bootstrap
 
 5. Launch Application
 
         script/server
 
+
 Browse Store
 ------------
 
-http://localhost:xxxx/store
+http://localhost:nnnn/store
 
 Browse Admin Interface
 ----------------------
 
-http://localhost:xxxx/admin
+http://localhost:nnnn/admin
+
+
+
+Running from edge sources (latest and greatest features)
+--------------------------------------------------------
+
+1. Clone the git repo
+
+        git clone git://github.com/railsdog/spree.git spree
+        cd spree
+
+2. Create the necessary config/database.yml file
+        
+3. Install the gem dependencies
+
+        (sudo) rake gems:install
+        
+4. Bootstrap the database (run the migrations, create admin account, optionally load sample data.)
+
+        rake db:bootstrap
+
+5. Start the server
+
+        script/server
+
 
-Refer to the [Spree ecommerce project page](http://spreecommerce.com) to learn more about spree.

data/app/controllers/admin/option_types_controller.rb

@@ -16,7 +16,7 @@ class Admin::OptionTypesController < Admin::BaseController
   def remove
     @product.option_types.delete(@option_type)
     @product.save
-    flash[:notice] = "Succesfully removed option type."
+    flash[:notice] = I18n.t("notice_messages.option_type_removed")
     redirect_to selected_admin_product_option_types_url(@product)
   end
 

data/app/controllers/admin/payments_controller.rb

@@ -95,7 +95,7 @@ class Admin::PaymentsController < Admin::BaseController
     @object = model.new(object_params)
     @object.payable = parent_object.checkout
     @payment = @object
-    if current_gateway.payment_profiles_supported? and params[:card].present? and params[:card] != 'new'
+    if @object.payment_method.is_a?(Gateway) and @object.payment_method.payment_profiles_supported? and params[:card].present? and params[:card] != 'new'
       @object.source = Creditcard.find_by_id(params[:card])
     end
     @object

data/app/controllers/admin/products_controller.rb

@@ -38,9 +38,9 @@ class Admin::ProductsController < Admin::BaseController
     end
 
     if @product.save
-      flash[:notice] = "Product has been deleted"
+      flash[:notice] = I18n.t("notice_messages.product_deleted")
     else
-      flash[:notice] = "Product could not be deleted"
+      flash[:notice] = I18n.t("notice_messages.product_not_deleted")
     end
 
     respond_to do |format|
@@ -54,9 +54,9 @@ class Admin::ProductsController < Admin::BaseController
     @new = @product.duplicate
 
     if @new.save
-      flash[:notice] = "Product has been cloned"
+      flash[:notice] = I18n.t("notice_messages.product_cloned")
     else
-      flash[:notice] = "Product could not be cloned"
+      flash[:notice] = I18n.t("notice_messages.product_not_cloned")
     end
 
     redirect_to edit_admin_product_url(@new)

data/app/controllers/admin/variants_controller.rb

@@ -25,9 +25,9 @@ class Admin::VariantsController < Admin::BaseController
       
     @variant.deleted_at = Time.now()
     if @variant.save
-      flash[:notice] = "Variant has been deleted"
+      flash[:notice] = I18n.t("notice_messages.variant_deleted")
     else
-      flash[:notice] = "Variant could not be deleted"
+      flash[:notice] = I18n.t("notice_messages.variant_not_deleted")
     end
 
     respond_to do |format|

data/app/controllers/checkouts_controller.rb

@@ -17,7 +17,7 @@ class CheckoutsController < Spree::BaseController
   # GET /checkout is invalid but we'll assume a bookmark or user error and just redirect to edit (assuming checkout is still in progress)
   show.wants.html { redirect_to edit_object_url }
 
-  edit.before :edit_hooks, :set_user
+  edit.before :edit_hooks
   delivery.edit_hook :load_available_methods
   address.edit_hook :set_ip_address
   payment.edit_hook :load_available_payment_methods
@@ -30,7 +30,8 @@ class CheckoutsController < Spree::BaseController
     # call the edit hooks for the current step in case we experience validation failure and need to edit again
     edit_hooks
     @checkout.enable_validation_group(@checkout.state.to_sym)
-
+    @prev_state = @checkout.state
+    
     before :update
 
     begin
@@ -77,7 +78,7 @@ class CheckoutsController < Spree::BaseController
   def object_params
     # For payment step, filter checkout parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
     if object.payment?
-      if source_params = params.delete(:payment_source)[params[:checkout][:payments_attributes].first[:payment_method_id].underscore]
+      if params[:payment_source].present? && source_params = params.delete(:payment_source)[params[:checkout][:payments_attributes].first[:payment_method_id].underscore]
         params[:checkout][:payments_attributes].first[:source_attributes] = source_params
       end
       params[:checkout][:payments_attributes].first[:amount] = @order.total
@@ -98,7 +99,7 @@ class CheckoutsController < Spree::BaseController
     complete_order
     order_params = {:checkout_complete => true}
     session[:order_id] = nil
-    flash[:commerce_tracking] = "Track Me in GA"
+    flash[:commerce_tracking] = I18n.t("notice_messages.track_me_in_GA")
     redirect_to order_url(@order, {:checkout_complete => true, :order_token => @order.token})
   end
 
@@ -206,13 +207,6 @@ class CheckoutsController < Spree::BaseController
     redirect_to register_order_checkout_url(parent_object)
   end
 
-  def set_user
-    if object.order.user.nil? && current_user
-      object.order.user = current_user
-      object.order.save
-    end
-  end
-  
   def accurate_title
     I18n.t(:checkout)
   end

data/app/controllers/orders_controller.rb

@@ -1,6 +1,7 @@
 class OrdersController < Spree::BaseController     
   prepend_before_filter :reject_unknown_object,  :only => [:show, :edit, :update, :checkout]
   before_filter :prevent_editing_complete_order, :only => [:edit, :update, :checkout]            
+  before_filter :set_user
 
   ssl_required :show
 
@@ -76,6 +77,15 @@ class OrdersController < Spree::BaseController
     redirect_to object_url if @order.checkout_complete
   end
   
+  def set_user
+    if @order && @order.user != current_user
+      if @order.checkout 
+        @order.checkout.update_attribute(:email, current_user && current_user.email)
+      end
+      @order.update_attribute(:user, current_user)
+    end
+  end
+  
   def accurate_title
     I18n.t(:shopping_cart)
   end

data/app/controllers/user_sessions_controller.rb

@@ -23,6 +23,7 @@ class UserSessionsController < Spree::BaseController
 
   def destroy
     current_user_session.destroy
+    session.clear
     flash[:notice] = t("logged_out")
     redirect_to products_path
   end
@@ -46,6 +47,21 @@ class UserSessionsController < Spree::BaseController
     @user_session = UserSession.new(data)
     @user_session.save do |result|
       if result
+        # Should restore last uncompleted order and add current(guest) order to it, if exists.
+        order = @user_session.record.orders.last(:conditions => {:completed_at => nil})
+        if order
+          if (session[:order_token] && guest_order = Order.find_by_token(session[:order_token]))
+            guest_order.line_items.each do |line_item|
+              order.add_variant(line_item.variant, line_item.quantity)
+            end  
+            order.save
+            session[:return_to].gsub!(guest_order.number, order.number) if session[:return_to]
+            guest_order.destroy
+          end
+          session[:order_token] = order.token
+          session[:order_id] = order.id
+        end
+        
         respond_to do |format|
           format.html {
             flash[:notice] = t("logged_in_succesfully") unless session[:return_to]

data/app/models/product.rb

@@ -33,7 +33,8 @@ class Product < ActiveRecord::Base
     :class_name => 'Variant',
     :conditions => ["variants.is_master = ? AND variants.deleted_at IS NULL", true]
 
-  delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price
+  delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master
+  delegate_belongs_to :master, :cost_price if Variant.column_names.include? "cost_price"
 
   after_create :set_master_variant_defaults
   after_create :add_properties_and_option_types_from_prototype

data/app/models/variant.rb

@@ -9,7 +9,7 @@ class Variant < ActiveRecord::Base
 
   validate :check_price
   validates_presence_of :price
-  validates_numericality_of :cost_price, :allow_nil => true
+  validates_numericality_of :cost_price, :allow_nil => true if Variant.column_names.include? "cost_price"
 
   before_save :touch_product
 

data/config/boot.rb

@@ -37,17 +37,17 @@ module Spree
     def load_rubygems
       require 'rubygems'
                
+      unless rubygems_version >= '1.3.5'
+        $stderr.puts %(Spree requires RubyGems >= 1.3.5 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        exit 1
+      end
+
       # Temporary workaround for annoying RubyGems warning.  This can be removed once Rails 2.3.6 is released.  
       # See http://railsdog.lighthouseapp.com/projects/31096-spree/tickets/1209
       Gem::Dependency.warned_version_requirement = true
 
-      unless rubygems_version >= '1.3.6'
-        $stderr.puts %(Spree requires RubyGems >= 1.3.6 (you have #{rubygems_version}). Please `gem update --system` and try again.)
-        exit 1
-      end
-
     rescue LoadError
-      $stderr.puts %(Spree requires RubyGems >= 1.3.6. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+      $stderr.puts %(Spree requires RubyGems >= 1.3.5. Please install RubyGems and try again: http://rubygems.rubyforge.org)
       exit 1
     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.10.0.beta' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.10.0' unless defined? SPREE_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/config/locales/cs-CZ.yml

@@ -515,6 +515,15 @@ cs-CZ:
   none_available: "Žádný dostupný"
   not: ne
   note: "Poznámka"
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    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"    
   on_hand: "Dostupný"
   operation: Operace
   option_Values: "Hodnoty volby"
@@ -609,12 +618,12 @@ cs-CZ:
         name: "Vzestupně podle názvu výrobku"
       ascend_by_updated_at:
         name: "Vzestupně podle data poslední změny"
-      descend_by_popularity:
-        name: "Řadit podle popularity, nejvíce populární na začátek"
       descend_by_master_price:
         name: "Sestupně podle základní ceny"
       descend_by_name:
         name: "Sestupně podle názvu výrobku"
+      descend_by_popularity:
+        name: "Řadit podle popularity, nejvíce populární na začátek"
       descend_by_updated_at:
         name: "Sestupně podle data poslední změny"
       in_name:
@@ -882,6 +891,7 @@ cs-CZ:
   use_as_shipping_address: "Použít jako doručovací adresu"
   use_billing_address: "Použít fakturační adresu"
   use_different_shipping_address: "Použít jinou doručovací adresu"
+  use_new_cc: "Use a new card"
   user: "Uživatel"
   user_account: "Uživatelský účet"
   user_created_successfully: "Uživatel byl úspěšně vytvořen"

data/config/locales/da.yml

@@ -515,6 +515,15 @@ da:
   none_available: "None Available"
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    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"    
   on_hand: "On Hand"
   operation: Operation
   option_Values: "Option Values"
@@ -609,12 +618,12 @@ da:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ da:
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Use Different Shipping Address"
+  use_new_cc: "Use a new card"
   user: User
   user_account: User Account
   user_created_successfully: "User created successfully"

data/config/locales/de-CH.yml

@@ -515,6 +515,15 @@ de-CH:
   none_available: "keine verfügbar"
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    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"    
   on_hand: "Auf Lager"
   operation: Operation
   option_Values: "Optionswerte"
@@ -609,12 +618,12 @@ de-CH:
         name: Ascend by product name
       ascend_by_updated_at:
         name: Ascend by actualization date
-      descend_by_popularity:
-        name: Sort by popularity(most popular first)
       descend_by_master_price:
         name: Descend by product master price
       descend_by_name:
         name: Descend by product name
+      descend_by_popularity:
+        name: Sort by popularity(most popular first)
       descend_by_updated_at:
         name: Descend by actualization date
       in_name:
@@ -882,6 +891,7 @@ de-CH:
   use_as_shipping_address: Use as Shipping Address
   use_billing_address: Use Billing Address
   use_different_shipping_address: "Andere Lieferaddresse verwenden"
+  use_new_cc: "Use a new card"
   user: Benutzer
   user_account: User Account
   user_created_successfully: "User created successfully"

data/config/locales/de.yml

@@ -515,6 +515,15 @@ de:
   none_available: "keine verfügbar"
   not: not
   note: Note
+  notice_messages:
+    option_type_removed: "Succesfully removed option type."
+    product_cloned: "Product has been cloned"
+    product_deleted: "Product has been deleted"
+    product_not_cloned: "Product could not be cloned"
+    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"    
   on_hand: "Auf Lager"
   operation: Operation
   option_Values: "Options Werte"
@@ -609,12 +618,12 @@ de:
         name: "Aufsteigend nach Produktname"
       ascend_by_updated_at:
         name: "Aufsteigend nach Bearbeitungsdatum"
-      descend_by_popularity:
-        name: "Nach Beliebtheit sortieren (beliebteste zuerst)"
       descend_by_master_price:
         name: "Absteigend nach Grundpreis"
       descend_by_name:
         name: "Absteigend nach Produktname"
+      descend_by_popularity:
+        name: "Nach Beliebtheit sortieren (beliebteste zuerst)"
       descend_by_updated_at:
         name: "Absteigend nach Bearbeitungsdatum"
       in_name:
@@ -882,6 +891,7 @@ de:
   use_as_shipping_address: "Als Lieferadresse verwenden"
   use_billing_address: "Rechnungsadresse verwenden"
   use_different_shipping_address: "Andere Lieferaddresse verwenden"
+  use_new_cc: "Use a new card"
   user: Benutzer
   user_account: "Benutzerkonto"
   user_created_successfully: "Benutzer erfolgreich angelegt"