spree_core 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bec161c547d1c0a301e068937cff9a461ff7a6cc
-  data.tar.gz: 5ea11fca1a903043e7776db55c5092a676a31c40
+  metadata.gz: d6877ed94eb40aa392d3e75311ae1c46f07d16c4
+  data.tar.gz: 86f962251bf0d966fce2dc5562a4e537b05db77c
 SHA512:
-  metadata.gz: 1f618e1c470a7a552a2b6b97d72b2702c52d8beba2298d6ab6400982f024a466bc9b857af1e3b447ca5ab8c079d8d44bac78877516baa1a8962ef7f9eac0b244
-  data.tar.gz: 3be703d2a9d163edb81d227463859a7cb5a181091539780f5b0eb4173ad2f69cf8ff74e824361d312e6571ffbbedef6c8f12eb06fb6649cd2902771f5f537754
+  metadata.gz: b9f99321e59660959d319148d1c7deed17c10caedb97e6d29d95dd15c195b2dac43bcfb35d5117c915bc456a1d8c0fb8f2d319971a7bd681f842f77a91ba25b6
+  data.tar.gz: 154ee0e0f7d1bd5fa2ce9bce96008951200122a3c687dfe88b6e75284987bef2c12d464c6bba83a2a97747ccd2e9dae7537b2fddc3a4fb9e9cc924c5c11c8491

data/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name Spree nor the names of its contributors may be used to
+      endorse or promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/app/helpers/spree/taxons_helper.rb

@@ -4,12 +4,12 @@ module Spree
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max=4)
-      products = taxon.active_products.limit(max).uniq
+      products = taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
       if (products.size < max)
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |taxon|
           to_get = max - products.length
-          products += taxon.active_products.where(products_arel[:id].not_in(products.map(&:id))).limit(to_get).uniq
+          products += taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/models/concerns/spree/user_api_authentication.rb

@@ -0,0 +1,13 @@
+module Spree
+  module UserApiAuthentication
+    def generate_spree_api_key!
+      self.spree_api_key = SecureRandom.hex(24)
+      save!
+    end
+
+    def clear_spree_api_key!
+      self.spree_api_key = nil
+      save!
+    end
+  end
+end

data/app/models/concerns/spree/user_reporting.rb

@@ -0,0 +1,27 @@
+module Spree
+  module UserReporting
+    def lifetime_value
+      orders.complete.pluck(:total).sum
+    end
+
+    def display_lifetime_value
+      Spree::Money.new(lifetime_value)
+    end
+
+    def order_count
+      BigDecimal(orders.complete.count)
+    end
+
+    def average_order_value
+      if order_count.to_i > 0
+        lifetime_value / order_count
+      else
+        BigDecimal("0.00")
+      end
+    end
+
+    def display_average_order_value
+      Spree::Money.new(average_order_value)
+    end
+  end
+end

data/app/models/spree/adjustment.rb

@@ -34,14 +34,15 @@ module Spree
         transition from: :open, to: :closed
       end
 
-      event :close do
-        transition from: :close, to: :open
+      event :open do
+        transition from: :closed, to: :open
       end
     end
 
     after_create :update_adjustable_adjustment_total
 
     scope :open, -> { where(state: 'open') }
+    scope :closed, -> { where(state: 'closed') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(adjustable_type: 'Spree::Shipment') }

data/app/models/spree/app_configuration.rb

@@ -58,6 +58,7 @@ module Spree
     preference :orders_per_page, :integer, default: 15
     preference :prices_inc_tax, :boolean, default: false
     preference :products_per_page, :integer, default: 12
+    preference :promotions_per_page, :integer, default: 15
     preference :redirect_https_to_http, :boolean, :default => false
     preference :require_master_price, :boolean, default: true
     preference :shipment_inc_vat, :boolean, default: false

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

@@ -38,7 +38,11 @@ module Spree
     def compute_shipping_rate(shipping_rate)
       if rate.included_in_price
         pre_tax_amount = shipping_rate.cost / (1 + rate.amount)
