spree_core 1.2.5 → 1.3.0.rc1

data/app/models/spree/country.rb

@@ -4,6 +4,17 @@ module Spree
 
     validates :name, :iso_name, :presence => true
 
+    attr_accessible :name, :iso_name, :states_required
+
+
+    def self.states_required_by_country_id
+      states_required = Hash.new(true)
+      self.all.each { |country|
+        states_required[country.id.to_s]= country.states_required
+      }
+      states_required
+    end
+
     def <=>(other)
       name <=> other.name
     end

data/app/models/spree/credit_card.rb

@@ -14,6 +14,10 @@ module Spree
     attr_accessible :first_name, :last_name, :number, :verification_value, :year,
                     :month, :gateway_customer_profile_id, :gateway_payment_profile_id
 
+    def number=(num)
+      @number = num.gsub(/[^0-9]/, '') rescue nil
+    end
+
     def set_last_digits
       number.to_s.gsub!(/\s/,'')
       verification_value.to_s.gsub!(/\s/,'')
@@ -60,7 +64,7 @@ module Spree
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     def brand
-      spree_cc_type
+      cc_type
     end
 
     scope :with_payment_profile, lambda { where('gateway_customer_profile_id IS NOT NULL') }

data/app/models/spree/gateway.rb

@@ -21,18 +21,12 @@ module Spree
     def provider
       gateway_options = options
       gateway_options.delete :login if gateway_options.has_key?(:login) and gateway_options[:login].nil?
-      if gateway_options[:server]
-        ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
-      end
+      ActiveMerchant::Billing::Base.gateway_mode = gateway_options[:server].to_sym
       @provider ||= provider_class.new(gateway_options)
     end
 
     def options
-      options_hash = {}
-      self.preferences.each do |key, value|
-        options_hash[key.to_sym] = value
-      end
-      options_hash
+      self.preferences.inject({}){ |memo, (key, value)| memo[key.to_sym] = value; memo }
     end
 
     def method_missing(method, *args)

data/app/models/spree/image.rb

@@ -10,7 +10,7 @@ module Spree
                       :default_style => :product,
                       :url => '/spree/products/:id/:style/:basename.:extension',
                       :path => ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      :convert_options => { :all => '-strip -auto-orient' }
+                      :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

@@ -50,7 +50,7 @@ module Spree
       sold = quantity - back_order
 
       #set on_hand if configured
-      if Spree::Config[:track_inventory_levels]
+      if self.track_levels?(variant)
         variant.decrement!(:count_on_hand, quantity)
       end
 
@@ -61,7 +61,7 @@ module Spree
     end
 
     def self.decrease(order, variant, quantity)
-      if Spree::Config[:track_inventory_levels]
+      if self.track_levels?(variant)
         variant.increment!(:count_on_hand, quantity)
       end
 
@@ -70,6 +70,10 @@ module Spree
       end
     end
 
+    def self.track_levels?(variant)
+      Spree::Config[:track_inventory_levels] && !variant.on_demand
+    end
+
     private
       def allow_ship?
         Spree::Config[:allow_backorder_shipping] || self.sold?
@@ -113,7 +117,7 @@ module Spree
       end
 
       def restock_variant
-        if Spree::Config[:track_inventory_levels]
+        if self.class.track_levels?(variant)
           variant.on_hand += 1
           variant.save
         end

data/app/models/spree/line_item.rb

@@ -24,7 +24,10 @@ module Spree
     after_destroy :update_order
 
     def copy_price
-      self.price = variant.price if variant && price.nil?
+      if variant
+        self.price = variant.price if price.nil?
+        self.currency = variant.currency if currency.nil?
+      end
     end
 
     def increment_quantity
@@ -40,6 +43,17 @@ module Spree
     end
     alias total amount
 
+    def single_money
+      Spree::Money.new(price, { :currency => currency })
+    end
+    alias single_display_amount single_money
+
+    def money
+      Spree::Money.new(amount, { :currency => currency })
+    end
+    alias display_total money
+    alias display_amount money
+
     def adjust_quantity
       self.quantity = 0 if quantity.nil? || quantity < 0
     end
@@ -94,7 +108,7 @@ module Spree
       # Validation
       def stock_availability
         return if sufficient_stock?
-        errors.add(:quantity, I18n.t('validation.exceeds_available_stock'))
+        errors.add(:quantity, I18n.t('validation.cannot_be_greater_than_available_stock'))
       end
 
       def quantity_no_less_than_shipped

data/app/models/spree/order.rb

@@ -19,12 +19,12 @@ module Spree
         # Fix for #2191
         if order.shipping_method
           order.create_shipment!
-          order.send(:update_totals)
+          order.update_totals
         end
         order.payment_required?
       }
       go_to_state :confirm, :if => lambda { |order| order.confirmation_required? }
-      go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.payments.exists?) || !order.payment_required? }
+      go_to_state :complete, :if => lambda { |order| (order.payment_required? && order.paid?) || !order.payment_required? }
       remove_transition :from => :delivery, :to => :confirm
     end
 
