spree_core 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5120849e1aaa18b3747ba821d39be5e0e22c64
-  data.tar.gz: 472557e5032544f1c53694c452989910466e7fa9
+  metadata.gz: f612c6f42ba3ade084e50bdca945ccf34f1ce76f
+  data.tar.gz: f84f159adfe58ab3b210da9b0d596a54d3d758c2
 SHA512:
-  metadata.gz: 8dec314e53c791de3fa15d96772d7b6b46771873321ff7219fe5a7a8316d61f6dfa82fc50d6b176d1186a3c1944eeb9962488570dea5f14a8fb7a40ac6fba4fe
-  data.tar.gz: 3423ee941bbce9284bad16a6137a991efe553553a87abca67585cb5bf8dc9e10a4cf4b364b456e8404f37b0649050b154ecd266fa78965a5ec9758866b53896b
+  metadata.gz: 39a5a14c31bfeb6eaff2d0f2b99eacd506e01f882fa5c20f6f03efc1d8e74d7f965a37e0d1f5f857ef25e0735056905708c8960b89310a776d2fc506d702b9d3
+  data.tar.gz: 7c92311fcbbd4cc550c32c3473352f719e94d40367fde91c05779a7274eff4a34c6d3ed096c69fc9eacbb921ab4f20ad3c3ba722d8060646e4ace2813e2d9dcb

data/app/helpers/spree/base_helper.rb

@@ -20,11 +20,11 @@ module Spree
         text = "#{text}: (#{Spree.t('empty')})"
         css_class = 'empty'
       else
-        text = "#{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>".html_safe
+        text = "#{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
         css_class = 'full'
       end
 
-      link_to text, spree.cart_path, :class => "cart-info #{css_class}"
+      link_to text.html_safe, spree.cart_path, :class => "cart-info #{css_class}"
     end
 
     # human readable list of variant options

data/app/helpers/spree/products_helper.rb

@@ -55,7 +55,7 @@ module Spree
     def cache_key_for_products
       count = @products.count
       max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
-      "#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
+      "#{I18n.locale}/#{current_currency}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
     end
   end
 end

data/app/helpers/spree/store_helper.rb

@@ -10,7 +10,7 @@ module Spree
     def cache_key_for_taxons
       max_updated_at = @taxons.maximum(:updated_at).to_i
       parts = [@taxon.try(:id), max_updated_at].compact.join("-")
-      "taxons/#{parts}"
+      "#{I18n.locale}/taxons/#{parts}"
     end
   end
 end

data/app/models/spree/adjustment.rb

@@ -24,7 +24,7 @@ module Spree
   class Adjustment < ActiveRecord::Base
     belongs_to :adjustable, polymorphic: true
     belongs_to :source, polymorphic: true
-    belongs_to :order, :class_name => "Spree::Order"
+    belongs_to :order, class_name: "Spree::Order"
 
     validates :label, presence: true
     validates :amount, numericality: true
@@ -59,6 +59,14 @@ module Spree
       state == "closed"
     end
 
+    def currency
+      adjustable ? adjustable.currency : Spree::Config[:currency]
+    end
+
+    def display_amount
+      Spree::Money.new(amount, { currency: currency })
+    end
+
     def promotion?
       source.class < Spree::PromotionAction
     end
@@ -88,19 +96,12 @@ module Spree
       amount
     end
 
-    def currency
-      adjustable ? adjustable.currency : Spree::Config[:currency]
-    end
-
-    def display_amount
-      Spree::Money.new(amount, { currency: currency })
-    end
-
     private
 
     def update_adjustable_adjustment_total
       # Cause adjustable's total to be recalculated
       Spree::ItemAdjustments.new(adjustable).update if adjustable
     end
+
   end
 end

data/app/models/spree/app_configuration.rb

@@ -57,6 +57,7 @@ module Spree
     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
+    preference :properties_per_page, :integer, default: 15
     preference :products_per_page, :integer, default: 12
     preference :promotions_per_page, :integer, default: 15
     preference :redirect_https_to_http, :boolean, :default => false

