spree_core 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8c2bb0d1d4f097b6846f78ba702a63d4db3b3f
-  data.tar.gz: daa9817909d9e8867c3ab1df1d9f975f5118afdd
+  metadata.gz: b435838b2a77628006e2e2885f5dbe2039958630
+  data.tar.gz: 1df2bcec2ac50c9d4716017752eb8c56ab2f9960
 SHA512:
-  metadata.gz: c79a195b6bc5781a8e1ea6551eb7adbf21f94c1ebf641e86db28407355bbbddeba7e133e972971e43dcebbf593822fa015a60ea53d9b6f24ea402bc264853737
-  data.tar.gz: 19d02ac7c62b7b1e70a2c585a6bdae432ccf9c2d1bf5678459882506f2bc5e9962f459b34aff64f8aeb8968ef7b3274c1f9871be482de13b93dd1da0482a7553
+  metadata.gz: 1154f9c96163b14b0f85379e73718b6e5a95a6b60688399df8b724e109880d1e21deb4dbd77d44ae8dd29fe1cd98bd563d74c6ce191ac89eff57424dba437602
+  data.tar.gz: 5d008b1beae9dc20bf209bcc59063debee39ae36c6426569f970af0aad14b64287b61f9bed6454190e694ce96cb9b145be04b15066bc8abc80da9fb3c91c21fe

data/app/controllers/spree/base_controller.rb

@@ -5,6 +5,9 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::RespondWith
   include Spree::Core::ControllerHelpers::SSL
   include Spree::Core::ControllerHelpers::Common
+  include Spree::Core::ControllerHelpers::Search
 
   respond_to :html
 end
+
+require 'spree/i18n/initializer'

data/app/helpers/spree/base_helper.rb

@@ -165,13 +165,6 @@ module Spree
       end
     end
 
-    def t(*args)
-      puts "WARNING: Spree's translations are now scoped to a 'spree' namespace. Please use the Spree.t helper."
-      puts "Called from: #{caller[0]}"
-      I18n.t(*args)
-    end
-
-
     private
 
     # Returns style of image or nil
@@ -182,15 +175,26 @@ module Spree
       end
     end
 
+    def create_product_image_tag(image, product, options, style)
+      options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
+      image_tag image.attachment.url(style), options
+    end
+
     def define_image_method(style)
       self.class.send :define_method, "#{style}_image" do |product, *options|
         options = options.first || {}
         if product.images.empty?
-          image_tag "noimage/#{style}.png", options
+          if !product.is_a?(Spree::Variant) && !product.variant_images.empty?
+            create_product_image_tag(product.variant_images.first, product, options, style)
+          else
+            if product.is_a?(Variant) && !product.product.variant_images.empty?
+              create_product_image_tag(product.product.variant_images.first, product, options, style)
+            else
+              image_tag "noimage/#{style}.png", options
+            end
+          end
         else
-          image = product.images.first
-          options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
-          image_tag image.attachment.url(style), options
+          create_product_image_tag(product.images.first, product, options, style)
         end
       end
     end

data/app/models/spree/adjustment.rb

@@ -58,6 +58,7 @@ module Spree
     scope :charge, -> { where('amount >= 0') }
     scope :credit, -> { where('amount < 0') }
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
+    scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
 
     # Update the boolean _eligible_ attribute which determines which adjustments
     # count towards the order's adjustment_total.
@@ -82,6 +83,10 @@ module Spree
     # record from db for the association
     def update!
       return if immutable?
+      # Fix for #3381
+      # If we attempt to call 'source' before the reload, then source is currently
+      # the order object. After calling a reload, the source is the Shipment.
+      reload
       originator.update_adjustment(self, source) if originator.present?
       set_eligibility
     end

data/app/models/spree/app_configuration.rb

@@ -22,7 +22,7 @@ module Spree
 
     # Alphabetized to more easily lookup particular preferences
     preference :address_requires_state, :boolean, default: true # should state/state_name be required
-    preference :admin_interface_logo, :string, default: 'admin/bg/spree_50.png'
+    preference :admin_interface_logo, :string, default: 'logo/spree_50.png'
     preference :admin_products_per_page, :integer, default: 10
     preference :allow_backorder_shipping, :boolean, default: false # should only be true if you don't need to track inventory
     preference :allow_checkout_on_gateway_error, :boolean, default: false
@@ -51,7 +51,7 @@ module Spree
     preference :hide_cents, :boolean, default: false
     preference :last_check_for_spree_alerts, :string, default: nil
     preference :layout, :string, default: 'spree/layouts/spree_application'
-    preference :logo, :string, default: 'admin/bg/spree_50.png'
+    preference :logo, :string, default: 'logo/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
     preference :orders_per_page, :integer, default: 15
     preference :prices_inc_tax, :boolean, default: false
@@ -68,7 +68,7 @@ module Spree
     preference :site_name, :string, default: 'Spree Demo Site'
     preference :site_url, :string, default: 'demo.spreecommerce.com'
     preference :tax_using_ship_address, :boolean, default: true
-    preference :track_inventory_levels, :boolean, default: true # will not track on_hand values for variants /products
+    preference :track_inventory_levels, :boolean, default: true # Determines whether to track on_hand values for variants / products.
 
     # Preferences related to image settings
     preference :attachment_default_url, :string, default: '/spree/products/:id/:style/:basename.:extension'

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

@@ -24,7 +24,7 @@ module Spree
 
       def compute_order(order)
         matched_line_items = order.line_items.select do |line_item|
-          line_item.product.tax_category == rate.tax_category
+          line_item.tax_category == rate.tax_category
         end
 
         line_items_total = matched_line_items.sum(&:total)
@@ -32,7 +32,7 @@ module Spree
       end
 
       def compute_line_item(line_item)
-        if line_item.product.tax_category == rate.tax_category
+        if line_item.tax_category == rate.tax_category
           if rate.included_in_price
             deduced_total_by_rate(line_item.total, rate)
           else

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

@@ -1,10 +1,10 @@
 module Spree
 
   # A calculator for promotions that calculates a percent-off discount
-  # for all matching products in an order. This should not be used as a 
+  # for all matching products in an order. This should not be used as a
   # shipping calculator since it would be the same thing as a flat percent
   # off the entire order.
-  
+
   class Calculator::PercentPerItem < Calculator
     preference :percent, :decimal, :default => 0
 
@@ -23,10 +23,14 @@ module Spree
 
   private
 
-    # Returns all products that match the promotion's rule. 
+    # Returns all products that match this calculator, but only if the calculator
+    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
+    # Copied from per_item.rb
     def matching_products
-      @matching_products ||= if compute_on_promotion?
-        self.calculable.promotion.rules.map(&:products).flatten
+      if compute_on_promotion?
+        self.calculable.promotion.rules.map do |rule|
+          rule.respond_to?(:products) ? rule.products : []
+        end.flatten
       end
     end
 

data/app/models/spree/calculator.rb

@@ -21,7 +21,7 @@ module Spree
 
     # Returns all calculators applicable for kind of work
     def self.calculators
-      Rails.application.config.spree.calculators.all
+      Rails.application.config.spree.calculators
     end
 
     def to_s

data/app/models/spree/credit_card.rb

@@ -10,6 +10,7 @@ module Spree
     validates :month, :year, numericality: { only_integer: true }
     validates :number, presence: true, unless: :has_payment_profile?, on: :create
     validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
+    validate :expiry_not_in_the_past
 
     attr_accessible :first_name, :last_name, :number, :verification_value, :year,
                     :month, :gateway_customer_profile_id, :gateway_payment_profile_id
@@ -30,6 +31,19 @@ module Spree
       end
     end
 
+    # Some payment gateways, such as USA EPay, only support an ActiveMerchant::Billing::CreditCard
+    # object, rather than an object *like* that. So we need to convert it.
+    def to_active_merchant
+      ActiveMerchant::Billing::CreditCard.new(
+        :number => number,
+        :month => month,
+        :year => year,
+        :verification_value => verification_value,
+        :first_name => first_name,
+        :last_name => last_name
+        )
+    end
+
     # sets self.cc_type while we still have the card number
     def set_card_type
       self.cc_type ||= CardDetector.brand?(number)
@@ -87,5 +101,16 @@ module Spree
       return 'visa' if Rails.env.development?
       cc_type
     end
+
+    private
+
+    def expiry_not_in_the_past
+      if year && month
+        time = "#{year}-#{month}-1".to_time
+        if time < Time.zone.now.beginning_of_month
+          errors.add(:base, :card_expired)
+        end
+      end
+    end
   end
 end

data/app/models/spree/line_item.rb

@@ -3,11 +3,13 @@ module Spree
     before_validation :adjust_quantity
     belongs_to :order, class_name: "Spree::Order"
     belongs_to :variant, class_name: "Spree::Variant"
+    belongs_to :tax_category, class_name: "Spree::TaxCategory"
 
     has_one :product, through: :variant
     has_many :adjustments, as: :adjustable, dependent: :destroy
 
     before_validation :copy_price