@@ -32,7 +32,7 @@ module Spree
 
     attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes, :payments_attributes,
                     :ship_address, :bill_address, :line_items_attributes, :number,
-                    :shipping_method_id, :email, :use_billing, :special_instructions
+                    :shipping_method_id, :email, :use_billing, :special_instructions, :currency
 
     if Spree.user_class
       belongs_to :user, :class_name => Spree.user_class.to_s
@@ -49,7 +49,7 @@ module Spree
     belongs_to :shipping_method
 
     has_many :state_changes, :as => :stateful
-    has_many :line_items, :dependent => :destroy
+    has_many :line_items, :dependent => :destroy, :order => "created_at ASC"
     has_many :inventory_units
     has_many :payments, :dependent => :destroy
     has_many :shipments, :dependent => :destroy
@@ -63,6 +63,7 @@ module Spree
     accepts_nested_attributes_for :shipments
 
     # Needs to happen before save_permalink is called
+    before_validation :set_currency
     before_validation :generate_order_number, :on => :create
     before_validation :clone_billing_address, :if => :use_billing?
     attr_accessor :use_billing
@@ -114,8 +115,24 @@ module Spree
       line_items.sum(&:amount)
     end
 
+    def currency
+      self[:currency] || Spree::Config[:currency]
+    end
+
+    def display_outstanding_balance
+      Spree::Money.new(outstanding_balance, { :currency => currency })
+    end
+
+    def display_item_total
+      Spree::Money.new(item_total, { :currency => currency })
+    end
+
+    def display_adjustment_total
+      Spree::Money.new(adjustment_total, { :currency => currency })
+    end
+
     def display_total
-      Spree::Money.new(total)
+      Spree::Money.new(total, { :currency => currency })
     end
 
     def to_param
@@ -195,36 +212,16 @@ module Spree
       totals
     end
 
-    # This is a multi-purpose method for processing logic related to changes in the Order.  It is meant to be called from
-    # various observers so that the Order is aware of changes that affect totals and other values stored in the Order.
-    # This method should never do anything to the Order that results in a save call on the object (otherwise you will end
-    # up in an infinite recursion as the associations try to save and then in turn try to call +update!+ again.)
-    def update!
-      update_totals
-      update_payment_state
-
-      # give each of the shipments a chance to update themselves
-      shipments.each { |shipment| shipment.update!(self) }#(&:update!)
-      update_shipment_state
-      update_adjustments
-      # update totals a second time in case updated adjustments have an effect on the total
-      update_totals
+    def updater
+      OrderUpdater.new(self)
+    end
 
-      update_attributes_without_callbacks({
-        :payment_state => payment_state,
-        :shipment_state => shipment_state,
-        :item_total => item_total,
-        :adjustment_total => adjustment_total,
-        :payment_total => payment_total,
-        :total => total
-      })
-
-      #ensure checkout payment always matches order total
-      if payment and payment.checkout? and payment.amount != total
-        payment.update_attributes_without_callbacks(:amount => total)
-      end
+    def update!
+      updater.update
+    end
 
-      update_hooks.each { |hook| self.send hook }
+    def update_totals
+      updater.update_totals
     end
 
     def clone_billing_address
@@ -251,15 +248,21 @@ module Spree
       return_authorizations.any? { |return_authorization| return_authorization.authorized? }
     end
     
-    def add_variant(variant, quantity = 1)
+    def add_variant(variant, quantity = 1, currency = nil)
       current_item = find_line_item_by_variant(variant)
       if current_item
         current_item.quantity += quantity
+        current_item.currency = currency unless currency.nil?
         current_item.save
       else
         current_item = LineItem.new(:quantity => quantity)
         current_item.variant = variant
-        current_item.price   = variant.price
+        if currency
+          current_item.currency = currency unless currency.nil?
+          current_item.price    = variant.price_in(currency).amount
+        else
+          current_item.price    = variant.price
+        end
         self.line_items << current_item
       end
 
@@ -352,10 +355,6 @@ module Spree
       end
     end
 
-    def can_ship?
-      self.complete? || self.resumed?
-    end
-
     def credit_cards
       credit_card_ids = payments.from_credit_card.map(&:source_id).uniq
       CreditCard.scoped(:conditions => { :id => credit_card_ids })
@@ -371,9 +370,10 @@ module Spree
       adjustments.each { |adjustment| adjustment.update_column('locked', true) }
 
       # update payment and shipment(s) states, and save
-      update_payment_state
+      updater = OrderUpdater.new(self)
+      updater.update_payment_state
       shipments.each { |shipment| shipment.update!(self) }
-      update_shipment_state
+      updater.update_shipment_state
       save
 
       deliver_order_confirmation_email
@@ -388,7 +388,7 @@ module Spree
 
     def deliver_order_confirmation_email
       begin
-        OrderMailer.confirm_email(self.id).deliver
+        OrderMailer.confirm_email(self).deliver
       rescue Exception => e
         logger.error("#{e.class.name}: #{e.message}")
         logger.error(e.backtrace * "\n")
