spree_core 2.3.1 → 2.3.2

data/lib/spree/core.rb

@@ -65,6 +65,7 @@ require 'spree/core/user_payment_source'
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/permalinks'
 require 'spree/core/calculated_adjustments'
+require 'spree/core/adjustment_source'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers'
 require 'spree/core/controller_helpers/search'

data/lib/spree/core/adjustment_source.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Core
+    module AdjustmentSource
+      def self.included(klass)
+        klass.class_eval do
+          def deals_with_adjustments_for_deleted_source
+            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").destroy_all
+
+            # For complete orders, the source will be invalid.
+            # Therefore we nullify the source_id, leaving the adjustment in place.
+            # This would mean that the order's total is not altered at all.
+            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
+              adjustment.update_columns(
+                source_id: nil,
+                updated_at: Time.now,
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers.rb

@@ -1,18 +1,19 @@
-require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/auth'
-require 'spree/core/controller_helpers/respond_with'
+require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
+require 'spree/core/controller_helpers/respond_with'
+require 'spree/core/controller_helpers/store'
 
 module Spree
   module Core
     module ControllerHelpers
-      def self.included(klass)
-        klass.class_eval do
-          include Spree::Core::ControllerHelpers::Common
-          include Spree::Core::ControllerHelpers::Auth
-          include Spree::Core::ControllerHelpers::RespondWith
-          include Spree::Core::ControllerHelpers::Order
-        end
+      extend ActiveSupport::Concern
+      included do
+        include Spree::Core::ControllerHelpers::Auth
+        include Spree::Core::ControllerHelpers::Common
+        include Spree::Core::ControllerHelpers::Order
+        include Spree::Core::ControllerHelpers::RespondWith
+        include Spree::Core::ControllerHelpers::Store
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Spree
 
         # Used in the link_to_cart helper.
         def simple_current_order
-          @order ||= Spree::Order.find_by(completed_at: nil, currency: current_currency, guest_token: cookies.signed[:guest_token])
+          @simple_current_order ||= Spree::Order.incomplete.find_by(current_order_params)
         end
 
         # The current incomplete order from the guest_token for use in cart and during checkout
@@ -25,10 +25,15 @@ module Spree
           return @current_order if @current_order
 
           # Find any incomplete orders for the guest_token
-          @current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).find_by(completed_at: nil, currency: current_currency, guest_token: cookies.signed[:guest_token])
+          @current_order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+
+          # Find any incomplete orders for the current user
+          if @current_order.nil? && try_spree_current_user
+            @current_order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
+          end
 
           if options[:create_order_if_necessary] and (@current_order.nil? or @current_order.completed?)
-            @current_order = Spree::Order.new(currency: current_currency, guest_token: cookies.signed[:guest_token])
+            @current_order = Spree::Order.new(current_order_params)
             @current_order.user ||= try_spree_current_user
             # See issue #3346 for reasons why this line is here
             @current_order.created_by ||= try_spree_current_user
@@ -50,8 +55,7 @@ module Spree
 
         def set_current_order
           if user = try_spree_current_user
-            last_incomplete_order = user.last_incomplete_spree_order
-            if last_incomplete_order
+            if cookies.signed[:guest_token].nil? && last_incomplete_order
               cookies.permanent.signed[:guest_token] = last_incomplete_order.guest_token
             elsif current_order && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order, user)
@@ -66,6 +70,15 @@ module Spree
         def ip_address
           request.remote_ip
         end
+
+        private
+        def last_incomplete_order
+          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order
+        end
+
+        def current_order_params
+          { currency: current_currency, guest_token: cookies.signed[:guest_token], user_id: try_spree_current_user.try(:id) }
+        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -48,12 +48,16 @@ module Spree
         app.config.spree.calculators.promotion_actions_create_adjustments = [
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
-          Spree::Calculator::FlexiRate
+          Spree::Calculator::FlexiRate,
+          Spree::Calculator::TieredPercent,
+          Spree::Calculator::TieredFlatRate
         ]
 
         app.config.spree.calculators.add_class('promotion_actions_create_item_adjustments')
         app.config.spree.calculators.promotion_actions_create_item_adjustments = [
-          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::PercentOnLineItem,
+          Spree::Calculator::FlatRate,
+          Spree::Calculator::FlexiRate
         ]
       end
 

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

@@ -13,20 +13,22 @@ module Spree
             order = Spree::Order.create!
             order.associate_user!(user)
 
-            create_shipments_from_params(params.delete(:shipments_attributes), order)
             create_line_items_from_params(params.delete(:line_items_attributes),order)
+            create_shipments_from_params(params.delete(:shipments_attributes), order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
-            if(completed_at = params.delete(:completed_at))
+            if completed_at = params.delete(:completed_at)
               order.completed_at = completed_at
               order.state = 'complete'
             end
 
+            params.delete(:user_id) unless user.try(:has_spree_role?, "admin") && params.key?(:user_id)
+
             order.update_attributes!(params)
-            # Really ensure that the order totals are correct
-            order.update_totals
-            order.persist_totals
+
+            # Really ensure that the order totals & states are correct
+            order.updater.update
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -36,10 +38,12 @@ module Spree
 
         def self.create_shipments_from_params(shipments_hash, order)
           return [] unless shipments_hash
+
+          line_items = order.line_items
           shipments_hash.each do |s|
             begin
               shipment = order.shipments.build
-              shipment.tracking = s[:tracking]
+              shipment.tracking       = s[:tracking]
               shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
 
               inventory_units = s[:inventory_units] || []
@@ -48,15 +52,33 @@ module Spree
 
                 unit = shipment.inventory_units.build
                 unit.order = order
+
+                # Spree expects a Inventory Unit to always reference a line
+                # item and variant otherwise users might get exceptions when
+                # trying to view these units. Note the Importer might not be
+                # able to find the line item if line_item.variant_id |= iu.variant_id
                 unit.variant_id = iu[:variant_id]
+                unit.line_item_id = line_items.select do |l|
+                  l.variant_id.to_i == iu[:variant_id].to_i
+                end.first.try(:id)
+              end
+
+              # Mark shipped if it should be.
+              if s[:shipped_at].present?
+                shipment.shipped_at = s[:shipped_at]
+                shipment.state      = 'shipped'
+                shipment.inventory_units.each do |unit|
+                  unit.state = 'shipped'
+                end
               end
 
               shipment.save!
 
-              shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
+              shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
               rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
                                                      :cost => s[:cost])
               shipment.selected_shipping_rate_id = rate.id
+              shipment.update_amounts
 
             rescue Exception => e
               raise "Order import shipments: #{e.message} #{s}"
@@ -98,10 +120,13 @@ module Spree
           return [] unless payments_hash
           payments_hash.each do |p|
             begin
-              payment = order.payments.build
+              payment = order.payments.build order: order
               payment.amount = p[:amount].to_f
-              payment.state = p.fetch(:state, 'completed')
+              # Order API should be using state as that's the normal payment field.
+              # spree_wombat serializes payment state as status so imported orders should fall back to status field.
+              payment.state = p[:state] || p[:status] || 'completed'
               payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
+              payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
               payment.save!
             rescue Exception => e
               raise "Order import payments: #{e.message} #{p}"
@@ -109,6 +134,24 @@ module Spree
           end
         end
 
+        def self.create_source_payment_from_params(source_hash, payment)
+          begin
+            Spree::CreditCard.create(
+              month: source_hash[:month],
+              year: source_hash[:year],
+              cc_type: source_hash[:cc_type],
+              last_digits: source_hash[:last_digits],
+              name: source_hash[:name],
+              payment_method: payment.payment_method,
+              gateway_customer_profile_id: source_hash[:gateway_customer_profile_id],
+              gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
+              imported: true
+            )
+          rescue Exception => e
+            raise "Order import source payments: #{e.message} #{source_hash}"
+          end
+        end
+
         def self.ensure_variant_id_from_params(hash)
           begin
             unless hash[:variant_id].present?

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.3.1"
+    "2.3.2"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -28,9 +28,9 @@ module Spree
     mattr_reader *ATTRIBUTES
 
     @@address_attributes = [
-      :firstname, :lastname, :address1, :address2,
-      :city, :country_id, :state_id, :zipcode, :phone,
-      :state_name, :alternative_phone, :company,
+      :firstname, :lastname, :first_name, :last_name, 
+      :address1, :address2, :city, :country_id, :state_id, 
+      :zipcode, :phone, :state_name, :alternative_phone, :company,
       :country => [:iso, :name, :iso3, :iso_name],
       :state => [:name, :abbr]
     ]
@@ -96,7 +96,7 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
-      :position, :option_value_ids,
+      :position, :option_value_ids, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
       :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
   end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -17,7 +17,7 @@ module Spree
         def stub_authorization!(&block)
           ability_class = build_ability(&block)
           before do
-            allow(controller).to receive(:current_ability).and_return{ ability_class.new(nil) }
+            allow(controller).to receive(:current_ability).and_return(ability_class.new(nil))
           end
         end
       end

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

@@ -4,7 +4,7 @@ FactoryGirl.define do
     description { generate(:random_description) }
     price 19.99
     cost_price 17.00
-    sku 'ABC'
+    sku { "ABC-#{Kernel.rand(9999)}" }
     available_on { 1.year.ago }
     deleted_at nil
     shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.27.0
 - !ruby/object:Gem::Dependency
-  name: cancan
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.10
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.10
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -109,61 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.18
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.18
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.6.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.6.18
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -304,20 +304,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: font-awesome-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: The bare bones necessary for Spree.
 email: sean@spreecommerce.com
 executables: []
@@ -366,6 +352,8 @@ files:
 - app/models/spree/calculator/shipping/flexi_rate.rb
 - app/models/spree/calculator/shipping/per_item.rb
 - app/models/spree/calculator/shipping/price_sack.rb
+- app/models/spree/calculator/tiered_flat_rate.rb
+- app/models/spree/calculator/tiered_percent.rb
 - app/models/spree/classification.rb
 - app/models/spree/configuration.rb
 - app/models/spree/country.rb
@@ -621,6 +609,7 @@ files:
 - db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb
 - 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/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -642,6 +631,7 @@ files:
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/spree/core.rb
+- lib/spree/core/adjustment_source.rb
 - lib/spree/core/calculated_adjustments.rb
 - lib/spree/core/controller_helpers.rb
 - lib/spree/core/controller_helpers/auth.rb