spree_core 2.4.8 → 2.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/spree/order.rb +2 -2
- data/lib/spree/core/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a521e65bfd71b442a333dda2b8a985f260271bb5
|
|
4
|
+
data.tar.gz: 74ef210d20467f665bf8291f0809faa233dd35ad
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2869743bc9699dcf28957325fd4ad920e78291c727159365572f370dab947a2a9079ff07b3274726687ae07c00e4dc0e32d1de2baaa0825b63a7bcc727f8f207
|
|
7
|
+
data.tar.gz: 826b25d6ed1d4261afd38c27f50b9a3d98443199a17d64edfa6d421ea169af2b6a8c94d226dc0de5f59e4e6d993c7892e8643df9355b7f52ee7f060c56a5d8a4
|
data/app/models/spree/order.rb
CHANGED
|
@@ -516,7 +516,7 @@ module Spree
|
|
|
516
516
|
end
|
|
517
517
|
|
|
518
518
|
def create_proposed_shipments
|
|
519
|
-
|
|
519
|
+
all_adjustments.shipping.delete_all
|
|
520
520
|
shipments.destroy_all
|
|
521
521
|
self.shipments = Spree::Stock::Coordinator.new(self).shipments
|
|
522
522
|
end
|
|
@@ -668,7 +668,7 @@ module Spree
|
|
|
668
668
|
if shipments.empty? || shipments.any? { |shipment| shipment.shipping_rates.blank? }
|
|
669
669
|
# After this point, order redirects back to 'address' state and asks user to pick a proper address
|
|
670
670
|
# Therefore, shipments are not necessary at this point.
|
|
671
|
-
shipments.
|
|
671
|
+
shipments.destroy_all
|
|
672
672
|
errors.add(:base, Spree.t(:items_cannot_be_shipped)) and return false
|
|
673
673
|
end
|
|
674
674
|
end
|
data/lib/spree/core/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.4.
|
|
4
|
+
version: 2.4.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-07-
|
|
11
|
+
date: 2015-07-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemerchant
|