spree_core 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f179eed81a4a5773fe95c383a4a48610e3019b
-  data.tar.gz: 2ef4dd915925f516a00cb89356de314a2a6b42fc
+  metadata.gz: 9eca458eb8cb28ced3d5d101ae8b09ba55fc474e
+  data.tar.gz: 3c46d9ac6eb9b54d2fa18d4008c1faa516f303a8
 SHA512:
-  metadata.gz: 4a4195bf3e8539dbde5ba0f11c71e28b9308d4dcc51447fa7186ece83f55eb682952431471f009a7f1d1b15e6636ae85619fa3d9be8bc7289c2250ccf4bec66d
-  data.tar.gz: 17b1db2c5d929d68840834625dafae8239af8e6af3cd02cde1af73e068044fb205416ed17b2cb396d9725fa76f7d9e9b2eb527312715bf9823a9e4c6ff7c5e45
+  metadata.gz: 6689b26acf76584fea6e4b36975256ecfd8f377ef9e209413df095d868843519dc4c5d915162eecf883e6da7cb53cc136f0c5dd2e73ec2f3bd3ba646c6ae1d9b
+  data.tar.gz: e13ef5aef9cd7250ed48d33113ff37964b4fe7a4da798b41f7e3c666077673b3cfdb0555c7b3253bf5c68b696e883e95281d38a670bb6211f56b986f6c8c6e64

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/order.rb

@@ -356,6 +356,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/config/locales/en.yml

@@ -1162,7 +1162,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.2.9"
+    "2.2.10"
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -28,6 +28,12 @@ module Spree
             ability = Spree::TestingSupport::AuthorizationHelpers::Request::SuperAbility
             Spree::Ability.register_ability(ability)
           end
+
+          before do
+            allow(Spree.user_class).to receive(:find_by).
+                                         with(hash_including(:spree_api_key)).
+                                         and_return(Spree.user_class.new)
+          end
         end
 
         def custom_authorization!(&block)
@@ -48,6 +54,6 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, :type => :controller
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -210,16 +210,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
@@ -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.