spree_core 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e5eefe3009befd78025ca57659db32bc2e50a3
-  data.tar.gz: f15a4fb3f353eb751af1989d90b3efead4115fbd
+  metadata.gz: ced799e6508e709a118e4e7ce365c38c64d83e35
+  data.tar.gz: 649ea08eb8e94b74a418811cf004e0af6ed36185
 SHA512:
-  metadata.gz: c5f0b142e192633ab15d86f362310bc9b6640b274f3da599e52ccf0440bf6434983c990adba8c2002d9b9b2415bcb01bb518c6da3bd267e800af093c16085eb4
-  data.tar.gz: e9fc9ce3dce676ea2c268012c0155fef5827ef8c17bcf868e3593ebb0f68b7c1a7959e97c625aff7cb041a83cbc1bbd3687dafd5d4c1bc42a6accc5846e587c8
+  metadata.gz: 89a31fc0972175a5718c2960a99fc1c9f21fccccaf60b1de207c692dc5c58e457ceb640c36ca56276ccf42abec76de682d275df81fd4331ba62936b7663085f0
+  data.tar.gz: 3b6fbdbd8d8eebc5dbb21514cc2ae887743231bf97d4cc181ce089d7a387081d5b70271b2d0a2a6ffdb1bf00bbfedc5b2648571b12c59839b7fc326354d9b10d

data/app/helpers/spree/base_helper.rb

@@ -162,9 +162,10 @@ module Spree
     end
 
     private
+
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
-      if style = method_name.to_s.sub(/_image$/, '')
+      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
         possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
         style if style.in? possible_styles.with_indifferent_access
       end

data/app/helpers/spree/products_helper.rb

@@ -11,14 +11,13 @@ module Spree
 
     # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
-      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
-      return nil if diff == 0
-      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
-      if diff > 0
-        "(#{Spree.t(:add)}: #{amount})".html_safe
-      else
-        "(#{Spree.t(:subtract)}: #{amount})".html_safe
-      end
+      variant_amount = variant.amount_in(current_currency)
+      product_amount = variant.product.amount_in(current_currency)
+      return if variant_amount == product_amount || product_amount.nil?
+      diff   = variant.amount_in(current_currency) - product_amount
+      amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
+      label  = diff > 0 ? :add : :subtract
+      "(#{Spree.t(label)}: #{amount})".html_safe
     end
 
     # returns the formatted full price for the variant, if at least one variant price differs from product price

data/app/models/spree/adjustment.rb

@@ -22,7 +22,7 @@
 # it might be reinstated.
 module Spree
   class Adjustment < ActiveRecord::Base
-    belongs_to :adjustable, polymorphic: true
+    belongs_to :adjustable, polymorphic: true, touch: true
     belongs_to :source, polymorphic: true
     belongs_to :order, class_name: "Spree::Order"
 

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
   class Asset < ActiveRecord::Base
     belongs_to :viewable, polymorphic: true, touch: true
-    acts_as_list scope: :viewable
+    acts_as_list scope: [:viewable_id, :viewable_type]
   end
 end

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

@@ -19,8 +19,9 @@ module Spree
 
     def create_profile(payment)
       # simulate the storage of credit card profile using remote service
-      success = VALID_CCS.include? payment.source.number
-      payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+      if success = VALID_CCS.include?(payment.source.number)
+        payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+      end
     end
 
     def authorize(money, credit_card, options = {})

data/app/models/spree/inventory_unit.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :variant, class_name: "Spree::Variant", inverse_of: :inventory_units
     belongs_to :order, class_name: "Spree::Order", inverse_of: :inventory_units
     belongs_to :shipment, class_name: "Spree::Shipment", touch: true, inverse_of: :inventory_units
-    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
+    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization", inverse_of: :inventory_units
     belongs_to :line_item, class_name: "Spree::LineItem", inverse_of: :inventory_units
 
     scope :backordered, -> { where state: 'backordered' }

data/app/models/spree/item_adjustments.rb

@@ -72,7 +72,7 @@ module Spree
     end
 
     def best_promotion_adjustment
-      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
+      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC, id DESC").first
     end
   end
 end

data/app/models/spree/order.rb