+    before_validation :copy_tax_category
 
     validates :variant, presence: true
     validates :quantity, numericality: {
@@ -30,10 +32,17 @@ module Spree
     def copy_price
       if variant
         self.price = variant.price if price.nil?
+        self.cost_price = variant.cost_price if cost_price.nil?
         self.currency = variant.currency if currency.nil?
       end
     end
 
+    def copy_tax_category
+      if variant
+        self.tax_category = variant.product.tax_category
+      end
+    end
+
     def increment_quantity
       ActiveSupport::Deprecation.warn("[SPREE] Spree::LineItem#increment_quantity will be deprecated in Spree 2.1, please use quantity.increment! instead.")
       self.quantity.increment!

data/app/models/spree/new_adjustment.rb

@@ -0,0 +1,4 @@
+module Spree
+  class NewAdjustment < ActiveRecord::Base
+  end
+end

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

@@ -63,15 +63,14 @@ module Spree
                 transition :to => :awaiting_return
               end
 
+
               before_transition :to => :complete do |order|
-                begin
-                  order.process_payments! if order.payment_required?
-                rescue Spree::Core::GatewayError
-                  !!Spree::Config[:allow_checkout_on_gateway_error]
-                end
+                order.process_payments! if order.payment_required?
               end
+              before_transition :from => :cart, :do => :ensure_line_items_present
 
               before_transition :to => :delivery, :do => :create_proposed_shipments
+              before_transition :to => :delivery, :do => :ensure_available_shipping_rates
 
               after_transition :to => :complete, :do => :finalize!
               after_transition :to => :delivery, :do => :create_tax_charge!

data/app/models/spree/order.rb

@@ -20,9 +20,7 @@ module Spree
         order.payment_required?
       }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
-      go_to_state :complete, if: ->(order) {
-        (order.payment_required? && order.has_unprocessed_payments?) || !order.payment_required?
-      }
+      go_to_state :complete
       remove_transition from: :delivery, to: :confirm
     end
 
@@ -30,16 +28,17 @@ module Spree
 
     attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes,
                     :payments_attributes, :ship_address, :bill_address, :currency,
-                    :payments_attributes, :line_items_attributes, :number, :email,
-                    :use_billing, :special_instructions, :shipments_attributes,
-                    :coupon_code
+                    :line_items_attributes, :number, :email, :use_billing, 
+                    :special_instructions, :shipments_attributes, :coupon_code
 
     attr_reader :coupon_code
 
     if Spree.user_class
       belongs_to :user, class_name: Spree.user_class.to_s
+      belongs_to :created_by, class_name: Spree.user_class.to_s
     else
       belongs_to :user
+      belongs_to :created_by
     end
 
     belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
@@ -49,17 +48,21 @@ module Spree
     alias_attribute :shipping_address, :ship_address
 
     has_many :state_changes, as: :stateful
-    has_many :line_items, dependent: :destroy, order: 'created_at ASC'
-    has_many :payments, dependent: :destroy
+    has_many :line_items, dependent: :destroy, order: "#{Spree::LineItem.table_name}.created_at ASC"
+    has_many :payments, dependent: :destroy, :class_name => "Spree::Payment"
 
-    has_many :shipments, dependent: :destroy do
+    has_many :shipments, dependent: :destroy, :class_name => "Shipment" do
       def states
         pluck(:state).uniq
       end
     end
 
     has_many :return_authorizations, dependent: :destroy
-    has_many :adjustments, as: :adjustable, dependent: :destroy, order: 'created_at ASC'
+    has_many :adjustments, 
+      as: :adjustable,
+      dependent: :destroy,
+      order: "#{Spree::Adjustment.table_name}.created_at ASC",
+      inverse_of: :source
 
     accepts_nested_attributes_for :line_items
     accepts_nested_attributes_for :bill_address
@@ -175,13 +178,6 @@ module Spree
       payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
     end
 
-    # Used by the checkout state machine to check for unprocessed payments
-    # The Order should be unable to proceed to complete if there are unprocessed
-    # payments and there is payment required.
-    def has_unprocessed_payments?
-      payments.with_state('checkout').reload.exists?
-    end
-
     # Indicates the number of items in the order
     def item_count
       line_items.inject(0) { |sum, li| sum + li.quantity }
@@ -406,7 +402,7 @@ module Spree
 
     # Helper methods for checkout steps
     def paid?
-      payment_state == 'paid'
+      payment_state == 'paid' || payment_state == 'credit_owed'
     end
 
     def available_payment_methods
@@ -417,8 +413,23 @@ module Spree
       payments.select(&:checkout?)
     end
 