@@ -423,7 +423,8 @@ module Spree
         ShippingRate.new( :id => ship_method.id,
                           :shipping_method => ship_method,
                           :name => ship_method.name,
-                          :cost => cost)
+                          :cost => cost,
+                          :currency => currency)
       end.compact.sort_by { |r| r.cost }
     end
 
@@ -436,7 +437,7 @@ module Spree
     end
 
     def available_payment_methods
-      @available_payment_methods ||= PaymentMethod.available(:front_end)
+      @available_payment_methods ||= PaymentMethod.available
     end
 
     def payment_method
@@ -489,6 +490,7 @@ module Spree
 
     def merge!(order)
       order.line_items.each do |line_item|
+        next unless line_item.currency == currency
         current_line_item = self.line_items.find_by_variant_id(line_item.variant_id)
         if current_line_item
           current_line_item.quantity += line_item.quantity
@@ -519,103 +521,24 @@ module Spree
       checkout_steps.include?(step)
     end
 
+    def state_changed(name)
+      state = "#{name}_state"
+      if persisted?
+        old_state = self.send("#{state}_was")
+        self.state_changes.create({
+          :previous_state => old_state,
+          :next_state     => self.send(state),
+          :name           => name,
+          :user_id        => self.user_id
+        }, :without_protection => true)
+      end
+    end
+
     private
       def link_by_email
         self.email = user.email if self.user
       end
 
-      # Updates the +shipment_state+ attribute according to the following logic:
-      #
-      # shipped   when all Shipments are in the "shipped" state
-      # partial   when at least one Shipment has a state of "shipped" and there is another Shipment with a state other than "shipped"
-      #           or there are InventoryUnits associated with the order that have a state of "sold" but are not associated with a Shipment.
-      # ready     when all Shipments are in the "ready" state
-      # backorder when there is backordered inventory associated with an order
-      # pending   when all Shipments are in the "pending" state
-      #
-      # The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
-      def update_shipment_state
-        self.shipment_state =
-        case shipments.count
-        when 0
-          nil
-        when shipments.shipped.count
-          'shipped'
-        when shipments.ready.count
-          'ready'
-        when shipments.pending.count
-          'pending'
-        else
-          'partial'
-        end
-        self.shipment_state = 'backorder' if backordered?
-
-        if old_shipment_state = self.changed_attributes['shipment_state']
-          self.state_changes.create({
-            :previous_state => old_shipment_state,
-            :next_state     => self.shipment_state,
-            :name           => 'shipment',
-            :user_id        => self.user_id
-          }, :without_protection => true)
-        end
-      end
-
-      # Updates the +payment_state+ attribute according to the following logic:
-      #
-      # paid          when +payment_total+ is equal to +total+
-      # balance_due   when +payment_total+ is less than +total+
-      # credit_owed   when +payment_total+ is greater than +total+
-      # failed        when most recent payment is in the failed state
-      #
-      # 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'
-          self.payment_state = 'failed' if payments.present? and payments.last.state == 'failed'
-        elsif round_money(payment_total) > round_money(total)
-          self.payment_state = 'credit_owed'
-        else
-          self.payment_state = 'paid'
-        end
-
-        if old_payment_state = self.changed_attributes['payment_state']
-          self.state_changes.create({
-            :previous_state => old_payment_state,
-            :next_state     => self.payment_state,
-            :name           => 'payment',
-            :user_id        => self.user_id
-          }, :without_protection => true)
-        end
-      end
-
-      def round_money(n)
-        (n*100).round / 100.0
-      end
-
-      # Updates the following Order total values:
-      #
-      # +payment_total+      The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
-      # +item_total+         The total value of all LineItems
-      # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
-      # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
-      def update_totals
-        # update_adjustments
-        self.payment_total = payments.completed.map(&:amount).sum
-        self.item_total = line_items.map(&:amount).sum
-        self.adjustment_total = adjustments.eligible.map(&:amount).sum
-        self.total = item_total + adjustment_total
-      end
-
-      # Updates each of the Order adjustments.  This is intended to be called from an Observer so that the Order can
-      # respond to external changes to LineItem, Shipment, other Adjustments, etc.
-      # Adjustments will check if they are still eligible. Ineligible adjustments are preserved but not counted
-      # towards adjustment_total.
-      def update_adjustments
-        self.adjustments.reload.each { |adjustment| adjustment.update!(self) }
-      end
-
       # Determine if email is required (we don't want validation errors before we hit the checkout)
       def require_email
         return true unless new_record? or state == 'cart'
@@ -637,7 +560,7 @@ module Spree
         restock_items!
 
         #TODO: make_shipments_pending
-        OrderMailer.cancel_email(self.id).deliver
+        OrderMailer.cancel_email(self).deliver
         unless %w(partial shipped).include?(shipment_state)
           self.payment_state = 'credit_owed'
         end
@@ -662,5 +585,9 @@ module Spree
       def use_billing?
         @use_billing == true || @use_billing == "true" || @use_billing == "1"
       end
+
+      def set_currency
+        self.currency = Spree::Config[:currency] if self[:currency].nil?
+      end
   end
 end