@@ -38,9 +38,9 @@ module Spree
     alias_attribute :ship_total, :shipment_total
 
     has_many :state_changes, as: :stateful
-    has_many :line_items, -> { order('created_at ASC') }, dependent: :destroy, inverse_of: :order
+    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
+    has_many :return_authorizations, dependent: :destroy, inverse_of: :order
     has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
@@ -306,7 +306,11 @@ module Spree
     end
 
     def outstanding_balance
-      total - payment_total
+      if self.state == 'canceled' && self.payments.present? && self.payments.completed.size > 0
+        -1 * payment_total
+      else
+        total - payment_total
+      end
     end
 
     def outstanding_balance?
@@ -424,6 +428,7 @@ module Spree
       order.line_items.each do |line_item|
         next unless line_item.currency == currency
         current_line_item = self.line_items.find_by(variant: line_item.variant)
+
         if current_line_item
           current_line_item.quantity += line_item.quantity
           current_line_item.save
@@ -628,9 +633,8 @@ module Spree
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
         payments.completed.each { |payment| payment.cancel! }
-
         send_cancel_email
-        self.update_column(:payment_state, 'credit_owed') unless shipped?
+        self.update!
       end
 
       def send_cancel_email

data/app/models/spree/order_updater.rb

@@ -151,35 +151,20 @@ module Spree
     #
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
     def update_payment_state
-
-      # line_item are empty when user empties cart
-      if line_items.empty? || round_money(order.payment_total) < round_money(order.total)
-        if payments.present?
-          if payments.last.state == 'failed'
-            order.payment_state = 'failed'
-          elsif payments.last.state == 'checkout'
-            order.payment_state = 'pending'
-          elsif payments.last.state == 'completed'
-            if line_items.empty?
-              order.payment_state = 'credit_owed'
-            else
-              order.payment_state = 'balance_due'
-            end
-          elsif payments.last.state == 'pending'
-            order.payment_state = 'balance_due'
-          else
-            order.payment_state = 'credit_owed'
-          end
-        else
-          order.payment_state = 'balance_due'
-        end
-      elsif round_money(order.payment_total) > round_money(order.total)
-        order.payment_state = 'credit_owed'
+      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
+        order.payment_state = 'void'
       else
-        order.payment_state = 'paid'
+        order.payment_state = 'balance_due' if order.outstanding_balance > 0
+        order.payment_state = 'credit_owed' if order.outstanding_balance < 0
+        order.payment_state = 'paid' if !order.outstanding_balance?
       end
-
-      order.state_changed('payment')
+      order.state_changed('payment') if last_state != order.payment_state
+      order.payment_state
     end
 
     private

data/app/models/spree/payment.rb

@@ -8,7 +8,7 @@ module Spree
 
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :payments
     belongs_to :source, polymorphic: true
-    belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
+    belongs_to :payment_method, class_name: 'Spree::PaymentMethod', inverse_of: :payments
 
     has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") },
       class_name: "Spree::Payment", foreign_key: :source_id
@@ -166,7 +166,8 @@ module Spree
       end
 
       def create_payment_profile
-        return unless source.respond_to?(:has_payment_profile?) && !source.has_payment_profile?
+        return unless source.respond_to?(:has_payment_profile?) && !source.has_payment_profile? &&
+          state != 'invalid' && state != 'failed'
 
         payment_method.create_profile(self)
       rescue ActiveMerchant::ConnectionError => e
@@ -174,8 +175,10 @@ module Spree
       end
 
       def invalidate_old_payments
-        order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-          payment.invalidate!
+        if state != 'invalid' and state != 'failed'
+          order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
+            payment.invalidate!
+          end
         end
       end
 

data/app/models/spree/payment_method.rb

@@ -8,7 +8,7 @@ module Spree
 
     validates :name, presence: true
 
-    has_many :payments, class_name: "Spree::Payment"
+    has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
     has_many :credit_cards, class_name: "Spree::CreditCard"
 
     def self.providers

data/app/models/spree/payment_method/check.rb

