spree 0.11.0 → 0.11.1

data/{README.markdown → README.md}

@@ -74,3 +74,7 @@ Running from edge sources (latest and greatest features)
         script/server
 
 
+Contributing
+============
+           
+Spree is an open source project.  We encourage contributions.  Please see the [contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html) before contributing.  **Do not send a Github pull request - it will be ignored.**

data/Rakefile

@@ -36,8 +36,8 @@ begin
     s.add_dependency 'chronic', '0.2.3'
     s.add_dependency 'whenever', "0.3.7"
     s.add_dependency 'searchlogic', "2.3.5"
-    s.add_dependency 'will_paginate', "2.3.11"
-    s.add_dependency 'state_machine', "0.8.0"
+    s.add_dependency 'will_paginate', "2.3.14"     
+    s.add_dependency 'state_machine', "0.9.2"
     s.add_dependency 'faker', "0.3.1"
     s.add_dependency 'paperclip', "= 2.3.1.1"    
     s.add_dependency 'ruby-openid', '>= 2.0.4'

data/app/controllers/admin/adjustments_controller.rb

@@ -10,9 +10,9 @@ class Admin::AdjustmentsController < Admin::BaseController
   destroy.success.wants.js { render_js_for_destroy }
 
   create.before :set_type
-  create.after :update_totals_and_complete_free_order
-  update.after :update_totals
-  destroy.after :update_totals
+  create.after :set_order_state
+  update.after :set_order_state
+  destroy.after :set_order_state
 
   private
   def list_adjustment_types
@@ -28,18 +28,17 @@ class Admin::AdjustmentsController < Admin::BaseController
     object.type = params[:adjustment][:type]
   end
 
-  def update_totals
-    @order.update_totals!
-  end
-
   # Automatically complete and order where no payment is necessary because adjustments cancel out the total
-  def update_totals_and_complete_free_order
+  def set_order_state
     @order.update_totals!
-    if @order.in_progress? and @order.item_total > 0 and @order.total == 0 and @order.payments.total == 0
+
+    if @order.in_progress? and @order.item_total > 0 and @order.total == 0 and @order.payments.total == 0  #for new orders that are adjusted to zero
       until @order.checkout.complete?
         @order.checkout.next!
       end
       @order.reload.pay!
+    elsif @order.item_total > 0 && ((@order.balance_due? && @order.outstanding_balance == 0) || (@order.credit_owed? && @order.outstanding_credit == 0)) #set existing orders back to paid, if adjustment corrects balance
+      @order.reload.pay!
     end
   end
 

data/app/controllers/admin/checkouts_controller.rb

@@ -39,12 +39,20 @@ class Admin::CheckoutsController  < Admin::BaseController
   def edit_before
     @checkout.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @checkout.bill_address.nil?
     @checkout.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @checkout.ship_address.nil?
+    set_validations
   end
 
   def update_before
-    @checkout.enable_validation_group(:address)
-
     #assign order to existing user
     @checkout.order.update_attribute(:user_id, params[:user_id]) unless params[:user_id].blank?
+    set_validations
+  end
+
+  def set_validations
+    @checkout.enable_validation_group(:address) #force validation group here as checkout state could be different
+
+    #need to add email to current validation fields as admin checkout
+    #is handling to validation groups at once register/address
+    @checkout.current_validation_fields << "email"
   end
 end

data/app/controllers/admin/line_items_controller.rb

@@ -59,7 +59,6 @@ class Admin::LineItemsController < Admin::BaseController
       tax_charge.update_attributes(:amount => tax_charge.calculate_tax_charge)
     end
 
-    @order.checkout.enable_validation_group(@order.checkout.state.to_sym)
     @order.update_totals!
 
     unless @order.in_progress?

data/app/controllers/admin/payments_controller.rb

@@ -9,13 +9,13 @@ class Admin::PaymentsController < Admin::BaseController
     build_object
     load_object
 
-    unless object.save
-      response_for :create_fails
-      return
-    end
-
     begin
 
+      unless object.save
+        response_for :create_fails
+        return
+      end
+
       if @order.checkout.state == "complete"
         object.process!
         set_flash :create
@@ -30,8 +30,9 @@ class Admin::PaymentsController < Admin::BaseController
       end
 
     rescue Spree::GatewayError => e
-      flash.now[:error] = "#{e.message}"
-      response_for :create_fails
+      flash[:error] = "#{e.message}"
+      @payment.destroy
+      redirect_to new_object_path
     end
   end
 

data/app/controllers/admin/shipments_controller.rb

@@ -48,7 +48,7 @@ class Admin::ShipmentsController < Admin::BaseController
     @selected_country_id = params[:shipment_presenter][:address_country_id].to_i if params.has_key?('shipment_presenter')
     @selected_country_id ||= @order.bill_address.country_id unless @order.nil? || @order.bill_address.nil?
     @selected_country_id ||= Spree::Config[:default_country_id]
