spree_core 2.3.11 → 2.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220579fa75f0cf4f04ad3c1688427f6ac85bd9f7
-  data.tar.gz: 4b695dfd6914c69725d8efab2b49b053ea1498ab
+  metadata.gz: 65ea4c6536760142878867963831fef1329d7df0
+  data.tar.gz: e12480669bff9bbc377cc0dd6e8a217691372748
 SHA512:
-  metadata.gz: 4753626212fc08dfd1a242773210b59e38f9da5a927da31344da74a14b24fe9a676bfacb182f1d576fc71109d9c524b970b7f458402393bb9cd5570ea07f7b46
-  data.tar.gz: 67a816dbd5d27061e1918cdcf0cd431c63b843ff944ad01d567751d9790f5d113f84b47528be164480045760d17964d4aae3583d831d66460f6927ec9fe82c8a
+  metadata.gz: de264bbcb4b2ea76676cd1375181762ee9005b2501d5ed5683abba07bd502131ea5fe96bb72c21854feff74e8835d0034d2da96549c0463d3a1c9603bb926802
+  data.tar.gz: 388c0871a6518c6f045ed376d1b8121204cb8cf3a07b70a4f6761fe9e0311e9daa68ef1d4dc37677325dd59ba766fc67b6d63f3e7eb3b25100e0251d6f6f35ef

data/app/models/spree/order.rb

@@ -503,7 +503,7 @@ module Spree
     end
 
     def create_proposed_shipments
-      adjustments.shipping.delete_all
+      all_adjustments.shipping.delete_all
       shipments.destroy_all
 
       packages = Spree::Stock::Coordinator.new(self).packages

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.11'
+    '2.3.12'
   end
 end

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

@@ -5,5 +5,6 @@ FactoryGirl.define do
     year { 1.year.from_now.year }
     number '4111111111111111'
     name 'Spree Commerce'
+    association(:payment_method, factory: :credit_card_payment_method)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.11
+  version: 2.3.12
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant