spree_core 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e70453c69a40765c3da043aaa45500faf53a473
-  data.tar.gz: 7f7d4d3f6d687e4ca780d632db70944a51ec4a17
+  metadata.gz: 7a4b6e2afb0968da8792da3d641cde6a8628eb48
+  data.tar.gz: c2c33ca5c66f6f1c4f2165b4e388f14d82884e91
 SHA512:
-  metadata.gz: 6cb8f296090b301cef84ba89770fb22df0bccb7a5d6e6baab595adb07e607d181d7608db28d8f29f820d5fe6ead85e5bc71411e523f31f6b296ad2e5e725a004
-  data.tar.gz: 1fd7c088dc684dd038214c82eee41278b4fd18ce874570adb45532fbe918a9c69bcb110e3628585975e66555f32ce93295026c6ba2f321baa3fb9f75dd95171c
+  metadata.gz: d115ad863b2eecbf62c10eca8635ad099eef6ed3228da587d6b17238e5f1da29664d7eea5ecca3fc579f599c697147d1d097f657bd1e9a0e7e02e44d80944931
+  data.tar.gz: 3999bfb8c5830d8ecdfccc20fa5921a4e358ee925348f71611c66272683526cdbe57ab9207c327471f50bb40e839d12f143859d1c9bda97bd6c17caaa7a87de1

data/app/models/friendly_id/slug_decorator.rb

@@ -0,0 +1,3 @@
+FriendlyId::Slug.class_eval do
+  acts_as_paranoid
+end

data/app/models/spree/adjustment.rb

@@ -24,7 +24,7 @@ module Spree
   class Adjustment < Spree::Base
     belongs_to :adjustable, polymorphic: true, touch: true
     belongs_to :source, polymorphic: true
-    belongs_to :order, class_name: "Spree::Order"
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :all_adjustments
 
     validates :adjustable, presence: true
     validates :order, presence: true

data/app/models/spree/calculator.rb

@@ -1,5 +1,10 @@
 module Spree
   class Calculator < Spree::Base
+    # Conditional check for backwards compatibilty since acts as paranoid was added late https://github.com/spree/spree/issues/5858
+    if connection.table_exists?(:spree_calculators) && connection.column_exists?(:spree_calculators, :deleted_at)
+      acts_as_paranoid
+    end
+
     belongs_to :calculable, polymorphic: true
 
     # This method calls a compute_<computable> method. must be overriden in concrete calculator.

data/app/models/spree/customer_return.rb

@@ -2,21 +2,27 @@ module Spree
   class CustomerReturn < Spree::Base
     belongs_to :stock_location
 
-    has_many :return_items, inverse_of: :customer_return
-    has_many :return_authorizations, through: :return_items
     has_many :reimbursements, inverse_of: :customer_return
+    has_many :return_authorizations, through: :return_items
+    has_many :return_items, inverse_of: :customer_return
 
     after_create :process_return!
     before_create :generate_number
 
     validates :return_items, presence: true
     validates :stock_location, presence: true
+
+    validate :must_have_return_authorization, on: :create
     validate :return_items_belong_to_same_order
 
     accepts_nested_attributes_for :return_items
 
-    def pre_tax_total
-      return_items.sum(:pre_tax_amount)
+    def completely_decided?
+      !return_items.undecided.exists?
+    end
+
+    def fully_reimbursed?
+      completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
     end
 
     def display_pre_tax_total
@@ -33,15 +39,21 @@ module Spree
       order.try(:id)
     end
 
-    def fully_reimbursed?
-      completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
+    def pre_tax_total
+      return_items.sum(:pre_tax_amount)
     end
 
-    def completely_decided?
-      !return_items.undecided.exists?
+    private
+
+    def inventory_units
+      return_items.flat_map(&:inventory_unit)
     end
 
-    private
+    def must_have_return_authorization
+      if item = return_items.find { |ri| ri.return_authorization.blank? }
+        errors.add(:base, Spree.t(:missing_return_authorization, item_name: item.inventory_unit.variant.name))
+      end
+    end
 
     def generate_number
       self.number ||= loop do
@@ -56,15 +68,9 @@ module Spree
     end
 
     def return_items_belong_to_same_order
-      if return_items.select{ |return_item| return_item.inventory_unit.order_id != order_id }.any?
+      if return_items.select { |return_item| return_item.inventory_unit.order_id != order_id }.any?
         errors.add(:base, Spree.t(:return_items_cannot_be_associated_with_multiple_orders))
       end
     end
-
-    def inventory_units
-      return_items.flat_map(&:inventory_unit)
-    end
-
   end
 end
-

data/app/models/spree/gateway/bogus.rb

@@ -60,6 +60,10 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, :test => true, :authorization => '12345')
     end
 
+    def cancel(_response_code)
+      ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
+    end
+
     def test?
       # Test mode is not really relevant with bogus gateway (no such thing as live server)
       true

data/app/models/spree/order.rb

@@ -44,7 +44,7 @@ module Spree
     alias_attribute :ship_total, :shipment_total
 
     belongs_to :store, class_name: 'Spree::Store'
-    has_many :state_changes, as: :stateful
+    has_many :state_changes, as: :stateful, dependent: :destroy
     has_many :line_items, -> { order("#{LineItem.table_name}.created_at ASC") }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy, inverse_of: :order
@@ -56,6 +56,11 @@ module Spree
     has_many :products, through: :variants
     has_many :variants, through: :line_items
     has_many :refunds, through: :payments
+    has_many :all_adjustments,
+             class_name: 'Spree::Adjustment',
+             foreign_key: :order_id,
+             dependent: :destroy,
+             inverse_of: :order
 
     has_and_belongs_to_many :promotions, join_table: 'spree_orders_promotions'
 
@@ -90,6 +95,7 @@ module Spree
     make_permalink field: :number
 
     delegate :update_totals, :persist_totals, :to => :updater
+    delegate :merge!, to: :merger
 
     class_attribute :update_hooks
     self.update_hooks = Set.new
@@ -135,11 +141,6 @@ module Spree
       self.line_item_comparison_hooks.add(hook)
     end
 
-    def all_adjustments
-      Adjustment.where("order_id = :order_id OR (adjustable_id = :order_id AND adjustable_type = 'Spree::Order')",
-                       order_id: self.id)
-    end
-
     # For compatiblity with Calculator::PriceSack
     def amount
       line_items.inject(0.0) { |sum, li| sum + li.amount }
@@ -245,6 +246,10 @@ module Spree
       updater.update
     end
 
+    def merger
+      @merger ||= Spree::OrderMerger.new(self)
+    end
+
     def clone_billing_address
       if bill_address and self.ship_address.nil?
         self.ship_address = bill_address.clone
@@ -444,10 +449,10 @@ module Spree
     end
 
     ##
-    # Check to see if any line item variants are soft, deleted.
+    # Check to see if any line item variants are soft deleted.
     # If so add error and restart checkout.
     def ensure_line_item_variants_are_not_deleted
-      if line_items.select{ |li| li.variant.destroyed? }.present?
+      if line_items.any?{ |li| !li.variant || li.variant.paranoia_destroyed? }
         errors.add(:base, Spree.t(:deleted_variants_present))
         restart_checkout_flow
         false
@@ -466,44 +471,12 @@ module Spree
       end
     end
 
-    def merge!(order, user = nil)
-      order.line_items.each do |other_order_line_item|
-        next unless other_order_line_item.currency == currency
-
-        # Compare the line items of the other order with mine.
-        # Make sure you allow any extensions to chime in on whether or
-        # not the extension-specific parts of the line item match
-        current_line_item = self.line_items.detect { |my_li|
-                      my_li.variant == other_order_line_item.variant &&
-                      self.line_item_comparison_hooks.all? { |hook|
-                        self.send(hook, my_li, other_order_line_item.serializable_hash)
-                      }
-                    }
-        if current_line_item
-          current_line_item.quantity += other_order_line_item.quantity
-          current_line_item.save!
-        else
-          other_order_line_item.order_id = self.id
-          other_order_line_item.save!
-        end
-      end
-
-      self.associate_user!(user) if !self.user && !user.blank?
-
-      updater.update_item_count
-      updater.update_item_total
-      updater.persist_totals
-
-      # So that the destroy doesn't take out line items which may have been re-assigned
-      order.line_items.reload
-      order.destroy
-    end
-
     def empty!
       line_items.destroy_all
       updater.update_item_count
       adjustments.destroy_all
       shipments.destroy_all
