spree_core 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba580156220b00d34fc3e53b377d8cc18c1b5e40
-  data.tar.gz: b1da5a7c06ce42c05cfd85b3f26d2b794fc8c6cd
+  metadata.gz: 830a074cf4aa461f6a0048f7b0578b50bec34123
+  data.tar.gz: 89b65b78a3b6402475e921f6adfd77e0cbb1556c
 SHA512:
-  metadata.gz: 4f7cd56bd89e16dbe00265c7d2c61c26dd8740118afceff4716b08af953f8cadd2189c831c3411913802ab2799a80b3a8c29a3de2d8118b6f767fc09361515fd
-  data.tar.gz: a45727d4f2c709b5e072a92f6cd2098b0b95165c43b5039d3d7c2a6bed127d4a792e43a90a80ff060c45a18f332716bb2d94899c54c748a592980d62b67149c2
+  metadata.gz: 68771092861e282cbb550d6eadad20cbe20b30d79d26edeb213cffb2a4f34156a77526d60c82f6021b7358833375aa7d2c6b1e045ce371ad06bca4c6b7212c32
+  data.tar.gz: a597449e89e72c2c27f60e3b3c92cc5edccfa43f8827441f5d2497ef5f6f2ab3c16745a4522f81facd00383d718d9ad243a624268e5a380b2e6f98ed01d785e2

data/app/models/spree/adjustment.rb

@@ -60,7 +60,7 @@ module Spree
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
     scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
-    scope :included, -> { where(included: true)  }
+    scope :is_included, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
 
     def closed?

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

@@ -10,7 +10,11 @@ module Spree
     end
 
     def compute(object=nil)
-      self.preferred_amount
+      if object && preferred_currency.upcase == object.currency.upcase
+        preferred_amount
+      else
+        0
+      end
     end
   end
 end

data/app/models/spree/classification.rb

@@ -3,9 +3,9 @@ module Spree
     self.table_name = 'spree_products_taxons'
     acts_as_list scope: :taxon
     belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications
-    belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications
+    belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications, touch: true
 
     # For #3494
-    validates_uniqueness_of :taxon_id, :scope => :product_id, :message => :already_linked
+    validates_uniqueness_of :taxon_id, scope: :product_id, message: :already_linked
   end
 end

data/app/models/spree/inventory_unit.rb

@@ -26,7 +26,7 @@ module Spree
       event :fill_backorder do
         transition to: :on_hand, from: :backordered
       end
-      after_transition on: :fill_backorder, do: :update_order
+      after_transition on: :fill_backorder, do: :fulfill_order
 
       event :ship do
         transition to: :shipped, if: :allow_ship?
@@ -86,9 +86,9 @@ module Spree
         self.on_hand?
       end
 
-      def update_order
+      def fulfill_order
         self.reload
-        order.update!
+        order.fulfill!
       end
 
       def percentage_of_line_item

data/app/models/spree/item_adjustments.rb

@@ -52,7 +52,7 @@ module Spree
       additional_tax_total = 0
       run_callbacks :tax_adjustments do
         tax = (item.respond_to?(:all_adjustments) ? item.all_adjustments : item.adjustments).tax
-        included_tax_total = tax.included.reload.map(&:update!).compact.sum
+        included_tax_total = tax.is_included.reload.map(&:update!).compact.sum
         additional_tax_total = tax.additional.reload.map(&:update!).compact.sum
       end
 

data/app/models/spree/order.rb

@@ -41,9 +41,9 @@ module Spree
 
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
     alias_attribute :shipping_address, :ship_address
-
     alias_attribute :ship_total, :shipment_total
 
+    belongs_to :store, class_name: 'Spree::Store'
     has_many :state_changes, as: :stateful
     has_many :line_items, -> { order("#{LineItem.table_name}.created_at ASC") }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
@@ -349,7 +349,7 @@ module Spree
     end
 
     def outstanding_balance
-      if self.state == 'canceled' && self.payments.present? && self.payments.completed.size > 0
+      if state == 'canceled'
         -1 * payment_total
       else
         total - payment_total
@@ -404,6 +404,12 @@ module Spree
       consider_risk
     end
 
+    def fulfill!
+      shipments.each { |shipment| shipment.update!(self) if shipment.persisted? }
+      updater.update_shipment_state
+      save!
+    end
+
     def deliver_order_confirmation_email
       OrderMailer.confirm_email(self.id).deliver
       update_column(:confirmation_delivered, true)