-    @shipping_methods = ShippingMethod.all
+    @shipping_methods = ShippingMethod.all_available(@order, :back_end)
 
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')
     @countries = Checkout.countries.sort

data/app/controllers/checkouts_controller.rb

@@ -23,6 +23,7 @@ class CheckoutsController < Spree::BaseController
   address.edit_hook :set_ip_address
   payment.edit_hook :load_available_payment_methods
   update.before :clear_payments_if_in_payment_state
+  update.after :update_payment_if_order_total_has_changed
 
   # customized verison of the standard r_c update method (since we need to handle gateway errors, etc)
   def update
@@ -30,7 +31,6 @@ 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
@@ -144,7 +144,7 @@ class CheckoutsController < Spree::BaseController
   end
 
   def next_step
-    @checkout.next! 
+    @checkout.next!
     flash[:analytics] = "/checkout/#{object.state}"
     # call edit hooks for this next step since we're going to just render it (instead of issuing a redirect)
     edit_hooks
@@ -156,10 +156,20 @@ class CheckoutsController < Spree::BaseController
   end
 
   def clear_payments_if_in_payment_state
-    if @checkout.payment?
-      @checkout.payments.clear
+    # lets clear payments only if we actually are receiving a payment. Otherwise the payment can get cleared
+    # if we are submitting a blank coupon anytime after the payment has been received. 
+    if @checkout.payment? && params[:checkout] && params[:checkout][:payments_attributes]
+      @checkout.payments.destroy_all
     end
   end
+  
+  def update_payment_if_order_total_has_changed
+     if @checkout.payment
+       @order.reload
+       logger.debug "CHECKOUT PAYMENT #{@checkout.payment.amount.to_s}, ORDER TOTAL: #{@order.total.to_s}"
+       @checkout.payment.update_attribute(:amount, @order.total) if @checkout.payment.amount != @order.total
+     end
+  end
 
   def load_available_payment_methods
     @payment_methods = PaymentMethod.available(:front_end)
@@ -192,7 +202,8 @@ class CheckoutsController < Spree::BaseController
 
   def rate_hash
     begin
-      @checkout.shipping_methods.collect do |ship_method|
+
+      @checkout.shipping_methods(:front_end).collect do |ship_method|
         @checkout.shipment.shipping_method = ship_method
         { :id => ship_method.id,
           :name => ship_method.name,

data/app/controllers/spree/base_controller.rb

@@ -88,7 +88,7 @@ class Spree::BaseController < ActionController::Base
 
   def render_404(exception)
     respond_to do |type|
-      type.html { render :file    => "#{RAILS_ROOT}/public/404.html", :status => "404 Not Found" }
+      type.html { render :file    => "#{Rails.root}/public/404.html", :status => "404 Not Found" }
       type.all  { render :nothing => true,                            :status => "404 Not Found" }
     end
   end
@@ -170,7 +170,7 @@ class Spree::BaseController < ActionController::Base
 
   def get_taxonomies
     @taxonomies ||= Taxonomy.find(:all, :include => {:root => :children})
-    @taxonomies
+    @taxonomies.reject { |t| t.root.nil? }
   end
 
   def current_gateway

data/app/helpers/admin/navigation_helper.rb

@@ -109,7 +109,7 @@ module Admin::NavigationHelper
       s << icon(html_options.delete(:icon)) + ' '
     end
     s << text
-    content_tag('span', s)
+    content_tag('span', raw(s))
   end
 
   def html_options_for_button_link(html_options)

data/app/helpers/checkouts_helper.rb

@@ -22,7 +22,7 @@ module CheckoutsHelper
       # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
       content_tag('li', content_tag('span', text), :class => css_classes.join('-'))
     end
-    content_tag('ol', items.join("\n"), :class => 'progress-steps', :id => "checkout-step-#{@checkout.state}")
+    content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@checkout.state}")
   end
     
   def billing_firstname

data/app/helpers/products_helper.rb

@@ -35,7 +35,7 @@ module ProductsHelper
 
   # converts line breaks in product description into <p> tags (for html display purposes)
   def product_description(product)
-    product.description.gsub(/^(.*)$/, '<p>\1</p>')
+    raw(product.description.gsub(/^(.*)$/, '<p>\1</p>'))
   end
 
   # generates nested url to product based on supplied taxon

data/app/helpers/taxons_helper.rb

@@ -10,7 +10,7 @@ module TaxonsHelper
     else
       crumbs << content_tag(:li, content_tag(:span, t('products')))
     end
-    crumb_list = content_tag(:ul, crumbs.flatten.map{|li| li.mb_chars}.join)
+    crumb_list = content_tag(:ul, raw(crumbs.flatten.map{|li| li.mb_chars}.join))
     content_tag(:div, crumb_list + tag(:br, {:class => 'clear'}, false, true), :class => 'breadcrumbs')
   end
 

data/app/models/address.rb

@@ -17,6 +17,8 @@ class Address < ActiveRecord::Base
   validates_presence_of :phone
   validate :state_name_validate, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
 
+  before_save :clear_invalid_state
+
   def checkouts
     (billing_checkouts + shipping_checkouts).uniq
   end
@@ -91,4 +93,11 @@ class Address < ActiveRecord::Base
   def empty?
     attributes.except("id", "created_at", "updated_at", "order_id", "country_id").all? {|k,v| v.nil?}
   end
+
+  private
+
+  def clear_invalid_state #reset state to nil if it's not from selected country
+    return unless self.state
+    self.state = nil unless self.state.country_id == self.country_id
+  end
 end

data/app/models/checkout.rb

@@ -9,7 +9,7 @@ class Checkout < ActiveRecord::Base
   belongs_to :order
   belongs_to :bill_address, :foreign_key => "bill_address_id", :class_name => "Address"
   belongs_to :ship_address, :foreign_key => "ship_address_id", :class_name => "Address"
-  belongs_to :shipping_method  
+  belongs_to :shipping_method
   has_many :payments, :as => :payable
 
   accepts_nested_attributes_for :bill_address
@@ -18,9 +18,10 @@ class Checkout < ActiveRecord::Base
 
   attr_accessor :coupon_code
   attr_accessor :use_billing
+  attr_accessor :current_validation_fields
 
   validates_presence_of :order_id, :shipping_method_id
-  validates_format_of :email, :with => /^\S+@\S+\.\S+$/, :allow_blank => true
+  validates_format_of :email, :with => /^\S+@\S+\.\S+$/
 
   validation_group :register, :fields => ["email"]
 
@@ -33,6 +34,11 @@ class Checkout < ActiveRecord::Base
                                        "ship_address.zipcode"]
   validation_group :delivery, :fields => ["shipping_method_id"]
 
+
+  def after_initialize
+    enable_validation_group(state.to_sym)
+  end
+
   def completed_at
     order.completed_at
   end
@@ -47,7 +53,7 @@ class Checkout < ActiveRecord::Base
   def valid?
     # will perform partial validation when @checkout.enabled_validation_group :step is called
     result = ar_valid?
-    return result unless validation_group_enabled?
+    return result if @current_validation_fields.nil?
 
     relevant_errors = errors.select { |attr, msg| @current_validation_fields.include?(attr) }
     errors.clear
@@ -71,15 +77,15 @@ class Checkout < ActiveRecord::Base
     state_machine.states.by_priority.map(&:name)
   end
 
-  def shipping_methods
+  def shipping_methods(display_on=nil)
     return [] unless ship_address
-    ShippingMethod.all_available(order)
+    ShippingMethod.all_available(order,display_on)
   end
-  
+
   def payment
     payments.first
   end
-  
+
   private
 
   def check_addresses_on_duplication

data/app/models/creditcard.rb

@@ -3,8 +3,8 @@ class Creditcard < ActiveRecord::Base
 
   before_save :set_last_digits
 
-  validates_numericality_of :month, :integer => true
-  validates_numericality_of :year, :integer => true
+  validates_numericality_of :month, :only_integer => true
+  validates_numericality_of :year, :only_integer => true
   validates_presence_of :number, :unless => :has_payment_profile?, :on => :create
   validates_presence_of :verification_value, :unless => :has_payment_profile?, :on => :create
 

data/app/models/model_cache_cleaner.rb

@@ -0,0 +1,13 @@
+class ModelCacheCleaner < ActiveRecord::Observer
+  observe :shipping_method, :zone
+
+  def after_save(object)
+    return unless Rails.configuration.cache_classes
+    #clear cache collection
+    Rails.cache.delete("#{object.class}.all")
+
+    #pre-warn cache with new data
+    object.class.cached
+  end
+
+end

data/app/models/order.rb

@@ -10,20 +10,20 @@ class Order < ActiveRecord::Base
   after_create :create_checkout, :create_shipment, :create_tax_charge
 
   belongs_to :user
-  has_many :state_events, :as => :stateful
+  has_many :state_events, :as => :stateful, :dependent => :destroy
 
   has_many :line_items, :extend => Totaling, :dependent => :destroy
   has_many :inventory_units
 
   has_many :payments, :as => :payable, :extend => Totaling
 
-  has_one :checkout
+  has_one :checkout, :dependent => :destroy
   has_one :bill_address, :through => :checkout
   has_one :ship_address, :through => :checkout
   has_many :shipments, :dependent => :destroy
   has_many :return_authorizations, :dependent => :destroy
 
-  has_many :adjustments,      :extend => Totaling, :order => :position
+  has_many :adjustments,      :extend => Totaling, :order => :position, :dependent => :destroy
   has_many :charges,          :extend => Totaling, :order => :position
   has_many :credits,          :extend => Totaling, :order => :position
   has_many :shipping_charges, :extend => Totaling, :order => :position
@@ -89,10 +89,10 @@ class Order < ActiveRecord::Base
       transition :to => 'paid', :if => :allow_pay?
     end
     event :under_paid do
-      transition :to => 'balance_due', :from => ['paid', 'new', 'credit_owed', 'shipped', 'awaiting_return']
+      transition :to => 'balance_due', :from => ['paid', 'new', 'credit_owed', 'shipped', 'awaiting_return', 'canceled']
     end
     event :over_paid do
-      transition :to => 'credit_owed', :from => ['paid', 'new', 'balance_due', 'shipped', 'awaiting_return']
+     transition :to => 'credit_owed', :from => ['paid', 'new', 'balance_due', 'shipped', 'awaiting_return', 'canceled']
     end
     event :ship do
       transition :to => 'shipped', :from  => 'paid'
@@ -289,14 +289,12 @@ class Order < ActiveRecord::Base
 
     self.adjustment_total = self.charge_total - self.credit_total
     self.total            = self.item_total   + self.adjustment_total
-    
-    self.checkout.enable_validation_group(:register) unless self.checkout.nil?
   end
 
   def update_totals!
     update_totals
 
-    payments_total = self.payments.total
+    payments_total = self.payments.reload.total
     if payments_total < self.total
       #Total is higher so balance_due
       self.under_paid

data/app/models/payment.rb

@@ -5,14 +5,14 @@ class Payment < ActiveRecord::Base
 
   has_many :transactions
   alias :txns :transactions
-  
+
   after_save :create_payment_profile, :if => :payment_profiles_supported?
   after_save :check_payments, :if => :order_payment?
   after_destroy :check_payments, :if => :order_payment?
 
   accepts_nested_attributes_for :source
-  
-  validate :amount_is_valid_for_outstanding_balance_or_credit, :if => :order_payment? 
+
+  validate :amount_is_valid_for_outstanding_balance_or_credit, :if => :order_payment?
   validates_presence_of :payment_method, :if => Proc.new { |payable| payable.is_a? Checkout }
 
   named_scope :from_creditcard, :conditions => {:source_type => 'Creditcard'}
@@ -27,15 +27,15 @@ class Payment < ActiveRecord::Base
       self.source = payment_method.payment_source_class.new(params)
     end
   end
-  
+
   def process!
     source.process!(self) if source and source.respond_to?(:process!)
-  end  
-  
+  end
+
   def can_finalize?
     !finalized?
   end
-  
+
   def finalize!
     return unless can_finalize?
     source.finalize!(self) if source and source.respond_to?(:finalize!)
@@ -43,7 +43,7 @@ class Payment < ActiveRecord::Base
     save!
     payable.save!
   end
-  
+
   def finalized?
     payable.is_a?(Order)
   end
@@ -54,19 +54,20 @@ class Payment < ActiveRecord::Base
   end
 
   private
-  
+
     def check_payments
       return unless order.checkout_complete
       #sorting by created_at.to_f to ensure millisecond percsision, plus ID - just in case
       events = order.state_events.sort_by { |e| [e.created_at.to_f, e.id] }.reverse
 
-      
+
       if order.returnable_units.nil? && order.return_authorizations.size >0
         order.return!
       elsif events.present? and %w(over_paid under_paid).include?(events.first.name)
         events.each do |event|
-          if %w(shipped paid new).include?(event.previous_state)
-            order.update_attribute("state", event.previous_state)
+          if %w(shipped canceled paid new).include?(event.previous_state)
+            order.pay!
+            order.update_attribute("state", event.previous_state) if %w(shipped canceled returned).include?(event.previous_state)
             return
           end
         end
@@ -74,7 +75,7 @@ class Payment < ActiveRecord::Base
         order.pay!
       end
     end
-  
+
     def amount_is_valid_for_outstanding_balance_or_credit
       if amount < 0
         if amount.abs > order.outstanding_credit
@@ -84,12 +85,12 @@ class Payment < ActiveRecord::Base
         if amount > order.outstanding_balance
           errors.add(:amount, "Is greater than the outstanding balance (#{order.outstanding_balance})")
         end
-      end    
+      end
     end
-  
+
     def order_payment?
       payable_type == "Order"
-    end 
+    end
 
     def payment_profiles_supported?
       source && source.payment_gateway && source.payment_gateway.payment_profiles_supported?
@@ -101,5 +102,5 @@ class Payment < ActiveRecord::Base
     rescue ActiveMerchant::ConnectionError => e
       gateway_error I18n.t(:unable_to_connect_to_gateway)
     end
-  
+
 end