+    # processes any pending payments and must return a boolean as it's
+    # return value is used by the checkout state_machine to determine
+    # success or failure of the 'complete' event for the order
+    #
+    # Returns:
+    # - true if all pending_payments processed successfully
+    # - true if a payment failed, ie. raised a GatewayError
+    #   which gets rescued and converted to TRUE when
+    #   :allow_checkout_gateway_error is set to true
+    # - false if a payment failed, ie. raised a GatewayError
+    #   which gets rescued and converted to FALSE when
+    #   :allow_checkout_on_gateway_error is set to false
+    #
     def process_payments!
-      begin
+      if pending_payments.empty?
+        raise Core::GatewayError.new Spree.t(:no_pending_payments)
+      else
         pending_payments.each do |payment|
           break if payment_total >= total
 
@@ -428,9 +439,10 @@ module Spree
             self.payment_total += payment.amount
           end
         end
-      rescue Core::GatewayError
-        !!Spree::Config[:allow_checkout_on_gateway_error]
       end
+    rescue Core::GatewayError => e
+      result = !!Spree::Config[:allow_checkout_on_gateway_error]
+      errors.add(:base, e.message) and return result
     end
 
     def billing_firstname
@@ -504,10 +516,13 @@ module Spree
     end
 
     # Tells us if there if the specified promotion is already associated with the order
-    # regardless of whether or not its currently eligible.  Useful because generally
-    # you would only want a promotion to apply to order no more than once.
-    def promotion_credit_exists?(promotion)
-      !! adjustments.promotion.reload.detect { |credit| credit.originator.promotion.id == promotion.id }
+    # regardless of whether or not its currently eligible. Useful because generally
+    # you would only want a promotion action to apply to order no more than once.
+    #
+    # Receives an adjustment +originator+ (here a PromotionAction object) and tells
+    # if the order has adjustments from that already
+    def promotion_credit_exists?(originator)
+      !! adjustments.promotion.reload.detect { |credit| credit.originator.id == originator.id }
     end
 
     def promo_total
@@ -540,6 +555,12 @@ module Spree
         return true unless new_record? or state == 'cart'
       end
 
+      def ensure_line_items_present
+        unless line_items.present?
+          errors.add(:base, Spree.t(:there_are_no_items_for_this_order)) and return false
+        end
+      end
+
       def has_available_shipment
         return unless has_step?("delivery")
         return unless address?
@@ -547,6 +568,12 @@ module Spree
         # errors.add(:base, :no_shipping_methods_available) if available_shipping_methods.empty?
       end
 
+      def ensure_available_shipping_rates
+        if shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
+          errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
+        end
+      end
+
       def has_available_payment
         return unless delivery?
         # errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?

data/app/models/spree/order_contents.rb

@@ -6,21 +6,22 @@ module Spree
       @order = order
     end
 
+    # Get current line item for variant if exists
+    # Add variant qty to line_item
     def add(variant, quantity, currency=nil, shipment=nil)
-      #get current line item for variant if exists
       line_item = order.find_line_item_by_variant(variant)
-
-      #add variant qty to line_item
       add_to_line_item(line_item, variant, quantity, currency, shipment)
     end
 
+    # Get current line item for variant
+    # Remove variant qty from line_item
     def remove(variant, quantity, shipment=nil)
-      #get current line item for variant
       line_item = order.find_line_item_by_variant(variant)
 
-      #TODO raise exception if line_item is nil
+      unless line_item
+        raise ActiveRecord::RecordNotFound, "Line item not found for variant #{variant.sku}"
+      end
 
-      #remove variant qty from line_item
       remove_from_line_item(line_item, variant, quantity, shipment)
     end
 
@@ -29,7 +30,7 @@ module Spree
     def add_to_line_item(line_item, variant, quantity, currency=nil, shipment=nil)
       if line_item
         line_item.target_shipment = shipment
-        line_item.quantity += quantity
+        line_item.quantity += quantity.to_i
         line_item.currency = currency unless currency.nil?
         line_item.save
       else

data/app/models/spree/order_inventory.rb

@@ -6,10 +6,13 @@ module Spree
       @order = order
     end
 
-    # Only verify inventory for completed orders
-    # as carts have inventory assigned via create_proposed_shipment methh
+    # Only verify inventory for completed orders (as orders in frontend checkout
+    # have inventory assigned via +order.create_proposed_shipment+) or when
+    # shipment is explicitly passed
     #
-    # or when shipment is explicitly passed
+    # In case shipment is passed the stock location should only unstock or
+    # restock items if the order is completed. That is so because stock items
+    # are always unstocked when the order is completed through +shipment.finalize+
     def verify(line_item, shipment = nil)
       if order.completed? || shipment.present?
 
@@ -51,7 +54,6 @@ module Spree
     #
     # first unshipped that already includes this variant
     # first unshipped that's leaving from a stock_location that stocks this variant
-    #
     def determine_target_shipment(variant)
       shipment = order.shipments.detect do |shipment|
         (shipment.ready? || shipment.pending?) && shipment.include?(variant)
@@ -63,7 +65,6 @@ module Spree
     end
 
     def add_to_shipment(shipment, variant, quantity)
-      #create inventory_units
       on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
       on_hand.times do
@@ -76,11 +77,11 @@ module Spree
                                          state: 'backordered'}, without_protection: true)
       end
 
-
       # adding to this shipment, and removing from stock_location
-      shipment.stock_location.unstock variant, quantity, shipment
+      if order.completed?
+        shipment.stock_location.unstock(variant, quantity, shipment)
+      end
 
-      # return quantity added
       quantity
     end
 
@@ -99,14 +100,13 @@ module Spree
         removed_quantity += 1
       end
 
-      if shipment.inventory_units.count == 0
-        shipment.destroy
-      end
+      shipment.destroy if shipment.inventory_units.count == 0
 
       # removing this from shipment, and adding to stock_location
-      shipment.stock_location.restock variant, removed_quantity, shipment
+      if order.completed?
+        shipment.stock_location.restock variant, removed_quantity, shipment
+      end
 
-      # return quantity removed
       removed_quantity
     end
   end

data/app/models/spree/order_populator.rb

@@ -46,22 +46,12 @@ module Spree
 
       variant = Spree::Variant.find(variant_id)
       if quantity > 0
-        if check_stock_levels(variant, quantity)
-          @order.contents.add(variant, quantity, currency)
+        line_item = @order.contents.add(variant, quantity, currency)
+        unless line_item.valid?
+          errors.add(:base, line_item.errors.messages.values.join(" "))
+          return false
         end
       end
     end
-
-    def check_stock_levels(variant, quantity)
-      display_name = %Q{#{variant.name}}
-      display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
-
-      if Stock::Quantifier.new(variant).can_supply? quantity
-        true
-      else
-        errors.add(:base, Spree.t(:out_of_stock, :scope => :order_populator, :item => display_name.inspect))
-        return false
-      end
-    end
   end
 end

data/app/models/spree/order_updater.rb

@@ -131,7 +131,7 @@ module Spree
       # This promotion provides the most discount, and if two promotions
       # have the same amount, then it will pick the latest one.
       def choose_best_promotion_adjustment
-        if best_promotion_adjustment = order.adjustments.promotion.reorder("amount ASC, created_at DESC").first
+        if best_promotion_adjustment = order.adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
           other_promotions = order.adjustments.promotion.where("id NOT IN (?)", best_promotion_adjustment.id)
           other_promotions.update_all(eligible: false)
         end

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

@@ -154,6 +154,11 @@ module Spree
         unless response.authorization.nil?
           self.response_code = response.authorization
           self.avs_response = response.avs_result['code']
+
+          if response.cvv_result
+            self.cvv_response_code = response.cvv_result['code']
+            self.cvv_response_message = response.cvv_result['message']
+          end
         end
         self.send("#{success_state}!")
       else

data/app/models/spree/payment.rb

@@ -2,12 +2,13 @@ module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
     belongs_to :order, class_name: 'Spree::Order'
-    belongs_to :source, polymorphic: true, validate: true
+    belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
     has_many :offsets, class_name: "Spree::Payment", foreign_key: :source_id, conditions: "source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'"
     has_many :log_entries, as: :source
 
+    before_validation :validate_source
     before_save :set_unique_identifier
 
     after_save :create_payment_profile, if: :profiles_supported?
@@ -105,6 +106,16 @@ module Spree
 
     private
 
+      def validate_source
+        if source && !source.valid?
+          source.errors.each do |field, error|
+            field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
+            self.errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}")
+          end
+        end
+        return !errors.present?
+      end
+
       def profiles_supported?
         payment_method.respond_to?(:payment_profiles_supported?) && payment_method.payment_profiles_supported?
       end

data/app/models/spree/payment_method.rb

@@ -1,5 +1,6 @@
 module Spree
   class PaymentMethod < ActiveRecord::Base
+    acts_as_paranoid
     DISPLAY = [:both, :front_end, :back_end]
     default_scope where(deleted_at: nil)
 
@@ -39,10 +40,6 @@ module Spree
       type.demodulize.downcase
     end
 
-    def destroy
-      touch :deleted_at
-    end
-
     def self.find_with_destroyed *args
       self.with_exclusive_scope { find(*args) }
     end