@@ -18,6 +18,8 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
+    def cancel(response); end
+
     def void(*args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end

data/app/models/spree/product.rb

@@ -39,9 +39,8 @@ module Spree
     has_one :master,
       -> { where is_master: true },
       inverse_of: :product,
-      class_name: 'Spree::Variant',
-      dependent: :destroy
-
+      class_name: 'Spree::Variant'
+      
     has_many :variants,
       -> { where(is_master: false).order("#{::Spree::Variant.quoted_table_name}.position ASC") },
       inverse_of: :product,

data/app/models/spree/promotion.rb

@@ -27,7 +27,7 @@ module Spree
     end
 
     def self.with_coupon_code(coupon_code)
-      where("lower(code) = ?", coupon_code.strip.downcase).first
+      where("lower(#{self.table_name}.code) = ?", coupon_code.strip.downcase).first
     end
 
     def self.active

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

@@ -45,6 +45,7 @@ module Spree
               order.contents.add(item.variant, item.quantity - current_quantity)
             end
           end
+          true
         end
       end
     end

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

@@ -72,11 +72,15 @@ module Spree
           end
         }
 
+        # Check for applied adjustments.
         discount = order.line_item_adjustments.promotion.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        if discount.eligible
+        # Check for applied line items.
+        created_line_items = promotion.actions.detect { |a| a.type == 'Spree::Promotion::Actions::CreateLineItems' }
+
+        if (discount && discount.eligible) || created_line_items
           order.update_totals
           order.persist_totals
           self.success = Spree.t(:coupon_code_applied)

data/app/models/spree/return_authorization.rb

@@ -1,8 +1,8 @@
 module Spree
   class ReturnAuthorization < ActiveRecord::Base
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 
-    has_many :inventory_units, dependent: :nullify
+    has_many :inventory_units, dependent: :nullify, inverse_of: :return_authorization
     belongs_to :stock_location
     before_create :generate_number
     before_save :force_positive_amount

data/app/models/spree/shipping_category.rb

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

data/app/models/spree/shipping_method_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class ShippingMethodCategory < ActiveRecord::Base
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
   end
 end

data/app/models/spree/stock_item.rb

@@ -2,7 +2,7 @@ module Spree
   class StockItem < ActiveRecord::Base
     acts_as_paranoid
 
-    belongs_to :stock_location, class_name: 'Spree::StockLocation'
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
     belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :stock_items
     has_many :stock_movements, inverse_of: :stock_item
 

data/app/models/spree/stock_location.rb

@@ -1,7 +1,7 @@
 module Spree
   class StockLocation < ActiveRecord::Base
     has_many :shipments
-    has_many :stock_items, dependent: :delete_all
+    has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State'

data/app/models/spree/tax_category.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     validates :name, presence: true, uniqueness: { scope: :deleted_at }
 
-    has_many :tax_rates, dependent: :destroy
+    has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
 
     before_save :set_default_category
 

data/app/models/spree/tax_rate.rb

@@ -11,10 +11,15 @@ end
 module Spree
   class TaxRate < ActiveRecord::Base
     acts_as_paranoid
+
+    # Need to deal with adjustments before calculator is destroyed.
+    before_destroy :deals_with_adjustments_for_deleted_source
+
     include Spree::Core::CalculatedAdjustments
     include Spree::Core::AdjustmentSource
-    belongs_to :zone, class_name: "Spree::Zone"
-    belongs_to :tax_category, class_name: "Spree::TaxCategory"
+
+    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
+    belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates
 
     has_many :adjustments, as: :source
 
@@ -22,8 +27,6 @@ module Spree
     validates :tax_category_id, presence: true
     validates_with DefaultTaxZoneValidator
 
-    before_destroy :deals_with_adjustments_for_deleted_source
-
     scope :by_zone, ->(zone) { where(zone_id: zone) }
 
     # Gets the array of TaxRates appropriate for the specified order

data/app/models/spree/variant.rb

@@ -9,7 +9,7 @@ module Spree
                         :shipping_category_id, :meta_description, :meta_keywords,
                         :shipping_category
 
-    has_many :inventory_units
+    has_many :inventory_units, inverse_of: :variant
     has_many :line_items, inverse_of: :variant
 
     has_many :stock_items, dependent: :destroy, inverse_of: :variant

data/app/models/spree/zone.rb

@@ -1,7 +1,8 @@
 module Spree
   class Zone < ActiveRecord::Base