data/app/models/spree/credit_card.rb

@@ -37,9 +37,10 @@ module Spree
       elsif match = expiry.match(/(\d{2})(\d{2,4})/) # will match mmyy and mmyyyy
         [match[1], match[2]]
       end
-
-      self[:year] = "20" + self[:year] if self[:year].length == 2
-      self[:year] = self[:year].to_i
+      if self[:year]
+        self[:year] = "20" + self[:year] if self[:year].length == 2
+        self[:year] = self[:year].to_i
+      end
       self[:month] = self[:month].to_i
     end
 
@@ -111,8 +112,8 @@ module Spree
         :month => month,
         :year => year,
         :verification_value => verification_value,
-        :first_name => first_name,
-        :last_name => last_name
+        :first_name => first_name || name.to_s.split(/[[:space:]]/, 2)[0],
+        :last_name => last_name || name.to_s.split(/[[:space:]]/, 2)[1]
       )
     end
 

data/app/models/spree/line_item.rb

@@ -28,7 +28,7 @@ module Spree
     after_save :update_inventory
     after_save :update_adjustments
 
-    after_create :create_tax_charge
+    after_create :update_tax_charge
 
     delegate :name, :description, :should_track_inventory?, to: :variant
 
@@ -108,6 +108,7 @@ module Spree
 
       def update_adjustments
         if quantity_changed?
+          update_tax_charge # Called to ensure pre_tax_amount is updated.
           recalculate_adjustments
         end
       end
@@ -116,7 +117,7 @@ module Spree
         Spree::ItemAdjustments.new(self).update
       end
 
-      def create_tax_charge
+      def update_tax_charge
         Spree::TaxRate.adjust(order, [self])
       end
 
@@ -127,4 +128,3 @@ module Spree
       end
   end
 end
-

data/app/models/spree/order.rb

@@ -121,7 +121,7 @@ module Spree
 
     def all_adjustments
       Adjustment.where("order_id = :order_id OR (adjustable_id = :order_id AND adjustable_type = 'Spree::Order')",
-        :order_id => self.id)
+        order_id: self.id)
     end
 
     # For compatiblity with Calculator::PriceSack
@@ -439,8 +439,9 @@ module Spree
     def empty!
       line_items.destroy_all
       updater.update_item_count
-
       adjustments.destroy_all
+      shipments.destroy_all
+
       update_totals
       persist_totals
     end
@@ -532,12 +533,7 @@ module Spree
     end
 
     def is_risky?
-      self.payments.where(%{
-        (avs_response IS NOT NULL and avs_response != '' and avs_response != 'D' and avs_response != 'M') or
-        (cvv_response_code IS NOT NULL and cvv_response_code != 'M') or
-        cvv_response_message IS NOT NULL and cvv_response_message != '' or
-        state = 'failed'
-      }.squish!).uniq.count > 0
+      self.payments.risky.count > 0
     end
 
     def approved_by(user)

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

@@ -222,6 +222,8 @@ module Spree
                   raise Core::GatewayError.new Spree.t(:invalid_credit_card)
                 end
 
+                credit_card.verification_value = params[:cvc_confirm] if params[:cvc_confirm].present?
+
                 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

data/app/models/spree/order_contents.rb

@@ -49,7 +49,10 @@ module Spree
         order_updater.update_item_count
         order_updater.update_item_total
         order_updater.update_adjustment_total
+
+        order_updater.update_payment_state if order.completed?
         order_updater.persist_totals
+
         order.reload
       end
 

data/app/models/spree/order_updater.rb

@@ -1,7 +1,7 @@
 module Spree
   class OrderUpdater
     attr_reader :order
-    delegate :payments, :line_items, :adjustments, :shipments, :update_hooks, to: :order
+    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :update_hooks, to: :order
 
     def initialize(order)
       @order = order
@@ -30,7 +30,7 @@ module Spree
     end
 
     def recalculate_adjustments
-      adjustments.includes(:source).each { |adjustment| adjustment.update! order }
+      all_adjustments.includes(:adjustable).map(&:adjustable).uniq.each { |adjustable| Spree::ItemAdjustments.new(adjustable).update }
     end
 
     # Updates the following Order total values:

data/app/models/spree/payment.rb

@@ -2,7 +2,9 @@ module Spree
   class Payment < ActiveRecord::Base
     include Spree::Payment::Processing
 
-    IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
+    IDENTIFIER_CHARS    = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
+    NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
+    RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
 
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :payments
     belongs_to :source, polymorphic: true
@@ -16,7 +18,6 @@ module Spree
 
     before_validation :validate_source
     before_create :set_unique_identifier
-    before_save :update_uncaptured_amount
 
     after_save :create_payment_profile, if: :profiles_supported?
 
@@ -33,6 +34,7 @@ module Spree
     scope :completed, -> { with_state('completed') }
     scope :pending, -> { with_state('pending') }
     scope :failed, -> { with_state('failed') }
+    scope :risky, -> { where("avs_response IN (?) OR (cvv_response_code IS NOT NULL and cvv_response_code != 'M') OR state = 'failed'", RISKY_AVS_CODES) }
     scope :valid, -> { where.not(state: %w(failed invalid)) }
 
     after_rollback :persist_invalid
@@ -94,7 +96,7 @@ module Spree
         case amount
         when String
           separator = I18n.t('number.currency.format.separator')
-          number    = amount.delete("^0-9-#{separator}").tr(separator, '.')
+          number    = amount.delete("^0-9-#{separator}\.").tr(separator, '.')
           number.to_d if number.present?
         end || amount
     end
@@ -132,8 +134,7 @@ module Spree
     end
 
     def is_avs_risky?
-      return false if avs_response == "D"
-      return false if avs_response.blank?
+      return false if avs_response.blank? || NON_RISKY_AVS_CODES.include?(avs_response)
       return true
     end
 
@@ -144,6 +145,10 @@ module Spree
       return true
     end
 
+    def uncaptured_amount
+      amount - capture_events.sum(:amount)
+    end
+
     private
 
       def validate_source
@@ -193,9 +198,5 @@ module Spree
       def generate_identifier
         Array.new(8){ IDENTIFIER_CHARS.sample }.join
       end
-
-      def update_uncaptured_amount
-        self.uncaptured_amount = amount - capture_events.sum(:amount)
-      end
   end
 end

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

@@ -50,7 +50,7 @@ module Spree
             gateway_options
           )
 
-          money = ::Money.new(amount, Spree::Config[:currency])
+          money = ::Money.new(amount, currency)
           capture_events.create!(amount: money.to_f)
           handle_response(response, :complete, :failure)
         end

data/app/models/spree/product.rb

@@ -21,7 +21,7 @@
 module Spree
   class Product < ActiveRecord::Base
     extend FriendlyId
-    friendly_id :name, use: :slugged
+    friendly_id :slug_candidates, use: :slugged
 
     acts_as_paranoid
     has_many :product_option_types, dependent: :destroy, inverse_of: :product
@@ -77,9 +77,12 @@ module Spree
     validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
     validates :shipping_category_id, presence: true
     validates :slug, length: { minimum: 3 }
+    validates :slug, uniqueness: true
 
     before_validation :normalize_slug, on: :update
 
+    after_destroy :punch_slug
+
     attr_accessor :option_values_hash
 
     accepts_nested_attributes_for :product_properties, allow_destroy: true, reject_if: lambda { |pp| pp[:property_name].blank? }
@@ -213,6 +216,7 @@ module Spree
     end
 
     private
+
       def normalize_slug
         self.slug = normalize_friendly_id(slug)
       end
@@ -265,6 +269,19 @@ module Spree
         taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
         Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
       end
+
+      # Try building a slug based on the following fields in increasing order of specificity.
+      def slug_candidates
+        [
+            :name,
+            [:name, :sku]
+        ]
+      end
+
+      def punch_slug
+        update(slug: "#{Time.now.to_i}_#{slug}") # punch slug with date prefix to allow reuse of original
+      end
+
   end
 end
 

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

@@ -41,8 +41,9 @@ module Spree
         # Ensure a negative amount which does not exceed the sum of the order's
         # item_total and ship_total
         def compute_amount(adjustable)
-          amount = self.calculator.compute(adjustable).to_f.abs
-          [adjustable.total, amount].min * -1
+          promotion_amount = self.calculator.compute(adjustable).to_f.abs
+          
+          [adjustable.amount, promotion_amount].min * -1
         end
 
         private
@@ -62,7 +63,8 @@ module Spree
           end
 
           def deals_with_adjustments
-            adjustment_scope = Adjustment.includes(:order).references(:spree_orders)
+            adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
+
             # For incomplete orders, remove the adjustment completely.
             adjustment_scope.where("spree_orders.completed_at IS NULL").each do |adjustment|
               adjustment.destroy

data/app/models/spree/promotion_action.rb

@@ -2,6 +2,8 @@
 # PromotionActions perform the necessary tasks when a promotion is activated by an event and determined to be eligible.
 module Spree
   class PromotionAction < ActiveRecord::Base
+    acts_as_paranoid
+
     belongs_to :promotion, class_name: 'Spree::Promotion'
 
     scope :of_type, ->(t) { where(type: t) }

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

@@ -36,15 +36,16 @@ module Spree
 
       def handle_present_promotion(promotion)
         return promotion_usage_limit_exceeded if promotion.usage_limit_exceeded?(order)
+        return promotion_applied if promotion_exists_on_order?(order, promotion)
         return ineligible_for_this_order unless promotion.eligible?(order)
 
         # If any of the actions for the promotion return `true`,
         # then result here will also be `true`.
         result = promotion.activate(:order => order)
         if result
-          determine_promotion_application_result(result)
+          determine_promotion_application_result
         else
-          self.error = Spree.t(:coupon_code_already_applied)
+          self.error = Spree.t(:coupon_code_unknown_error)
         end
       end
 
@@ -56,7 +57,15 @@ module Spree
         self.error = Spree.t(:coupon_code_not_eligible)
       end
 
-      def determine_promotion_application_result(result)
+      def promotion_applied
+        self.error = Spree.t(:coupon_code_already_applied)
+      end
+
+      def promotion_exists_on_order?(order, promotion)
+        order.promotions.include? promotion
+      end
+
+      def determine_promotion_application_result
         detector = lambda { |p|
           if p.source.promotion.code
             p.source.promotion.code.downcase == order.coupon_code.downcase
@@ -67,7 +76,7 @@ module Spree
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        if result and discount.eligible
+        if discount.eligible
           order.update_totals
           order.persist_totals
           self.success = Spree.t(:coupon_code_applied)

data/app/models/spree/return_authorization.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :order, class_name: 'Spree::Order'
 
     has_many :inventory_units
-    has_one :stock_location
+    belongs_to :stock_location
     before_create :generate_number
     before_save :force_positive_amount
 
@@ -81,16 +81,17 @@ module Spree
       end
 
       def process_return
-        inventory_units.each do |iu|
+        inventory_units(include: :variant).each do |iu|
           iu.return!
-          stock_item = Spree::StockItem.where(variant_id: iu.variant.id, stock_location_id: stock_location_id).first
-          Spree::StockMovement.create!(stock_item_id: stock_item.id, quantity: 1)
+
+          if iu.variant.should_track_inventory?
+            if stock_item = Spree::StockItem.find_by(variant_id: iu.variant_id, stock_location_id: stock_location_id)
+              Spree::StockMovement.create!(stock_item_id: stock_item.id, quantity: 1)
+            end
+          end
         end
 
-        credit = Adjustment.new(amount: compute_amount, label: Spree.t(:rma_credit))
-        credit.source = self
-        credit.adjustable = order
-        credit.save
+        Adjustment.create(adjustable: order, amount: compute_amount, label: Spree.t(:rma_credit), source: self)
         order.update!
 
         order.return if inventory_units.all?(&:returned?)

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

@@ -52,8 +52,8 @@ module Spree
         package.shipping_methods.select do |ship_method|
           calculator = ship_method.calculator
           begin
-            calculator.available?(package) &&
             ship_method.include?(order.ship_address) &&
+            calculator.available?(package) &&
             (calculator.preferences[:currency].nil? ||
              calculator.preferences[:currency] == currency)
           rescue Exception => exception

data/app/models/spree/zone.rb

@@ -71,12 +71,12 @@ module Spree
     # All zoneables belonging to the zone members.  Will be a collection of either
     # countries or states depending on the zone type.
     def zoneables
-      members.collect(&:zoneable)
+      members.includes(:zoneable).collect(&:zoneable)
     end
 
     def country_ids
       if kind == 'country'
-        members.collect(&:zoneable_id)
+        members.pluck(:zoneable_id)
       else
         []
       end
@@ -84,7 +84,7 @@ module Spree
 
     def state_ids
       if kind == 'state'
-        members.collect(&:zoneable_id)
+        members.pluck(:zoneable_id)
       else
         []
       end
@@ -117,9 +117,9 @@ module Spree
       return false if zone_members.empty? || target.zone_members.empty?
 
       if kind == target.kind
-        return false if target.zoneables.any? { |target_zoneable| zoneables.exclude?(target_zoneable) }
+        return false if (target.zoneables.collect(&:id) - zoneables.collect(&:id)).present?
       else
-        return false if target.zoneables.any? { |target_state| zoneables.exclude?(target_state.country) }
+        return false if (target.zoneables.collect(&:country).collect(&:id) - zoneables.collect(&:id)).present?
       end
       true
     end

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -10,11 +10,29 @@
 <% end %>
 ============================================================
 <%= Spree.t('order_mailer.confirm_email.subtotal', :subtotal => @order.display_item_total) %>
+<% if @order.line_item_adjustments.exists? %>
+  <% if @order.all_adjustments.promotion.eligible.exists? %>
+    <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+<%= Spree.t(:promotion) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+    <% end %>
+  <% end %>
+<% end %>
 
-<% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
+<% @order.shipments.group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+<%= Spree.t(:shipping) %>: <%= name %> <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
+<% end %>
+
+<% if @order.all_adjustments.eligible.tax.exists? %>
+  <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+<%= Spree.t(:tax) %>: <%= label %> <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+  <% end %>
 <% end %>
 
+<% @order.adjustments.eligible.each do |adjustment| %>
+  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+<%= adjustment.label %> <%= adjustment.display_amount %>
+<% end %>
+============================================================
 <%= Spree.t('order_mailer.confirm_email.total', :total => @order.display_total) %>
 
 <%= Spree.t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/shared/_routes.html.erb

@@ -1,13 +1,13 @@
 <script>
   if (Spree === undefined) {
-    var Spree = {}
+    var Spree = {};
   }
   if (Spree.routes == undefined) {
-    Spree.routes = {}
+    Spree.routes = {};
   }
-  Spree.routes.states_search = "<%= spree.api_states_path(:format => 'json') %>"
+  Spree.routes.states_search = "<%= spree.api_states_path(:format => 'json') %>";
   Spree.routes.apply_coupon_code = function(order_id) {
-    return "<%= spree.api_orders_path %>/" + order_id + "/apply_coupon_code"
+    return "<%= spree.api_orders_path %>/" + order_id + "/apply_coupon_code";
   }
-  Spree.routes.root = "<%= spree.root_url if spree.respond_to? :root_url %>"
+  Spree.routes.root = "<%= spree.root_url if spree.respond_to? :root_url %>";
 </script>

data/config/locales/en.yml

@@ -485,6 +485,7 @@ en:
     coupon_code_max_usage: Coupon code usage limit exceeded
     coupon_code_not_eligible: This coupon code is not eligible for this order
     coupon_code_not_found: The coupon code you entered doesn't exist. Please try again.
+    coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
     create: Create
     create_a_new_account: Create a new account
     created_at: Created At

data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb

@@ -8,9 +8,9 @@ class AddLineItemIdToSpreeInventoryUnits < ActiveRecord::Migration
       shipments = Spree::Shipment.includes(:inventory_units, :order)
 
       shipments.find_each do |shipment|
-        shipment.inventory_units.group_by(&:variant).each do |variant, units|
+        shipment.inventory_units.group_by(&:variant_id).each do |variant, units|
 
-          line_item = shipment.order.find_line_item_by_variant(variant)
+          line_item = shipment.order.line_items.find_by(variant_id: variant_id)
           next unless line_item
 
           Spree::InventoryUnit.where(id: units.map(&:id)).update_all(line_item_id: line_item.id)

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -0,0 +1,12 @@
+class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
+  def up
+    # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
+    # or below. For those upgrading this should populate the Order#shipment_total
+    # for legacy orders
+    execute "UPDATE spree_orders
+             SET shipment_total = (SELECT SUM(spree_shipments.cost) AS sum_id
+                                   FROM spree_shipments
+                                   WHERE spree_shipments.order_id = spree_orders.id)
+             WHERE spree_orders.completed_at IS NOT NULL AND spree_orders.shipment_total = 0"
+  end
+end

data/db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb

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

data/db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb

@@ -0,0 +1,5 @@
+class RemoveUncapturedAmountFromSpreePayments < ActiveRecord::Migration
+  def change
+    remove_column :spree_payments, :uncaptured_amount
+  end
+end

data/lib/spree/core/product_duplicator.rb

@@ -2,8 +2,12 @@ module Spree
   class ProductDuplicator
     attr_accessor :product
 
-    def initialize(product)
+    @@clone_images_default = true
+    mattr_accessor :clone_images_default
+
+    def initialize(product, include_images = @@clone_images_default)
       @product = product
+      @include_images = include_images
     end
 
     def duplicate
@@ -38,7 +42,7 @@ module Spree
       master.dup.tap do |new_master|
         new_master.sku = "COPY OF #{master.sku}"
         new_master.deleted_at = nil
-        new_master.images = master.images.map { |image| duplicate_image image }
+        new_master.images = master.images.map { |image| duplicate_image image } if @include_images
         new_master.price = master.price
         new_master.currency = master.currency
       end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.2"
+    "2.2.3"
   end
 end

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

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :promotion, class: Spree::Promotion do
     name 'Promo'
 
-    factory :promotion_with_item_adjustment do
+    trait :with_line_item_adjustment do
       ignore do
         adjustment_rate 10
       end
@@ -15,6 +15,36 @@ FactoryGirl.define do
         promotion.save
       end
     end
+    factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
+
+    trait :with_order_adjustment do
+      ignore do
+        order_adjustment_amount 10
+      end
+
+      after(:create) do |promotion, evaluator|
+        calculator = Spree::Calculator::FlatRate.new
+        calculator.preferred_amount = evaluator.order_adjustment_amount
+        action = Spree::Promotion::Actions::CreateAdjustment.create!(:calculator => calculator)
+        promotion.actions << action
+        promotion.save!
+      end
+    end
+
+    trait :with_item_total_rule do
+      ignore do
+        item_total_threshold_amount 10
+      end
+
+      after(:create) do |promotion, evaluator|
+        rule = Spree::Promotion::Rules::ItemTotal.create!(
+          preferred_operator: 'gte', 
+          preferred_amount: evaluator.item_total_threshold_amount
+        )
+        promotion.rules << rule
+        promotion.save!
+      end
+    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.3
+        version: 1.43.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.3
+        version: 1.43.1
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 4.0.6
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -590,6 +590,9 @@ files:
 - db/migrate/20140219060952_add_considered_risky_to_orders.rb
 - db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb
 - db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
+- db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb
+- db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb
+- db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -738,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.