spree_core 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4be9412583b406e2838b0edc12866be3d271b6a
-  data.tar.gz: e519d7bff34aaa8c73de122d6d27c4cfc7b2da78
+  metadata.gz: e33887c7715be995d8b06aa64c48cc8ff0f63dc1
+  data.tar.gz: 7020fb8b5a8e9cd5c20683d5a454c05755e96ec1
 SHA512:
-  metadata.gz: 11462b98f62e9ef52fcdb7c8327285f0c024e7c9a72d6ee19eee45e62e66d60a0b1141fc85bf0ee1aa846be067a075b517824affbb97cacf47bb3fd1cb4642c1
-  data.tar.gz: 6aa0a801e656d7381dfeb0f75960ddae08de7036c358ae3978b3be5632181f702c5e75efb1cc74df17edc1c2492edc8f004c9589e1e480812e869ae965bbb278
+  metadata.gz: a9da8aef7d8db0730a650136689e512686a1b4f2332ce7a7bb1eec5a5d62aa12b280dd8d56d5c39a1cec63956206d4bfdf957e3952f3f02f83360852eba5f065
+  data.tar.gz: 48a64ef3a959e0abbb99fc36b7572424c56ea8cbdd2619a446288865354760452d6bde8e14c229a5476c1e51985718d1b1187b0ef1cb9ddbaadd86a52a5186df

data/app/models/spree/adjustment.rb

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

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

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

data/app/models/spree/inventory_unit.rb

@@ -21,7 +21,7 @@ module Spree
       event :fill_backorder do
         transition to: :on_hand, from: :backordered
       end
-      after_transition on: :fill_backorder, do: :update_order
+      after_transition on: :fill_backorder, do: :fulfill_order
 
       event :ship do
         transition to: :shipped, if: :allow_ship?
@@ -69,9 +69,9 @@ module Spree
         Spree::Config[:allow_backorder_shipping] || self.on_hand?
       end
 
-      def update_order
+      def fulfill_order
         self.reload
-        order.update!
+        order.fulfill!
       end
   end
 end

data/app/models/spree/item_adjustments.rb

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

data/app/models/spree/order.rb

@@ -297,7 +297,7 @@ module Spree
     end
 
     def outstanding_balance
-      if self.state == 'canceled' && self.payments.present? && self.payments.completed.size > 0
+      if state == 'canceled'
         -1 * payment_total
       else
         total - payment_total
@@ -347,6 +347,12 @@ module Spree
       consider_risk
     end
 
+    def fulfill!
+      shipments.each { |shipment| shipment.update!(self) if shipment.persisted? }
+      updater.update_shipment_state
+      save!
+    end
+
     def deliver_order_confirmation_email
       OrderMailer.confirm_email(self.id).deliver
       update_column(:confirmation_delivered, true)

data/app/models/spree/order_updater.rb

@@ -158,9 +158,7 @@ module Spree
       last_state = order.payment_state
       if payments.present? && payments.valid.size == 0
         order.payment_state = 'failed'
-      elsif !payments.present? && order.state == 'canceled'
-        order.payment_state = 'void'
-      elsif order.state == 'canceled' && order.payment_total == 0 && payments.completed.size > 0
+      elsif order.state == 'canceled' && order.payment_total == 0
         order.payment_state = 'void'
       else
         order.payment_state = 'balance_due' if order.outstanding_balance > 0

data/app/models/spree/payment.rb

@@ -193,7 +193,7 @@ module Spree
       end
 
       def update_order
-        if self.completed?
+        if completed? || void?
           order.updater.update_payment_total
         end
 

data/app/models/spree/payment_method.rb

@@ -16,14 +16,14 @@ module Spree
     end
 
     def provider_class
-      raise ::NotImplementedError, 'You must implement provider_class method for this gateway.'
+      raise 'You must implement provider_class method for this gateway.'
     end
 
     # The class that will process payments for this payment type, used for @payment.source
     # e.g. CreditCard in the case of a the Gateway payment type
     # nil means the payment method doesn't require a source e.g. check
     def payment_source_class
-      raise ::NotImplementedError, 'You must implement payment_source_class method for this gateway.'
+      raise 'You must implement payment_source_class method for this gateway.'
     end
 
     def self.available(display_on = 'both')
@@ -67,9 +67,5 @@ module Spree
     def supports?(source)
       true
     end
-
-    def cancel(response)
-      raise ::NotImplementedError, 'You must implement cancel method for this payment method.'
-    end
   end
 end

data/app/models/spree/return_authorization.rb

@@ -91,7 +91,7 @@ module Spree
           end
         end
 
-        Adjustment.create(adjustable: order, amount: compute_amount, label: Spree.t(:rma_credit), source: self)
+        Adjustment.create(adjustable: order, amount: compute_amount, label: Spree.t(:rma_credit), order: order, source: self)
         order.update!
 
         order.return if inventory_units.all?(&:returned?)

data/config/locales/en.yml

@@ -1166,7 +1166,9 @@ en:
     usage_limit: Usage Limit
     use_app_default: Use App Default
     use_billing_address: Use Billing Address
+    use_existing_cc: Use an existing card on file
     use_new_cc: Use a new card
+    use_new_cc_or_payment_method: Use a new card / payment method
     use_s3: Use Amazon S3 For Images
     user: User
     user_rule:

data/db/migrate/20130807024301_upgrade_adjustments.rb

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

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.6'
+    '2.3.7'
   end
 end

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

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

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

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -202,16 +202,16 @@ dependencies:
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -232,14 +232,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -759,7 +759,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.