-        deduced_total_by_rate(pre_tax_amount, rate)
+        if rate.zone == shipping_rate.shipment.order.tax_zone
+          deduced_total_by_rate(pre_tax_amount, rate)
+        else
+          deduced_total_by_rate(pre_tax_amount, rate) * - 1
+        end
       else
         with_tax_amount = shipping_rate.cost * rate.amount
         round_to_two_places(with_tax_amount)

data/app/models/spree/calculator.rb

@@ -10,9 +10,9 @@ module Spree
       computable_name = computable.class.name.demodulize.underscore
       method = "compute_#{computable_name}".to_sym
       calculator_class = self.class
-      begin
+      if respond_to?(method)
         self.send(method, computable)
-      rescue NoMethodError
+      else
         raise NotImplementedError, "Please implement '#{method}(#{computable_name})' in your calculator: #{calculator_class.name}"
       end
     end

data/app/models/spree/credit_card.rb

@@ -1,15 +1,17 @@
 module Spree
   class CreditCard < ActiveRecord::Base
+    belongs_to :payment_method
     has_many :payments, as: :source
 
     before_save :set_last_digits
 
-    attr_accessor :number, :verification_value
+    attr_accessor :number, :verification_value, :encrypted_data
+
+    validates :month, :year, numericality: { only_integer: true }, if: :require_card_numbers?, on: :create
+    validates :number, presence: true, if: :require_card_numbers?, on: :create
+    validates :name, presence: true, if: :require_card_numbers?, on: :create
+    validates :verification_value, presence: true, if: :require_card_numbers?, on: :create
 
-    validates :month, :year, numericality: { only_integer: true }, unless: :has_payment_profile?
-    validates :number, presence: true, unless: :has_payment_profile?, on: :create
-    validates :name, presence: true
-    validates :verification_value, presence: true, unless: :has_payment_profile?, on: :create
     validate :expiry_not_in_the_past
 
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
@@ -118,5 +120,9 @@ module Spree
         end
       end
     end
+
+    def require_card_numbers?
+      !self.encrypted_data.present? && !self.has_payment_profile?
+    end
   end
 end

data/app/models/spree/gateway.rb

@@ -50,5 +50,30 @@ module Spree
       return false unless source.brand
       provider_class.supports?(source.brand)
     end
+
+    def disable_customer_profile(source)
+      if source.is_a? CreditCard
+        source.update_column :gateway_customer_profile_id, nil
+      else
+        raise 'You must implement disable_customer_profile method for this gateway.'
+      end
+    end
+
+    def sources_by_order(order)
+      source_ids = order.payments.where(source_type: payment_source_class.to_s, payment_method_id: self.id).pluck(:source_id).uniq
+      payment_source_class.where(id: source_ids).with_payment_profile
+    end
+
+    def sources_with_profile(order)
+      if order.completed?
+        sources_by_order order
+      else
+        if order.user_id
+          self.credit_cards.where(user_id: order.user_id).with_payment_profile
+        else
+          []
+        end
+      end
+    end
   end
 end

data/app/models/spree/item_adjustments.rb

@@ -7,6 +7,8 @@ module Spree
 
     def initialize(item)
       @item = item
+      # Don't attempt to reload the item from the DB if it's not there
+      @item.reload if @item.persisted?
     end
 
     def update

data/app/models/spree/legacy_user.rb

@@ -2,6 +2,7 @@
 module Spree
   class LegacyUser < ActiveRecord::Base
     include Core::UserAddress
+    include Core::UserPaymentSource
 
     self.table_name = 'spree_users'
 
@@ -9,8 +10,6 @@ module Spree
 
     before_destroy :check_completed_orders
 
-    class DestroyWithOrdersError < StandardError; end
-
     def has_spree_role?(role)
       true
     end
@@ -21,7 +20,7 @@ module Spree
     private
 
       def check_completed_orders
-        raise DestroyWithOrdersError if orders.complete.present?
+        raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
       end
   end
 end

data/app/models/spree/line_item.rb

@@ -22,6 +22,7 @@ module Spree
     validates :price, numericality: true
     validates_with Stock::AvailabilityValidator
 
+    validate :ensure_proper_currency
     before_destroy :update_inventory
 
     after_save :update_inventory
@@ -118,6 +119,12 @@ module Spree
       def create_tax_charge
         Spree::TaxRate.adjust(order, [self])
       end
+
+      def ensure_proper_currency
+        unless currency == order.currency
+          errors.add(:currency, t(:must_match_order_currency))
+        end
+      end
   end
 end
 

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

@@ -81,17 +81,17 @@ module Spree
                 before_transition :from => :address, :do => :create_tax_charge!
               end
 
+              if states[:payment]
+                before_transition :to => :payment, :do => :set_shipments_cost
+                before_transition :to => :payment, :do => :create_tax_charge!
+              end
+
               if states[:delivery]
                 before_transition :to => :delivery, :do => :create_proposed_shipments
                 before_transition :to => :delivery, :do => :ensure_available_shipping_rates
                 before_transition :from => :delivery, :do => :apply_free_shipping_promotions
               end
 
-              if states[:payment]
-                before_transition :to => :payment, :do => :set_shipments_cost
-                before_transition :to => :payment, :do => :create_tax_charge!
-              end
-
               after_transition :to => :complete, :do => :finalize!
               after_transition :to => :resumed,  :do => :after_resume
               after_transition :to => :canceled, :do => :after_cancel
@@ -211,6 +211,20 @@ module Spree
             @updating_params = params
             run_callbacks :updating_from_params do
               attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params) : {}
+
+              # Set existing card after setting permitted parameters because
+              # rails would slice parameters containg ruby objects, apparently
+              if @updating_params[:existing_card].present?
+                credit_card = CreditCard.find(@updating_params[:existing_card])
+                if credit_card.user_id != self.user_id || credit_card.user_id.blank?
+                  raise Core::GatewayError.new Spree.t(:invalid_credit_card)
+                end
+
+                attributes[:payments_attributes].first[:source] = credit_card
+                attributes[:payments_attributes].first[:payment_method_id] = credit_card.payment_method_id
+                attributes[:payments_attributes].first.delete :source_attributes
+              end
+
               success = self.update_attributes(attributes)
             end
             @updating_params = nil
@@ -222,7 +236,6 @@ module Spree
           # attributes for a single payment and its source, discarding attributes
           # for payment methods other than the one selected
           def update_params_payment_source
-            # respond_to check is necessary due to issue described in #2910
             if has_checkout_step?("payment") && self.payment?
               if @updating_params[:payment_source].present?
                 source_params = @updating_params.delete(:payment_source)[@updating_params[:order][:payments_attributes].first[:payment_method_id].underscore]
@@ -237,7 +250,6 @@ module Spree
               end
             end
           end
-
         end
       end
     end

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

@@ -0,0 +1,40 @@
+module Spree
+  class Order < ActiveRecord::Base
+    module CurrencyUpdater
+      extend ActiveSupport::Concern
+
+      included do
+
+        def homogenize_line_item_currencies
+          update_line_item_currencies!
+          update!
+        end
+
+      end
+
+      # Updates prices of order's line items
+      def update_line_item_currencies!
+        line_items.where('currency != ?', currency).each do |line_item|
+          update_line_item_price!(line_item)
+        end
+      end
+
+      # Returns the price object from given item
+      def price_from_line_item(line_item)
+        line_item.variant.prices.where(currency: currency).first
+      end
+
+      # Updates price from given line item
+      def update_line_item_price!(line_item)
+        price = price_from_line_item(line_item)
+
+        if price
+          line_item.update_attributes!(currency: price.currency, price: price.amount)
+        else
+          raise RuntimeError, "no #{currency} price found for #{line_item.product.name} (#{line_item.variant.sku})"
+        end
+      end
+
+    end
+  end
+end

data/app/models/spree/order.rb

@@ -4,13 +4,15 @@ require 'spree/order/checkout'
 module Spree
   class Order < ActiveRecord::Base
     include Checkout
+    include CurrencyUpdater
 
     checkout_flow do
       go_to_state :address
       go_to_state :delivery
-      go_to_state :payment, if: ->(order) {
+      go_to_state :payment, if: ->(order) do
+        order.set_shipments_cost if order.shipments.any?
         order.payment_required?
-      }
+      end
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
       remove_transition from: :delivery, to: :confirm
@@ -68,6 +70,7 @@ module Spree
     attr_accessor :use_billing
 
     before_create :link_by_email
+    before_update :homogenize_line_item_currencies, if: :currency_changed?
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
@@ -489,7 +492,7 @@ module Spree
     # to delivery again so that proper updated shipments are created.
     # e.g. customer goes back from payment step and changes order items
     def ensure_updated_shipments
-      if shipments.any?
+      if shipments.any? && !self.completed?
         self.shipments.destroy_all
         self.update_column(:shipment_total, 0)
         restart_checkout_flow
@@ -559,6 +562,19 @@ module Spree
       update_column(:considered_risky, false)
     end
 
+    # moved from api order_decorator. This is a better place for it.
+    def update_line_items(line_item_params)
+      return if line_item_params.blank?
+      line_item_params.each_value do |attributes|
+        if attributes[:id].present?
+          self.line_items.find(attributes[:id]).update_attributes!(attributes)
+        else
+          self.line_items.create!(attributes)
+        end
+      end
+      self.ensure_updated_shipments
+    end
+
     private
 
       def link_by_email

data/app/models/spree/order_updater.rb

@@ -53,7 +53,7 @@ module Spree
     end
 
     def update_shipment_total
-      order.shipment_total = shipments.sum("cost + promo_total")
+      order.shipment_total = shipments.sum(:cost)
       update_order_total
     end
 

data/app/models/spree/payment.rb

@@ -104,7 +104,7 @@ module Spree
     end
 
     def credit_allowed
-      amount - offsets_total
+      amount - offsets_total.abs
     end
 
     def can_credit?
@@ -116,6 +116,8 @@ module Spree
       return if source_attributes.nil?
       if payment_method and payment_method.payment_source_class
         self.source = payment_method.payment_source_class.new(source_attributes)
+        self.source.payment_method_id = payment_method.id
+        self.source.user_id = self.order.user_id if self.order
       end
     end
 
@@ -159,7 +161,8 @@ module Spree
       end
 
       def create_payment_profile
-        return unless source.is_a?(CreditCard) && source.number && !source.has_payment_profile?
+        return unless source.respond_to?(:has_payment_profile?) && !source.has_payment_profile?
+
         payment_method.create_profile(self)
       rescue ActiveMerchant::ConnectionError => e
         gateway_error e

data/app/models/spree/payment_method.rb

@@ -9,6 +9,7 @@ module Spree
     validates :name, presence: true
 
     has_many :payments, class_name: "Spree::Payment"
+    has_many :credit_cards, class_name: "Spree::CreditCard"
 
     def self.providers
       Rails.application.config.spree.payment_methods

data/app/models/spree/product/scopes.rb

@@ -27,6 +27,15 @@ module Spree
       end
     end
 
+    def self.property_conditions(property)
+      properties = Property.table_name
+      conditions = case property
+      when String   then { "#{properties}.name" => property }
+      when Property then { "#{properties}.id" => property.id }
+      else               { "#{properties}.id" => property.to_i }
+      end
+    end
+
     add_simple_scopes simple_scopes
 
     add_search_scope :ascend_by_master_price do
@@ -83,28 +92,15 @@ module Spree
 
     # a scope that finds all products having property specified by name, object or id
     add_search_scope :with_property do |property|
-      properties = Property.table_name
-      conditions = case property
-      when String   then { "#{properties}.name" => property }
-      when Property then { "#{properties}.id" => property.id }
-      else               { "#{properties}.id" => property.to_i }
-      end
-
-      joins(:properties).where(conditions)
+      joins(:properties).where(property_conditions(property))
     end
 
     # a simple test for product with a certain property-value pairing
     # note that it can test for properties with NULL values, but not for absent values
     add_search_scope :with_property_value do |property, value|
-      properties = Spree::Property.table_name
-      conditions = case property
-      when String   then ["#{properties}.name = ?", property]
-      when Property then ["#{properties}.id = ?", property.id]
-      else               ["#{properties}.id = ?", property.to_i]
-      end
-      conditions = ["#{ProductProperty.table_name}.value = ? AND #{conditions[0]}", value, conditions[1]]
-
-      joins(:properties).where(conditions)
+      joins(:properties)
+        .where("#{ProductProperty.table_name}.value = ?", value)
+        .where(property_conditions(property))
     end
 
     add_search_scope :with_option do |option|

data/app/models/spree/product.rb

@@ -78,6 +78,8 @@ module Spree
     validates :shipping_category_id, presence: true
     validates :slug, length: { minimum: 3 }
 
+    before_validation :normalize_slug, on: :update
+
     attr_accessor :option_values_hash
 
     accepts_nested_attributes_for :product_properties, allow_destroy: true, reject_if: lambda { |pp| pp[:property_name].blank? }
@@ -132,8 +134,11 @@ module Spree
       !!deleted_at
     end
 
+    # determine if product is available.
+    # deleted products and products with nil or future available_on date
+    # are not available
     def available?
-      !(available_on.nil? || available_on.future?)
+      !(available_on.nil? || available_on.future?) && !deleted?
     end
 
     # split variants list into hash which shows mapping of opt value onto matching variants
@@ -188,7 +193,7 @@ module Spree
     end
 
     def possible_promotions
-      promotion_ids = promotion_rules.map(&:activator_id).uniq
+      promotion_ids = promotion_rules.map(&:promotion_id).uniq
       Spree::Promotion.advertised.where(id: promotion_ids).reject(&:expired?)
     end
 
@@ -208,6 +213,9 @@ module Spree
     end
 
     private
+      def normalize_slug
+        self.slug = normalize_friendly_id(slug)
+      end
 
       # Builds variants from a hash of option types & values
       def build_variants_from_option_values_hash

data/app/models/spree/promotion/actions/free_shipping.rb

@@ -4,8 +4,6 @@ module Spree
       class FreeShipping < Spree::PromotionAction
         def perform(payload={})
           order = payload[:order]
-
-          label = "#{Spree.t(:promotion)} (#{promotion.name})"
           results = order.shipments.map do |shipment|
             return false if promotion_credit_exists?(shipment)
             shipment.adjustments.create!(
@@ -21,6 +19,10 @@ module Spree
           results.any? { |r| r == true }
         end
 
+        def label
+          "#{Spree.t(:promotion)} (#{promotion.name})"
+        end
+
         def compute_amount(shipment)
           shipment.cost * -1
         end

data/app/models/spree/promotion/rules/product.rb

@@ -6,7 +6,6 @@ module Spree
     module Rules
       class Product < PromotionRule
         has_and_belongs_to_many :products, class_name: '::Spree::Product', join_table: 'spree_products_promotion_rules', foreign_key: 'promotion_rule_id'
-        validate :only_one_promotion_per_product
 
         MATCH_POLICIES = %w(any all)
         preference :match_policy, :string, default: MATCH_POLICIES.first
@@ -36,14 +35,6 @@ module Spree
         def product_ids_string=(s)
           self.product_ids = s.to_s.split(',').map(&:strip)
         end
-
-        private
-
-          def only_one_promotion_per_product
-            if Spree::Promotion::Rules::Product.all.map(&:products).flatten.uniq!
-              errors[:base] << "You can't create two promotions for the same product"
-            end
-          end
       end
     end
   end

data/app/models/spree/promotion.rb

@@ -40,7 +40,7 @@ module Spree
     end
 
     def expired?
-      starts_at && Time.now < starts_at || expires_at && Time.now > expires_at
+      !!(starts_at && Time.now < starts_at || expires_at && Time.now > expires_at)
     end
 
     def activate(payload)