-    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
-    has_many :tax_rates, dependent: :destroy
+    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember", inverse_of: :zone
+    has_many :tax_rates, dependent: :destroy, inverse_of: :zone
+
     has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones'
 
     validates :name, presence: true, uniqueness: true
@@ -14,7 +15,7 @@ module Spree
     def self.default_tax
       where(default_tax: true).first
     end
-  
+
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
@@ -91,23 +92,11 @@ module Spree
     end
 
     def country_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::Country'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::Country')
     end
 
     def state_ids=(ids)
-      zone_members.destroy_all
-      ids.reject{ |id| id.blank? }.map do |id|
-        member = ZoneMember.new
-        member.zoneable_type = 'Spree::State'
-        member.zoneable_id = id
-        members << member
-      end
+      set_zone_members(ids, 'Spree::State')
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -135,5 +124,15 @@ module Spree
       def remove_previous_default
         Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
       end
+
+      def set_zone_members(ids, type)
+        zone_members.destroy_all
+        ids.reject{ |id| id.blank? }.map do |id|
+          member = ZoneMember.new
+          member.zoneable_type = type
+          member.zoneable_id = id
+          members << member
+        end
+      end
   end
 end

data/app/models/spree/zone_member.rb

@@ -1,6 +1,6 @@
 module Spree
   class ZoneMember < ActiveRecord::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
     belongs_to :zoneable, polymorphic: true
 
     def name

data/config/locales/en.yml

@@ -418,6 +418,7 @@ en:
     back_to_users_list: Back To Users List
     back_to_zones_list: Back To Zones List
     backorderable: Backorderable
+    backorderable_default: Backorderable default
     backorders_allowed: backorders allowed
     balance_due: Balance Due
     bill_address: Bill Address
@@ -800,6 +801,7 @@ en:
     or_over_price: ! '%{price} or over'
     order: Order
     order_adjustments: Order adjustments
+    order_already_updated: The order has already been updated.
     order_approved: Order approved
     order_canceled: Order canceled
     order_details: Order Details
@@ -950,6 +952,7 @@ en:
         name: User Logged In
     promotions: Promotions
     promotion_uses: Promotion uses
+    propagate_all_variants: Propagate all variants
     properties: Properties
     property: Property
     prototype: Prototype

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,5 +1,10 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
+    # If Spree::ShippingMethod zones association was patched in
+    # CreateShippingMethodZone migrations, it needs to be patched back
+    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
+                                                          :class_name => 'Spree::Zone',
+                                                          :foreign_key => 'shipping_method_id'
   end
 end

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,10 +3,8 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # 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"
+    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
+      order.update_column(:shipment_total, order.shipments.sum(:cost))
+    end
   end
 end

data/db/migrate/20141021194502_add_state_lock_version_to_order.rb

@@ -0,0 +1,5 @@
+class AddStateLockVersionToOrder < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :state_lock_version, :integer, default: 0, null: false
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -57,14 +57,10 @@ User-agent: *
 Disallow: /checkout
 Disallow: /cart
 Disallow: /orders
-Disallow: /countries
-Disallow: /line_items
-Disallow: /password_resets
-Disallow: /states
-Disallow: /user_sessions
-Disallow: /user_registrations
-Disallow: /users
+Disallow: /user
 Disallow: /account
+Disallow: /api
+Disallow: /password
       ROBOTS
     end
 

data/lib/spree/core/controller_helpers/auth.rb

@@ -8,7 +8,7 @@ module Spree
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            unauthorized
+            redirect_unauthorized_access
           end
         end
 
@@ -20,7 +20,7 @@ module Spree
         # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
         # Override this method in your controllers if you want to have special behavior in case the user is not authorized
         # to access the requested action.  For example, a popup window might simply close itself.
-        def unauthorized
+        def redirect_unauthorized_access
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to '/unauthorized'

data/lib/spree/core/importer/order.rb

@@ -13,7 +13,9 @@ module Spree
             order = Spree::Order.create!
             order.associate_user!(user)
 
-            create_shipments_from_params(params.delete(:shipments_attributes), order)
+            shipments_attrs = params.delete(:shipments_attributes)
+
+            create_shipments_from_params(shipments_attrs, order)
             create_line_items_from_params(params.delete(:line_items_attributes),order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
@@ -30,8 +32,15 @@ module Spree
 
             order.update_attributes!(params)
 
+            order.create_proposed_shipments unless shipments_attrs.present?
+
             # Really ensure that the order totals & states are correct
             order.updater.update
+            if shipments_attrs.present?
+              order.shipments.each_with_index do |shipment, index|
+                shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
+              end
+            end
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -45,7 +54,7 @@ module Spree
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
+              shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
 
               if s[:shipped_at].present?
                 shipment.shipped_at = s[:shipped_at]
@@ -79,12 +88,15 @@ module Spree
           return {} unless line_items_hash
           line_items_hash.each_key do |k|
             begin
-              line_item = line_items_hash[k]
-              ensure_variant_id_from_params(line_item)
-
-              extra_params = line_item.except(:variant_id, :quantity)
+              extra_params = line_items_hash[k].except(:variant_id, :quantity, :sku)
+              line_item = ensure_variant_id_from_params(line_items_hash[k])
               line_item = order.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
-              line_item.update_attributes(extra_params) unless extra_params.empty?
+              # Raise any errors with saving to prevent import succeeding with line items failing silently.
+              if extra_params.present?
+                line_item.update_attributes!(extra_params)
+              else
+                line_item.save!
+              end
             rescue Exception => e
               raise "Order import line items: #{e.message} #{line_item}"
             end
@@ -124,10 +136,13 @@ module Spree
 
         def self.ensure_variant_id_from_params(hash)
           begin
+            sku = hash.delete(:sku)
             unless hash[:variant_id].present?
-              hash[:variant_id] = Spree::Variant.active.find_by_sku!(hash[:sku]).id
-              hash.delete(:sku)
+              hash[:variant_id] = Spree::Variant.active.find_by_sku!(sku).id
             end
+            hash
+          rescue ActiveRecord::RecordNotFound => e
+            raise "Ensure order import variant: Variant w/SKU #{sku} not found."
           rescue Exception => e
             raise "Ensure order import variant: #{e.message} #{hash}"
           end

data/lib/spree/core/validators/email.rb

@@ -1,6 +1,6 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record,attribute,value)
-    unless value =~ /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+    unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
       record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.6"
+    "2.2.7"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -34,7 +34,9 @@ module Spree
       :state => [:name, :abbr]
     ]
 
-    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
+    @@checkout_attributes = [
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
+    ]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 

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

@@ -16,7 +16,7 @@ FactoryGirl.define do
       bill_address
       ship_address
 
-      ignore do
+      transient do
         line_items_count 5
       end
 

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

@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'Promo'
 
     trait :with_line_item_adjustment do
-      ignore do
+      transient do
         adjustment_rate 10
       end
 
@@ -18,7 +18,7 @@ FactoryGirl.define do
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
     trait :with_order_adjustment do
-      ignore do
+      transient do
         order_adjustment_amount 10
       end
 
@@ -32,13 +32,13 @@ FactoryGirl.define do
     end
 
     trait :with_item_total_rule do
-      ignore do
+      transient do
         item_total_threshold_amount 10
       end
 
       after(:create) do |promotion, evaluator|
         rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator: 'gte', 
+          preferred_operator: 'gte',
           preferred_amount: evaluator.item_total_threshold_amount
         )
         promotion.rules << rule

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

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       contents []
     end
@@ -10,7 +10,7 @@ FactoryGirl.define do
   end
 
   factory :stock_package, class: Spree::Stock::Package do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       order { create(:order_with_line_items, line_items_count: 2) }
       contents []

data/lib/tasks/core.rake

@@ -86,8 +86,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     end
 
     if load_sample
-      #prevent errors for missing attributes (since rails 3.1 upgrade)
-
+      # Reload models' attributes in case they were loaded in old migrations with wrong attributes
+      ActiveRecord::Base.descendants.each(&:reset_column_information)
       Rake::Task["spree_sample:load"].invoke
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.8
+        version: 4.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.8
+        version: 4.0.12
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -609,6 +609,7 @@ files:
 - db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb
 - db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb
 - db/migrate/20140804185157_add_default_to_shipment_cost.rb
+- db/migrate/20141021194502_add_state_lock_version_to_order.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt