spree_core 1.2.0 → 1.2.2

data/app/controllers/spree/home_controller.rb

@@ -5,6 +5,7 @@ module Spree
 
     def index
       @searcher = Spree::Config.searcher_class.new(params)
+      @searcher.current_user = try_spree_current_user
       @products = @searcher.retrieve_products
       respond_with(@products)
     end

data/app/controllers/spree/orders_controller.rb

@@ -1,5 +1,7 @@
 module Spree
   class OrdersController < BaseController
+    ssl_required :show
+
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/products'
 
@@ -13,9 +15,18 @@ module Spree
     def update
       @order = current_order
       if @order.update_attributes(params[:order])
-        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+        @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
-        respond_with(@order) { |format| format.html { redirect_to cart_path } }
+        respond_with(@order) do |format|
+          format.html do
+            if params.has_key?(:checkout)
+              @order.next_transition.run_callbacks
+              redirect_to checkout_state_path(@order.checkout_steps.first)
+            else
+              redirect_to cart_path
+            end
+          end
+        end
       else
         respond_with(@order)
       end
@@ -64,8 +75,10 @@ module Spree
       redirect_to spree.cart_path
     end
 
-    def accurate_titles
-      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
-    end
+    private
+
+      def accurate_title
+        @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+      end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -8,6 +8,7 @@ module Spree
 
     def index
       @searcher = Config.searcher_class.new(params)
+      @searcher.current_user = try_spree_current_user
       @products = @searcher.retrieve_products
       respond_with(@products)
     end

data/app/controllers/spree/taxons_controller.rb

@@ -10,6 +10,7 @@ module Spree
       return unless @taxon
 
       @searcher = Spree::Config.searcher_class.new(params.merge(:taxon => @taxon.id))
+      @searcher.current_user = try_spree_current_user
       @products = @searcher.retrieve_products
 
       respond_with(@taxon)

data/app/helpers/spree/admin/general_settings_helper.rb

@@ -6,7 +6,7 @@ module Spree
           iso = details[:iso_code]
           [iso, "#{details[:name]} (#{iso})"]
         end
-        options_from_collection_for_select(currencies, :first, :last)
+        options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency])
       end
     end
   end

data/app/helpers/spree/base_helper.rb

@@ -87,7 +87,7 @@ module Spree
     end
 
     def flash_messages(opts = {})
-      opts[:ignore_types] = [:commerce_tracking].concat(opts[:ignore_types] || [])
+      opts[:ignore_types] = [:commerce_tracking].concat(Array(opts[:ignore_types]) || [])
 
       flash.each do |msg_type, text|
         unless opts[:ignore_types].include?(msg_type)

data/app/models/spree/ability.rb

@@ -51,6 +51,11 @@ module Spree
           order.user == user || order.token && token == order.token
         end
         can :create, Order
+
+        can :read, Address do |address|
+          address.user == user
+        end
+
         #############################
         can :read, Product
         can :index, Product

data/app/models/spree/app_configuration.rb

@@ -42,6 +42,7 @@ module Spree
     preference :company, :boolean, :default => false # Request company field for billing and shipping addr
     preference :create_inventory_units, :boolean, :default => true # should only be false when track_inventory_levels is false, also disables RMA's
     preference :currency, :string, :default => "USD"
+    preference :currency_symbol_position, :string, :default => "before"
     preference :display_currency, :boolean, :default => false
     preference :default_country_id, :integer, :default => 214
     preference :default_locale, :string, :default => Rails.application.config.i18n.default_locale || :en

data/app/models/spree/calculator/price_sack.rb

@@ -1,4 +1,6 @@
 require_dependency 'spree/calculator'
+# For #to_d method on Ruby 1.8
+require 'bigdecimal/util'
 
 module Spree
   class Calculator::PriceSack < Calculator
@@ -17,12 +19,12 @@ module Spree
     # as object we always get line items, as calculable we have Coupon, ShippingMethod
     def compute(object)
       if object.is_a?(Array)
-        base = object.map { |o| o.respond_to?(:amount) ? o.amount : o.to_d }.sum
+        base = object.map { |o| o.respond_to?(:amount) ? o.amount : BigDecimal(o.to_s) }.sum
       else
-        base = object.respond_to?(:amount) ? object.amount : object.to_d
+        base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
       end
 
-      if base >= self.preferred_minimal_amount
+      if base < self.preferred_minimal_amount
         self.preferred_normal_amount
       else
         self.preferred_discount_amount

data/app/models/spree/credit_card.rb

@@ -1,6 +1,6 @@
 module Spree
   class CreditCard < ActiveRecord::Base
-    has_many :payments
+    has_many :payments, :as => :source
 
     before_save :set_last_digits
     after_validation :set_card_type
@@ -63,7 +63,7 @@ module Spree
       cc_type
     end
 
-    scope :with_payment_profile, where('gateway_customer_profile_id IS NOT NULL')
+    scope :with_payment_profile, lambda { where('gateway_customer_profile_id IS NOT NULL') }
 
     def actions
       %w{capture void credit}

data/app/models/spree/image.rb

@@ -9,7 +9,8 @@ module Spree
                       :styles => { :mini => '48x48>', :small => '100x100>', :product => '240x240>', :large => '600x600>' },
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
-                      :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension'
+                      :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension',
+                      :convert_options => { :all => '-strip' }
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
     after_post_process :find_dimensions

data/app/models/spree/inventory_unit.rb

@@ -5,7 +5,13 @@ module Spree
     belongs_to :shipment
     belongs_to :return_authorization
 
-    scope :backorder, where(:state => 'backordered')
+    scope :backordered, lambda { where(:state => 'backordered') }
+    scope :shipped, lambda { where(:state => 'shipped') }
+
+    def self.backorder
+      warn "[SPREE] Spree::InventoryUnit.backorder will be deprecated in Spree 1.3. Please use Spree::Product.backordered instead."
+      backordered
+    end
 
     attr_accessible :shipment
 
@@ -107,8 +113,10 @@ module Spree
       end
 
       def restock_variant
-        variant.on_hand += 1
-        variant.save
+        if Spree::Config[:track_inventory_levels]
+          variant.on_hand += 1
+          variant.save
+        end
       end
   end
 end

data/app/models/spree/line_item.rb

@@ -10,7 +10,7 @@ module Spree
     before_validation :copy_price
 
     validates :variant, :presence => true
-    validates :quantity, :numericality => { :only_integer => true, :message => I18n.t('validation.must_be_int') }
+    validates :quantity, :numericality => { :only_integer => true, :message => I18n.t('validation.must_be_int'), :greater_than => -1 }
     validates :price, :numericality => true
     validate :stock_availability
     validate :quantity_no_less_than_shipped
@@ -80,6 +80,7 @@ module Spree
 
       def update_order
         # update the order totals, etc.
+        order.create_tax_charge!
         order.update!
       end
 
@@ -97,7 +98,7 @@ module Spree
       end
 
       def quantity_no_less_than_shipped
-        already_shipped = order.shipments.reduce(0) { |acc,s| acc + s.inventory_units.select { |i| i.variant == variant }.count }
+        already_shipped = order.shipments.reduce(0) { |acc, s| acc + s.inventory_units.shipped.where(:variant_id => variant_id).count }
         unless quantity >= already_shipped
           errors.add(:quantity, I18n.t('validation.cannot_be_less_than_shipped_units'))
         end

data/app/models/spree/order.rb

@@ -63,7 +63,6 @@ module Spree
     before_create :link_by_email
     after_create :create_tax_charge!
 
-    # TODO: validate the format of the email as well (but we can't rely on authlogic anymore to help with validation)
     validates :email, :presence => true, :email => true, :if => :require_email
     validate :has_available_shipment
     validate :has_available_payment
@@ -128,6 +127,7 @@ module Spree
 
     # Is this a free order in which case the payment step should be skipped
     def payment_required?
+      update_totals
       total.to_f > 0.0
     end
 
@@ -144,7 +144,7 @@ module Spree
     # Indicates whether there are any backordered InventoryUnits associated with the Order.
     def backordered?
       return false unless Spree::Config[:track_inventory_levels]
-      inventory_units.backorder.present?
+      inventory_units.backordered.present?
     end
 
     # Returns the relevant zone (if any) to be used for taxation purposes.  Uses default tax zone
@@ -230,7 +230,7 @@ module Spree
 
     def allow_cancel?
       return false unless completed? and state != 'canceled'
-      %w{ready backorder pending}.include? shipment_state
+      shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)
     end
 
     def allow_resume?
@@ -239,6 +239,10 @@ module Spree
       true
     end
 
+    def awaiting_returns?
+      return_authorizations.any? { |return_authorization| return_authorization.authorized? }
+    end
+    
     def add_variant(variant, quantity = 1)
       current_item = find_line_item_by_variant(variant)
       if current_item
@@ -350,8 +354,16 @@ module Spree
     def finalize!
       touch :completed_at
       InventoryUnit.assign_opening_inventory(self)
-      # lock any optional adjustments (coupon promotions, etc.)
-      adjustments.optional.each { |adjustment| adjustment.update_column('locked', true) }
+
+      # lock all adjustments (coupon promotions, etc.)
+      adjustments.each { |adjustment| adjustment.update_column('locked', true) }
+
+      # update payment and shipment(s) states, and save
+      update_payment_state
+      shipments.each { |shipment| shipment.update!(self) }
+      update_shipment_state
+      save
+
       deliver_order_confirmation_email
 
       self.state_changes.create({
@@ -379,8 +391,23 @@ module Spree
     end
 
     def rate_hash
-      @rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
-        next unless cost = ship_method.calculator.compute(self)
+      return @rate_hash if @rate_hash.present?
+
+      # reserve one slot for each shipping method computation
+      computed_costs = Array.new(available_shipping_methods(:front_end).size)
+
+      # create all the threads and kick off their execution
+      threads = available_shipping_methods(:front_end).each_with_index.map do |ship_method, index|
+        Thread.new { computed_costs[index] = [ship_method, ship_method.calculator.compute(self)] }
+      end      
+
+      # wait for all threads to finish
+      threads.map(&:join)
+
+      # now consolidate and memoize the threaded results
+      @rate_hash ||= computed_costs.map do |pair|
+        ship_method,cost = *pair
+        next unless cost
         ShippingRate.new( :id => ship_method.id,
                           :shipping_method => ship_method,
                           :name => ship_method.name,
@@ -408,9 +435,21 @@ module Spree
       end
     end
 
+    def pending_payments
+      payments.select {|p| p.state == "checkout"}
+    end
+
     def process_payments!
       begin
-        payments.each(&:process!)
+        pending_payments.each do |payment|
+          break if payment_total >= total
+
+          payment.process!
+
+          if payment.completed?
+            self.payment_total += payment.amount
+          end
+        end
       rescue Core::GatewayError
         !!Spree::Config[:allow_checkout_on_gateway_error]
       end
@@ -428,6 +467,10 @@ module Spree
       line_items.map { |li| li.variant.product }
     end
 
+    def variants
+      line_items.map(&:variant)
+    end
+
     def insufficient_stock_lines
       line_items.select &:insufficient_stock?
     end
@@ -505,7 +548,7 @@ module Spree
       #
       # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
       def update_payment_state
-        
+
         #line_item are empty when user empties cart
         if self.line_items.empty? || round_money(payment_total) < round_money(total)
           self.payment_state = 'balance_due'

data/app/models/spree/order/checkout.rb

@@ -51,7 +51,7 @@ module Spree
               end
 
               event :return do
-                transition :to => :returned, :from => :awaiting_return
+                transition :to => :returned, :from => :awaiting_return, :unless => :awaiting_returns?
               end
 
               event :resume do
@@ -64,7 +64,7 @@ module Spree
 
               before_transition :to => :complete do |order|
                 begin
-                  order.process_payments!
+                  order.process_payments! if order.payment_required?
                 rescue Spree::Core::GatewayError
                   !!Spree::Config[:allow_checkout_on_gateway_error]
                 end
@@ -83,15 +83,12 @@ module Spree
 
           def self.go_to_state(name, options={})
             self.checkout_steps[name] = options
+            previous_states.each do |state|
+              add_transition({:from => state, :to => name}.merge(options))
+            end
             if options[:if]
-              previous_states.each do |state|
-                add_transition({:from => state, :to => name}.merge(options))
-              end
               self.previous_states << name
             else
-              previous_states.each do |state|
-                add_transition({:from => state, :to => name}.merge(options))
-              end
               self.previous_states = [name]
             end
           end

data/app/models/spree/payment.rb

@@ -18,7 +18,7 @@ module Spree
 
     attr_accessible :amount, :payment_method_id, :source_attributes
 
-    scope :from_credit_card, where(:source_type => 'Spree::CreditCard')
+    scope :from_credit_card, lambda { where(:source_type => 'Spree::CreditCard') }
     scope :with_state, lambda { |s| where(:state => s) }
     scope :completed, with_state('completed')
     scope :pending, with_state('pending')

data/app/models/spree/payment/processing.rb

@@ -28,6 +28,7 @@ module Spree
       end
 
       def capture!
+        return true if completed?
         protect_from_connection_error do
           check_environment
 
@@ -47,6 +48,7 @@ module Spree
       end
 
       def void_transaction!
+        return true if void?
         protect_from_connection_error do
           check_environment
 
@@ -104,6 +106,25 @@ module Spree
       credit!(amount)
     end
 
+    def gateway_options
+      options = { :email    => order.email,
+                  :customer => order.email,
+                  :ip       => '192.168.1.100', # TODO: Use an actual IP
+                  :order_id => order.number }
+
+      options.merge!({ :shipping => order.ship_total * 100,
+                       :tax      => order.tax_total * 100,
+                       :subtotal => order.item_total * 100 })
+      
+      options.merge!({ :currency => payment_method.preferences[:currency_code] }) if payment_method && payment_method.preferences[:currency_code]
+
+      options.merge!({ :billing_address  => order.bill_address.try(:active_merchant_hash),
+                      :shipping_address => order.ship_address.try(:active_merchant_hash) })
+
+      options.merge!(:discount => promo_total) if respond_to?(:promo_total)
+      options
+    end
+
     private
 
     def gateway_action(source, action, success_state)
@@ -136,22 +157,6 @@ module Spree
       log_entries.create({:details => response.to_yaml}, :without_protection => true)
     end
 
-    def gateway_options
-      options = { :email    => order.email,
-                  :customer => order.email,
-                  :ip       => '192.168.1.100', # TODO: Use an actual IP
-                  :order_id => order.number }
-
-      options.merge!({ :shipping => order.ship_total * 100,
-                       :tax      => order.tax_total * 100,
-                       :subtotal => order.item_total * 100 })
-      
-      options.merge!({ :currency => payment_method.preferences[:currency_code] }) if payment_method && payment_method.preferences[:currency_code]
-
-      options.merge({ :billing_address  => order.bill_address.try(:active_merchant_hash),
-                      :shipping_address => order.ship_address.try(:active_merchant_hash) })
-    end
-
     def protect_from_connection_error
       begin
         yield