+      state_changes.destroy_all
 
       update_totals
       persist_totals

data/app/models/spree/order_contents.rb

@@ -22,10 +22,10 @@ module Spree
         # Update totals, then check if the order is eligible for any cart promotions.
         # If we do not update first, then the item total will be wrong and ItemTotal
         # promotion rules would not be triggered.
-        reload_totals
+        persist_totals
         PromotionHandler::Cart.new(order).activate
         order.ensure_updated_shipments
-        reload_totals
+        persist_totals
         true
       else
         false
@@ -34,12 +34,12 @@ module Spree
 
     private
       def after_add_or_remove(line_item, options = {})
-        reload_totals
+        persist_totals
         shipment = options[:shipment]
         shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
         PromotionHandler::Cart.new(order, line_item).activate
         ItemAdjustments.new(line_item).update
-        reload_totals
+        persist_totals
         line_item
       end
 
@@ -61,10 +61,9 @@ module Spree
         @updater ||= OrderUpdater.new(order)
       end
 
-      def reload_totals
+      def persist_totals
         order_updater.update_item_count
         order_updater.update
-        order.reload
       end
 
       def add_to_line_item(variant, quantity, options = {})
@@ -90,8 +89,8 @@ module Spree
         line_item.quantity -= quantity
         line_item.target_shipment= options[:shipment]
 
-        if line_item.quantity == 0
-          line_item.destroy
+        if line_item.quantity.zero?
+          order.line_items.destroy(line_item)
         else
           line_item.save!
         end

data/app/models/spree/order_merger.rb

@@ -0,0 +1,65 @@
+module Spree
+  class OrderMerger
+    attr_accessor :order
+    delegate :updater, to: :order
+
+    def initialize(order)
+      @order = order
+    end
+
+    def merge!(other_order, user = nil)
+      other_order.line_items.each do |other_order_line_item|
+        next unless other_order_line_item.currency == order.currency
+
+        current_line_item = find_matching_line_item(other_order_line_item)
+        handle_merge(current_line_item, other_order_line_item)
+      end
+
+      set_user(user)
+      persist_merge
+
+      # So that the destroy doesn't take out line items which may have been re-assigned
+      other_order.line_items.reload
+      other_order.destroy
+    end
+
+    # Compare the line item of the other order with mine.
+    # Make sure you allow any extensions to chime in on whether or
+    # not the extension-specific parts of the line item match
+    def find_matching_line_item(other_order_line_item)
+      order.line_items.detect do |my_li|
+        my_li.variant == other_order_line_item.variant &&
+          order.line_item_comparison_hooks.all? do |hook|
+            order.send(hook, my_li, other_order_line_item.serializable_hash)
+          end
+      end
+    end
+
+    def set_user(user = nil)
+      order.associate_user!(user) if !order.user && !user.blank?
+    end
+
+    # The idea is the end developer can choose to override the merge
+    # to their own choosing. Default is merge with errors.
+    def handle_merge(current_line_item, other_order_line_item)
+      if current_line_item
+        current_line_item.quantity += other_order_line_item.quantity
+        handle_error(current_line_item) unless current_line_item.save
+      else
+        other_order_line_item.order_id = order.id
+        handle_error(other_order_line_item) unless other_order_line_item.save
+      end
+    end
+
+    # Change the error messages as you choose.
+    def handle_error(line_item)
+      order.errors[:base] << line_item.errors.full_messages
+    end
+
+    def persist_merge
+      updater.update_item_count
+      updater.update_item_total
+      updater.persist_totals
+    end
+  end
+end

data/app/models/spree/order_updater.rb

@@ -168,10 +168,5 @@ module Spree
       order.state_changed('payment') if last_state != order.payment_state
       order.payment_state
     end
-
-    private
-      def round_money(n)
-        (n * 100).round / 100.0
-      end
   end
 end

data/app/models/spree/payment.rb

