spree_core 2.4.8 → 2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4b6e2afb0968da8792da3d641cde6a8628eb48
-  data.tar.gz: c2c33ca5c66f6f1c4f2165b4e388f14d82884e91
+  metadata.gz: a521e65bfd71b442a333dda2b8a985f260271bb5
+  data.tar.gz: 74ef210d20467f665bf8291f0809faa233dd35ad
 SHA512:
-  metadata.gz: d115ad863b2eecbf62c10eca8635ad099eef6ed3228da587d6b17238e5f1da29664d7eea5ecca3fc579f599c697147d1d097f657bd1e9a0e7e02e44d80944931
-  data.tar.gz: 3999bfb8c5830d8ecdfccc20fa5921a4e358ee925348f71611c66272683526cdbe57ab9207c327471f50bb40e839d12f143859d1c9bda97bd6c17caaa7a87de1
+  metadata.gz: 2869743bc9699dcf28957325fd4ad920e78291c727159365572f370dab947a2a9079ff07b3274726687ae07c00e4dc0e32d1de2baaa0825b63a7bcc727f8f207
+  data.tar.gz: 826b25d6ed1d4261afd38c27f50b9a3d98443199a17d64edfa6d421ea169af2b6a8c94d226dc0de5f59e4e6d993c7892e8643df9355b7f52ee7f060c56a5d8a4

data/app/models/spree/order.rb

@@ -516,7 +516,7 @@ module Spree
     end
 
     def create_proposed_shipments
-      adjustments.shipping.delete_all
+      all_adjustments.shipping.delete_all
       shipments.destroy_all
       self.shipments = Spree::Stock::Coordinator.new(self).shipments
     end
@@ -668,7 +668,7 @@ module Spree
       if shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
         # After this point, order redirects back to 'address' state and asks user to pick a proper address
         # Therefore, shipments are not necessary at this point.
-        shipments.delete_all
+        shipments.destroy_all
         errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
       end
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.8"
+    '2.4.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.9
 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