data/app/models/spree/order_populator.rb

@@ -10,6 +10,7 @@ module Spree
     end
 
     def populate(variant_id, quantity, options = {})
+      ActiveSupport::Deprecation.warn "OrderPopulator is deprecated and will be removed from Spree 3, use OrderContents with order.contents.add instead.", caller
       # protect against passing a nil hash being passed in
       # due to an empty params[:options]
       attempt_cart_add(variant_id, quantity, options || {})

data/app/models/spree/order_updater.rb

@@ -59,7 +59,7 @@ module Spree
     end
 
     def update_payment_total
-      order.payment_total = payments.completed.sum(:amount)
+      order.payment_total = payments.completed.includes(:refunds).inject(0) { |sum, payment| sum + payment.amount - payment.refunds.sum(:amount) }
     end
 
     def update_shipment_total
@@ -158,9 +158,7 @@ module Spree
       last_state = order.payment_state
       if payments.present? && payments.valid.size == 0
         order.payment_state = 'failed'
-      elsif !payments.present? && order.state == 'canceled'
-        order.payment_state = 'void'
-      elsif order.state == 'canceled' && order.payment_total == 0 && payments.completed.size > 0
+      elsif order.state == 'canceled' && order.payment_total == 0
         order.payment_state = 'void'
       else
         order.payment_state = 'balance_due' if order.outstanding_balance > 0

data/app/models/spree/payment.rb

@@ -30,7 +30,6 @@ module Spree
     attr_accessor :source_attributes, :request_env
 
     after_initialize :build_source
-    after_rollback :persist_invalid
 
     validates :amount, numericality: true
 
@@ -55,12 +54,6 @@ module Spree
       response_code
     end
 
-    def persist_invalid
-      return unless ['failed', 'invalid'].include?(state)
-      state_will_change!
-      save
-    end
-
     # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :checkout do
       # With card payments, happens before purchase or authorization happens
@@ -163,8 +156,12 @@ module Spree
       return true
     end
 
+    def captured_amount
+      capture_events.sum(:amount)
+    end
+
     def uncaptured_amount
-      amount - capture_events.sum(:amount)
+      amount - captured_amount
     end
 
     private
@@ -204,8 +201,22 @@ module Spree
         end
       end
 
+      def split_uncaptured_amount
+        if uncaptured_amount > 0
+          order.payments.create! amount: uncaptured_amount,
+                                 avs_response: avs_response,
+                                 cvv_response_code: cvv_response_code,
+                                 cvv_response_message: cvv_response_message,
+                                 payment_method: payment_method,
+                                 response_code: response_code,
+                                 source: source,
+                                 state: 'pending'
+          update_attributes(amount: captured_amount)
+        end
+      end
+
       def update_order
-        if self.completed?
+        if completed? || void?
           order.updater.update_payment_total
         end
 

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

@@ -19,10 +19,11 @@ module Spree
       end
 
       # Takes the amount in cents to capture.
-      # Can be used to capture partial amounts of a payment.
-      def capture!(amount=nil)
-        amount ||= money.money.cents
+      # Can be used to capture partial amounts of a payment, and will create
+      # a new pending payment record for the remaining amount to capture later.
+      def capture!(amount = nil)
         return true if completed?
+        amount ||= money.money.cents
         started_processing!
         protect_from_connection_error do
           check_environment
@@ -32,9 +33,9 @@ module Spree
             response_code,
             gateway_options
           )
-
           money = ::Money.new(amount, currency)
           capture_events.create!(amount: money.to_f)
+          split_uncaptured_amount
           handle_response(response, :complete, :failure)
         end
       end

data/app/models/spree/product.rb

@@ -255,7 +255,7 @@ module Spree
 
     def ensure_master
       return unless new_record?
-      self.master ||= Variant.new
+      self.master ||= build_master
     end
 
     def normalize_slug

data/app/models/spree/promotion.rb

@@ -147,7 +147,21 @@ module Spree
     end
 
     def used_by?(user, excluded_orders = [])
-      orders.where.not(id: excluded_orders.map(&:id)).complete.where(user_id: user.id).exists?
+      [
+        :adjustments,
+        :line_item_adjustments,
+        :shipment_adjustments
+      ].any? do |adjustment_type|
+        user.orders.complete.joins(adjustment_type).where(
+          spree_adjustments: {
+            source_type: 'Spree::PromotionAction',
+            source_id: actions.map(&:id),
+            eligible: true
+          }
+        ).where.not(
+          id: excluded_orders.map(&:id)
+        ).any?
+      end
     end
 
     private

data/app/models/spree/promotion_handler/free_shipping.rb

@@ -2,15 +2,18 @@ module Spree
   module PromotionHandler
     # Used for activating promotions with shipping rules
     class FreeShipping
-      attr_reader :order
+      attr_reader :order, :order_promo_ids
       attr_accessor :error, :success
 
       def initialize(order)
         @order = order
+        @order_promo_ids = order.promotions.pluck(:id)
       end
 
       def activate
         promotions.each do |promotion|
+          next if promotion.code.present? && !order_promo_ids.include?(promotion.id)
+
           if promotion.eligible?(order)
             promotion.activate(order: order)
           end
@@ -19,13 +22,12 @@ module Spree
 
       private
 
-        def promotions
-          Spree::Promotion.active.where({
-            :id => Spree::Promotion::Actions::FreeShipping.pluck(:promotion_id),
-            :code => nil,
-            :path => nil
-          })
-        end
+      def promotions
+        Spree::Promotion.active.where(
+          id: Spree::Promotion::Actions::FreeShipping.pluck(:promotion_id),
+          path: nil
+        )
+      end
     end
   end
 end

data/app/models/spree/reimbursement.rb

@@ -1,6 +1,6 @@
 module Spree
   class Reimbursement < Spree::Base
-    class IncompleteReimbursement < StandardError; end
+    class IncompleteReimbursementError < StandardError; end
 
     belongs_to :order, inverse_of: :reimbursements
     belongs_to :customer_return, inverse_of: :reimbursements, touch: true
@@ -112,7 +112,7 @@ module Spree
       else
         errored!
         reimbursement_failure_hooks.each { |h| h.call self }
-        raise IncompleteReimbursement, Spree.t("validation.unpaid_amount_not_zero", amount: unpaid_amount)
+        raise IncompleteReimbursementError, Spree.t("validation.unpaid_amount_not_zero", amount: unpaid_amount)
       end
     end
 

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -2,6 +2,7 @@ module Spree
   class ReturnItem::EligibilityValidator::Default < Spree::ReturnItem::EligibilityValidator::BaseValidator
     class_attribute :permitted_eligibility_validators
     self.permitted_eligibility_validators = [
+                                              ReturnItem::EligibilityValidator::OrderCompleted,
                                               ReturnItem::EligibilityValidator::TimeSincePurchase,
                                               ReturnItem::EligibilityValidator::RMARequired,
                                             ]

data/app/models/spree/return_item/eligibility_validator/order_completed.rb

@@ -0,0 +1,16 @@
+module Spree
+  class ReturnItem::EligibilityValidator::OrderCompleted < Spree::ReturnItem::EligibilityValidator::BaseValidator
+    def eligible_for_return?
+      if @return_item.inventory_unit.order.completed?
+        return true
+      else
+        add_error(:order_not_completed, Spree.t('return_item_order_not_completed'))
+        return false
+      end
+    end
+
+    def requires_manual_intervention?
+      false
+    end
+  end
+end

data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb

@@ -1,7 +1,7 @@
 module Spree
   class ReturnItem::EligibilityValidator::TimeSincePurchase < Spree::ReturnItem::EligibilityValidator::BaseValidator
     def eligible_for_return?
-      if (@return_item.inventory_unit.created_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.now
+      if (@return_item.inventory_unit.order.completed_at + Spree::Config[:return_eligibility_number_of_days].days) > Time.now
         return true
       else
         add_error(:number_of_days, Spree.t('return_item_time_period_ineligible'))

data/app/models/spree/return_item/exchange_variant_eligibility/same_product.rb

@@ -1,9 +1,8 @@
 module Spree
   module ReturnItem::ExchangeVariantEligibility
     class SameProduct
-
       def self.eligible_variants(variant)
-        Spree::Variant.where(product_id: variant.product_id, is_master: false).in_stock
+        Spree::Variant.where(product_id: variant.product_id, is_master: variant.is_master?).in_stock
       end
     end
   end

data/app/models/spree/shipment.rb

@@ -159,7 +159,7 @@ module Spree
     end
 
     def item_cost
-      line_items.map(&:amount).sum
+      line_items.map(&:final_amount).sum
     end
 
     def line_items
@@ -188,33 +188,26 @@ module Spree
       pending_payments =  order.pending_payments
                             .sort_by(&:uncaptured_amount).reverse
 
-      # NOTE Do we really need to force orders to have pending payments on dispatch?
-      if pending_payments.empty?
-        raise Spree::Core::GatewayError, Spree.t(:no_pending_payments)
-      else
-        shipment_to_pay = final_price_with_items
-        payments_amount = 0
-
-        payments_pool = pending_payments.each_with_object([]) do |payment, pool|
-          next if payments_amount >= shipment_to_pay
-          payments_amount += payment.uncaptured_amount
-          pool << payment
-        end
+      shipment_to_pay = final_price_with_items
+      payments_amount = 0
 
-        payments_pool.each do |payment|
-          capturable_amount = if payment.amount >= shipment_to_pay
-                                shipment_to_pay
-                              else
-                                payment.amount
-                              end
-          cents = (capturable_amount * 100).to_i
-          payment.capture!(cents)
-          shipment_to_pay -= capturable_amount
-        end
+      payments_pool = pending_payments.each_with_object([]) do |payment, pool|
+        break if payments_amount >= shipment_to_pay
+        payments_amount += payment.uncaptured_amount
+        pool << payment
+      end
+
+      payments_pool.each do |payment|
+        capturable_amount = if payment.amount >= shipment_to_pay
+                              shipment_to_pay
+                            else
+                              payment.amount
+                            end
+
+        cents = (capturable_amount * 100).to_i
+        payment.capture!(cents)
+        shipment_to_pay -= capturable_amount
       end
-    rescue Spree::Core::GatewayError => e
-      errors.add(:base, e.message)
-      return !!Spree::Config[:allow_checkout_on_gateway_error]
     end
 
     def ready_or_pending?
@@ -285,7 +278,7 @@ module Spree
 
     def to_package
       package = Stock::Package.new(stock_location)
-      inventory_units.group_by(&:state).each do |state, state_inventory_units|
+      inventory_units.includes(:variant).joins(:variant).group_by(&:state).each do |state, state_inventory_units|
         package.add_multiple state_inventory_units, state.to_sym
       end
       package

data/app/models/spree/shipping_category.rb

@@ -2,7 +2,7 @@ module Spree
   class ShippingCategory < Spree::Base
     validates :name, presence: true
     has_many :products, inverse_of: :shipping_category
-    has_many :shipping_method_categories, inverse_of: :shipping_method
+    has_many :shipping_method_categories, inverse_of: :shipping_category
     has_many :shipping_methods, through: :shipping_method_categories
   end
 end

data/app/models/spree/stock/inventory_unit_builder.rb

@@ -8,10 +8,19 @@ module Spree
       def units
         @order.line_items.flat_map do |line_item|
           line_item.quantity.times.map do |i|
-            @order.inventory_units.build(
+            @order.inventory_units.includes(
+              variant: {
+                product: {
+                  shipping_category: {
+                    shipping_methods: [:calculator, { zones: :zone_members }]
+                  }
+                }
+              }
+            ).build(
               pending: true,
               variant: line_item.variant,
-              line_item: line_item
+              line_item: line_item,
+              order: @order
             )
           end
         end

data/app/models/spree/stock/package.rb

@@ -58,7 +58,7 @@ module Spree
       end
 
       def currency
-        #TODO calculate from first variant?
+        order.currency
       end
 
       def shipping_categories

data/app/models/spree/taxon.rb

@@ -15,6 +15,7 @@ module Spree
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
 
+    after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy
 
     has_attached_file :icon,
@@ -89,7 +90,7 @@ module Spree
       # Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
       self.class.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.now)
       # Have taxonomy touch happen in #touch_ancestors_and_taxonomy rather than association option in order for imports to override.
-      taxonomy.touch
+      taxonomy.try!(:touch)
     end
   end
 end

data/app/models/spree/variant.rb

@@ -84,6 +84,11 @@ module Spree
       values.to_sentence({ words_connector: ", ", two_words_connector: ", " })
     end
 
+    # Default to master name
+    def exchange_name
+      is_master? ? name : options_text
+    end
+
     # use deleted? rather than checking the attribute directly. this
     # allows extensions to override deleted? if they want to provide
     # their own definition.

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

@@ -1,7 +1,10 @@
 module Spree
   class Variant < Spree::Base
     #FIXME WARNING tested only under sqlite and postgresql
-    scope :descend_by_popularity, -> { order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC") }
+    scope :descend_by_popularity, -> {
+      ActiveSupport::Deprecation.warn "Variant.descend_by_popularity is deprecated and will be removed from Spree 3.", caller
+      order("COALESCE((SELECT COUNT(*) FROM  #{LineItem.quoted_table_name} GROUP BY #{LineItem.quoted_table_name}.variant_id HAVING #{LineItem.quoted_table_name}.variant_id = #{Variant.quoted_table_name}.id), 0) DESC")
+    }
 
     class << self
       # Returns variants that match a given option value
@@ -10,6 +13,7 @@ module Spree
       #
       # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
       def has_option(option_type, *option_values)
+        ActiveSupport::Deprecation.warn "Variant.descend_by_popularity is deprecated and will be removed from Spree 3.", caller
         option_types = OptionType.table_name
 
         option_type_conditions = case option_type

data/config/initializers/user_class_extensions.rb

@@ -21,7 +21,7 @@ Spree::Core::Engine.config.to_prepare do
       end
 
       def last_incomplete_spree_order
-        spree_orders.incomplete.where(user_id: self.id).order('created_at DESC').first
+        spree_orders.incomplete.order('created_at DESC').first
       end
     end
   end

data/config/locales/en.yml

@@ -633,6 +633,7 @@ en:
     display: Display
     display_currency: Display currency
     edit: Edit
+    editing_country: Editing Country
     editing_option_type: Editing Option Type
     editing_payment_method: Editing Payment Method
     editing_product: Editing Product
@@ -957,7 +958,7 @@ en:
     order_number: Order %{number}
     order_populator:
       out_of_stock: ! '%{item} is out of stock.'
-      selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'
+      selected_quantity_not_available: ! 'selected of %{item} is not available.'
       please_enter_reasonable_quantity: Please enter a reasonable quantity.
     order_processed_successfully: Your order has been processed successfully
     order_resumed: Order resumed
@@ -1147,6 +1148,9 @@ en:
     return_authorization_reasons: Return Authorization Reasons
     return_authorization_updated: Return authorization updated
     return_authorizations: Return Authorizations
+    return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
+    return_item_inventory_unit_reimbursed: Return item's inventory unit is already reimbursed
+    return_item_order_not_completed: Return item's order must be completed
     return_item_rma_ineligible: Return item requires an RMA
     return_item_time_period_ineligible: Return item is outside the eligible time period
     return_items: Return Items
@@ -1347,7 +1351,9 @@ en:
     usage_limit: Usage Limit
     use_app_default: Use App Default
     use_billing_address: Use Billing Address
+    use_existing_cc: Use an existing card on file
     use_new_cc: Use a new card
+    use_new_cc_or_payment_method: Use a new card / payment method
     use_s3: Use Amazon S3 For Images
     user: User
     user_rule:

data/db/migrate/20130807024301_upgrade_adjustments.rb

@@ -9,13 +9,14 @@ class UpgradeAdjustments < ActiveRecord::Migration
       # Account for possible invalid data
       next if adjustment.source.nil?
       adjustment.source.update_column(:cost, adjustment.amount)
-      adjustment.destroy
+      adjustment.destroy!
     end
 
     # Tax adjustments have their sources altered
     Spree::Adjustment.where(:originator_type => "Spree::TaxRate").find_each do |adjustment|
-      adjustment.source = adjustment.originator
-      adjustment.save
+      adjustment.source_id = adjustment.originator_id
+      adjustment.source_type = "Spree::TaxRate"
+      adjustment.save!
     end
 
     # Promotion adjustments have their source altered also
@@ -33,7 +34,7 @@ class UpgradeAdjustments < ActiveRecord::Migration
         # Fail silently. This is primarily in instances where the calculator no longer exists
       end
 
-      adjustment.save
+      adjustment.save!
     end
   end
 end

data/lib/spree/core/search/base.rb

@@ -41,11 +41,24 @@ module Spree
           end
 
           def add_eagerload_scopes scope
-            if include_images
-              scope.includes({master: [:prices, :images]})
-            else
-              scope.includes(master: :prices)
-            end
+            # TL;DR Switch from `preload` to `includes` as soon as Rails starts honoring
+            # `order` clauses on `has_many` associations when a `where` constraint
+            # affecting a joined table is present (see
+            # https://github.com/rails/rails/issues/6769).
+            #
+            # Ideally this would use `includes` instead of `preload` calls, leaving it
+            # up to Rails whether associated objects should be fetched in one big join
+            # or multiple independent queries. However as of Rails 4.1.8 any `order`
+            # defined on `has_many` associations are ignored when Rails builds a join
+            # query.
+            #
+            # Would we use `includes` in this particular case, Rails would do
+            # separate queries most of the time but opt for a join as soon as any
+            # `where` constraints affecting joined tables are added to the search;
+            # which is the case as soon as a taxon is added to the base scope.
+            scope = scope.preload(master: :prices)
+            scope = scope.preload(master: :images) if include_images
+            scope
           end
 
           def add_search_scopes(base_scope)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.2"
+    "2.4.3"
   end
 end

data/lib/spree/testing_support/factories/address_factory.rb

@@ -7,8 +7,8 @@ FactoryGirl.define do
     address2 'Northwest'
     city 'Herndon'
     zipcode '35005'
-    phone '123-456-7890'
-    alternative_phone '123-456-7899'
+    phone '555-555-0199'
+    alternative_phone '555-555-0199'
 
     state { |address| address.association(:state) }
     country do |address|

data/lib/spree/testing_support/factories/calculator_factory.rb

@@ -9,4 +9,12 @@ FactoryGirl.define do
 
   factory :default_tax_calculator, class: Spree::Calculator::DefaultTax do
   end
+
+  factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
+    after(:create) { |c| c.set_preference(:amount, 10.0) }
+  end
+
+  factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
+    after(:create) { |c| c.set_preference(:amount, 0) }
+  end
 end

data/lib/spree/testing_support/factories/credit_card_factory.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12
-    year { Time.now.year }
+    year { 1.year.from_now.year }
     number '4111111111111111'
     name 'Spree Commerce'
     association(:payment_method, factory: :credit_card_payment_method)

data/lib/spree/testing_support/factories/order_factory.rb

@@ -4,6 +4,7 @@ FactoryGirl.define do
     bill_address
     completed_at nil
     email { user.email }
+    store
 
     transient do
       line_items_price BigDecimal.new(10)

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -6,6 +6,13 @@ FactoryGirl.define do
     order
     state 'checkout'
     response_code '12345'
+
+    factory :payment_with_refund do
+      state 'completed'
+      after :create do |payment|
+        create(:refund, amount: 5, payment: payment)
+      end
+    end
   end
 
   factory :check_payment, class: Spree::Payment do

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -23,11 +23,12 @@ FactoryGirl.define do
       after(:create) do |promotion, evaluator|
         calculator = Spree::Calculator::FlatRate.new
         calculator.preferred_amount = evaluator.weighted_order_adjustment_amount
-        action = Spree::Promotion::Actions::CreateAdjustment.create!(:calculator => calculator)
+        action = Spree::Promotion::Actions::CreateAdjustment.create!(calculator: calculator)
         promotion.actions << action
         promotion.save!
       end
     end
+    factory :promotion_with_order_adjustment, traits: [:with_order_adjustment]
 
     trait :with_item_total_rule do
       transient do
@@ -45,6 +46,7 @@ FactoryGirl.define do
         promotion.save!
       end
     end
+    factory :promotion_with_item_total_rule, traits: [:with_item_total_rule]
 
   end
 end

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -11,11 +11,11 @@ FactoryGirl.define do
     end
 
     factory :shipping_method, class: Spree::ShippingMethod do
-      association(:calculator, factory: :calculator, strategy: :build)
+      association(:calculator, factory: :shipping_calculator, strategy: :build)
     end
 
     factory :free_shipping_method, class: Spree::ShippingMethod do
-      association(:calculator, factory: :no_amount_calculator, strategy: :build)
+      association(:calculator, factory: :shipping_no_amount_calculator, strategy: :build)
     end
   end
 end

data/lib/tasks/core.rake

@@ -22,6 +22,10 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       ruby_files[File.basename(fixture_file, '.*')] = fixture_file
     end
     ruby_files.sort.each do |fixture , ruby_file|
+      # If file is exists within application it takes precendence.
+      if File.exists?(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
+        ruby_file = File.expand_path(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
+      end
       # an invoke will only execute the task once
       Rake::Task["db:load_file"].execute( Rake::TaskArguments.new([:file], [ruby_file]) )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -28,16 +28,16 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -202,16 +202,16 @@ dependencies:
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -232,14 +232,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -492,6 +492,7 @@ files:
 - app/models/spree/return_item.rb
 - app/models/spree/return_item/eligibility_validator/base_validator.rb
 - app/models/spree/return_item/eligibility_validator/default.rb
+- app/models/spree/return_item/eligibility_validator/order_completed.rb
 - app/models/spree/return_item/eligibility_validator/rma_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
@@ -891,7 +892,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.