@@ -16,6 +16,7 @@ module Spree
     has_many :capture_events, :class_name => 'Spree::PaymentCaptureEvent'
     has_many :refunds, inverse_of: :payment
 
+    validates_presence_of :payment_method
     before_validation :validate_source
     before_create :set_unique_identifier
 
@@ -164,6 +165,10 @@ module Spree
       amount - captured_amount
     end
 
+    def editable?
+      checkout? || pending?
+    end
+
     private
 
       def validate_source

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

@@ -65,7 +65,8 @@ module Spree
       end
 
       def cancel!
-        payment_method.cancel(response_code)
+        response = payment_method.cancel(response_code)
+        handle_response(response, :void, :failure)
       end
 
       def gateway_options

data/app/models/spree/product.rb

@@ -74,6 +74,7 @@ module Spree
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
     after_destroy :punch_slug
+    after_restore :update_slug_history
 
     after_initialize :ensure_master
 
@@ -263,7 +264,12 @@ module Spree
     end
 
     def punch_slug
-      update_column :slug, "#{Time.now.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
+      # punch slug with date prefix to allow reuse of original
+      update_column :slug, "#{Time.now.to_i}_#{slug}"[0..254] unless frozen?
+    end
+
+    def update_slug_history
+      self.save!
     end
 
     def anything_changed?

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

@@ -29,22 +29,26 @@ module Spree
       end
 
       private
-        def promotions
-          promo_table = Promotion.arel_table
-          join_table = Arel::Table.new(:spree_orders_promotions)
 
-          join_condition = promo_table.join(join_table, Arel::Nodes::OuterJoin).on(
-            promo_table[:id].eq(join_table[:promotion_id])
-          ).join_sources
+      def promotions
+        # AR cannot bind raw ASTs to prepared statements. There always must be a manager around.
+        # Also Postgresql requires an aliased table for `SELECT * FROM (subexpression) AS alias`.
+        # And Sqlite3 cannot work on outher parenthesis from `(left UNION right)`.
+        # So this construct makes both happy.
+        select = Arel::SelectManager.new(
+          Promotion,
+          Promotion.arel_table.create_table_alias(
+            order.promotions.active.union(Promotion.active.where(code: nil, path: nil)),
+            Promotion.table_name
+          ),
+        )
+        select.project(Arel.star)
 
-          Promotion.active.includes(:promotion_rules).
-            joins(join_condition).
-            where(
-              promo_table[:code].eq(nil).and(
-                promo_table[:path].eq(nil)
-              ).or(join_table[:order_id].eq(order.id))
-            ).distinct
-        end
+        Promotion.find_by_sql(
+          select,
+          order.promotions.bind_values
+        )
+      end
     end
   end
 end

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

@@ -86,7 +86,7 @@ module Spree
         }
 
         # Check for applied adjustments.
-        discount = order.line_item_adjustments.promotion.detect(&detector)
+        discount = order.line_item_adjustments.promotion.eligible.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 

data/app/models/spree/shipment.rb

@@ -161,7 +161,7 @@ module Spree
     end
 
     def item_cost
-      line_items.map(&:final_amount).sum
+      manifest.map { |m| (m.line_item.price + (m.line_item.adjustment_total / m.line_item.quantity)) * m.quantity }.sum
     end
 
     def line_items

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

@@ -5,16 +5,20 @@ module Spree
         unit_count = line_item.inventory_units.size
         return if unit_count >= line_item.quantity
         quantity = line_item.quantity - unit_count
+        return if quantity.zero?
 
         quantifier = Stock::Quantifier.new(line_item.variant)
 
-        unless quantifier.can_supply? quantity
-          variant = line_item.variant
-          display_name = %Q{#{variant.name}}
-          display_name += %Q{ (#{variant.options_text})} unless variant.options_text.blank?
+        return if quantifier.can_supply?(quantity)
 
-          line_item.errors[:quantity] << Spree.t(:selected_quantity_not_available, :scope => :order_populator, :item => display_name.inspect)
-        end
+        variant = line_item.variant
+        display_name = "#{variant.name}"
+        display_name += " (#{variant.options_text})" unless variant.options_text.blank?
+
+        line_item.errors[:quantity] << Spree.t(
+          :selected_quantity_not_available,
+          item: display_name.inspect
+        )
       end
     end
   end

data/app/models/spree/stock_item.rb

@@ -8,7 +8,11 @@ module Spree
 
     validates_presence_of :stock_location, :variant
     validates_uniqueness_of :variant_id, scope: [:stock_location_id, :deleted_at]
-    validates :count_on_hand, numericality: { greater_than_or_equal_to: 0 }, if: :verify_count_on_hand?
+
+    validates_numericality_of :count_on_hand,
+                              greater_than_or_equal_to: 0,
+                              less_than_or_equal_to: 2**31 - 1,
+                              only_integer: true, if: :verify_count_on_hand?
 
     delegate :weight, :should_track_inventory?, to: :variant
 

data/app/models/spree/stock_movement.rb

@@ -6,7 +6,12 @@ module Spree
     after_create :update_stock_item_quantity
 
     validates :stock_item, presence: true
-    validates :quantity, presence: true
+    validates :quantity, presence: true, numericality: {
+                 greater_than_or_equal_to: -2**31,
+                 less_than_or_equal_to: 2**31-1,
+                 only_integer: true,
+                 allow_nil: true
+              }
 
     scope :recent, -> { order('created_at DESC') }
 

data/app/models/spree/tax_rate.rb

@@ -79,7 +79,11 @@ module Spree
       rates = self.match(order_tax_zone)
       tax_categories = rates.map(&:tax_category)
       relevant_items, non_relevant_items = items.partition { |item| tax_categories.include?(item.tax_category) }
-      Spree::Adjustment.where(adjustable: relevant_items).tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
+
+      if relevant_items.present?
+        Spree::Adjustment.where(adjustable: relevant_items).tax.destroy_all # using destroy_all to ensure adjustment destroy callback fires.
+      end
+
       relevant_items.each do |item|
         relevant_rates = rates.select { |rate| rate.tax_category == item.tax_category }
         store_pre_tax_amount(item, relevant_rates)

data/app/models/spree/variant.rb

@@ -1,7 +1,7 @@
 module Spree
   class Variant < Spree::Base
     acts_as_paranoid
-    acts_as_list
+    acts_as_list scope: :product
 
     include Spree::DefaultPrice
 
@@ -37,7 +37,6 @@ module Spree
     validates_uniqueness_of :sku, allow_blank: true, conditions: -> { where(deleted_at: nil) }
 
     after_create :create_stock_items
-    after_create :set_position
     after_create :set_master_out_of_stock, unless: :is_master?
 
     after_touch :clear_in_stock_cache
@@ -245,10 +244,6 @@ module Spree
         end
       end
 
-      def set_position
-        self.update_column(:position, product.variants.maximum(:position).to_i + 1)
-      end
-
       def in_stock_cache_key
         "variant-#{id}-in_stock"
       end

data/config/initializers/user_class_extensions.rb

@@ -23,6 +23,10 @@ Spree::Core::Engine.config.to_prepare do
       def last_incomplete_spree_order
         spree_orders.incomplete.order('created_at DESC').first
       end
+
+      def analytics_id
+        id
+      end
     end
   end
 end

data/config/locales/en.yml

@@ -842,6 +842,7 @@ en:
     meta_title: Meta Title
     metadata: Metadata
     minimal_amount: Minimal Amount
+    missing_return_authorization: ! 'Missing Return Authorization for %{item_name}.'
     month: Month
     more: More
     move_stock_between_locations: Move Stock Between Locations
@@ -979,7 +980,6 @@ en:
     order_total: Order Total
     order_updated: Order Updated
     orders: Orders
-    other_items_in_other: Other Items in Order
     out_of_stock: Out of Stock
     overview: Overview
     package_from: package from

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -0,0 +1,70 @@
+class FixAdjustmentOrderId < ActiveRecord::Migration
+  def change
+    say 'Populate order_id from adjustable_id where appropriate'
+    execute(<<-SQL.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id = adjustable_id
+      WHERE
+        adjustable_type = 'Spree::Order'
+      ;
+    SQL
+
+    # Submitter of change does not care about MySQL, as it is not officially supported.
+    # Still spree officials decided to provide a working code path for MySQL users, hence
+    # submitter made a AR code path he could validate on PostgreSQL.
+    #
+    # Whoever runs a big enough MySQL installation where the AR solution hurts:
+    # Will have to write a better MySQL specific equivalent.
+    if Spree::Order.connection.adapter_name.eql?('MySQL')
+      Spree::Adjustment.where(adjustable_type: 'Spree::LineItem').find_each do |adjustment|
+        adjustment.update_columns(order_id: Spree::LineItem.find(adjustment.adjustable_id).order_id)
+      end
+    else
+      execute(<<-SQL.squish)
+        UPDATE
+          spree_adjustments
+        SET
+          order_id =
+            (SELECT order_id FROM spree_line_items WHERE spree_line_items.id = spree_adjustments.adjustable_id)
+        WHERE
+          adjustable_type = 'Spree::LineItem'
+      SQL
+    end
+
+    say 'Fix schema for spree_adjustments order_id column'
+    change_table :spree_adjustments do |t|
+      t.change :order_id, :integer, null: false
+    end
+
+    # Improved schema for postgresql, uncomment if you like it:
+    #
+    # # Negated Logical implication.
+    # #
+    # # When adjustable_type is 'Spree::Order' (p) the adjustable_id must be order_id (q).
+    # #
+    # # When adjustable_type is NOT 'Spree::Order' the adjustable id allowed to be any value (including of order_id in
+    # # case foreign keys match). XOR does not work here.
+    # #
+    # # Postgresql does not have an operator for logical implication. So we need to build the following truth table
+    # # via AND with OR:
+    # #
+    # #  p q | CHECK = !(p -> q)
+    # #  -----------
+    # #  t t | t
+    # #  t f | f
+    # #  f t | t
+    # #  f f | t
+    # #
+    # # According to de-morgans law the logical implication q -> p is equivalent to !p || q
+    # #
+    # execute(<<-SQL.squish)
+    #   ALTER TABLE ONLY spree_adjustments
+    #    ADD CONSTRAINT fk_spree_adjustments FOREIGN KEY (order_id)
+    #      REFERENCES spree_orders(id) ON UPDATE RESTRICT ON DELETE RESTRICT,
+    #    ADD CONSTRAINT check_spree_adjustments_order_id CHECK
+    #      (adjustable_type <> 'Spree::Order' OR order_id = adjustable_id);
+    # SQL
+  end
+end

data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToFriendlyIdSlugs < ActiveRecord::Migration
+  def change
+    add_column :friendly_id_slugs, :deleted_at, :datetime
+    add_index :friendly_id_slugs, :deleted_at
+  end
+end

data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb

@@ -0,0 +1,6 @@
+class EnableActsAsParanoidOnCalculators < ActiveRecord::Migration
+  def change
+    add_column :spree_calculators, :deleted_at, :datetime
+    add_index :spree_calculators, :deleted_at
+  end
+end

data/lib/spree/core/engine.rb

@@ -101,6 +101,13 @@ module Spree
       initializer "spree.core.checking_migrations" do |app|
         Migrations.new(config, engine_name).check
       end
+
+      config.to_prepare do
+        # Load application's model / class decorators
+        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+      end
     end
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.7"
+    "2.4.8"
   end
 end

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

@@ -17,6 +17,17 @@ FactoryGirl.define do
       end
     end
 
+    factory :order_with_line_item_quantity do
+      transient do
+        line_items_quantity 1
+      end
+
+      after(:create) do |order, evaluator|
+        create(:line_item, order: order, price: evaluator.line_items_price, quantity: evaluator.line_items_quantity)
+        order.line_items.reload # to ensure order.line_items is accessible after
+      end
+    end
+
     factory :order_with_line_items do
       bill_address
       ship_address

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -232,14 +232,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -258,16 +258,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +385,7 @@ files:
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
+- app/models/friendly_id/slug_decorator.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustment.rb
@@ -433,6 +434,7 @@ files:
 - app/models/spree/order/payments.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
+- app/models/spree/order_merger.rb
 - app/models/spree/order_populator.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
@@ -752,6 +754,9 @@ files:
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
 - db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
+- db/migrate/20150515211137_fix_adjustment_order_id.rb
+- db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb
+- db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt