solidus_core 2.6.0 → 2.6.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 48f10b1e610d9546a4aa2cc4c4d7397e1a8db8e1
|
4
|
+
data.tar.gz: 540e9bd7ad64cb204b70e8d906f7df957fcbe59c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 84976624f26ca20850a29d41fa740d10401d8f9145a840e2756d23852639b5d35ee01ab6db8a980e73a5b914cb44f898bce8a87fae58273b9295009e3d1cb7be
|
7
|
+
data.tar.gz: d5d02c798fbefe6d1bdd1eddc66c17812a76b70b1795eae1ba6d511c4bd0ae946c396eb21ca285a11929b1fdaf8ee6168663acd45a186aba0ae2da7fa1098daa
|
@@ -36,12 +36,8 @@ module Spree
|
|
36
36
|
elligible_amounts.sum
|
37
37
|
end
|
38
38
|
|
39
|
-
def weights
|
40
|
-
elligible_amounts.map { |amount| amount.to_f / subtotal.to_f }
|
41
|
-
end
|
42
|
-
|
43
39
|
def allocated_amounts
|
44
|
-
total_amount.to_money.allocate(
|
40
|
+
total_amount.to_money.allocate(elligible_amounts).map(&:to_money)
|
45
41
|
end
|
46
42
|
end
|
47
43
|
end
|
data/lib/spree/core/version.rb
CHANGED
data/solidus_core.gemspec
CHANGED
@@ -35,9 +35,9 @@ Gem::Specification.new do |s|
|
|
35
35
|
s.add_dependency 'discard', '~> 1.0'
|
36
36
|
s.add_dependency 'friendly_id', '~> 5.0'
|
37
37
|
s.add_dependency 'kaminari-activerecord', '~> 1.1'
|
38
|
-
s.add_dependency 'monetize', '~> 1.
|
38
|
+
s.add_dependency 'monetize', '~> 1.8'
|
39
39
|
s.add_dependency 'paperclip', ['>= 4.2', '< 6']
|
40
40
|
s.add_dependency 'paranoia', '~> 2.4'
|
41
|
-
s.add_dependency 'ransack', '~>
|
41
|
+
s.add_dependency 'ransack', '~> 2.0'
|
42
42
|
s.add_dependency 'state_machines-activerecord', '~> 0.4'
|
43
43
|
end
|
@@ -379,13 +379,13 @@ RSpec.describe Spree::Order, type: :model do
|
|
379
379
|
|
380
380
|
it "does nothing if any shipments are ready" do
|
381
381
|
shipment = create(:shipment, order: subject, state: "ready")
|
382
|
-
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
|
382
|
+
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments.pluck(:id) }
|
383
383
|
expect { shipment.reload }.not_to raise_error
|
384
384
|
end
|
385
385
|
|
386
386
|
it "does nothing if any shipments are shipped" do
|
387
387
|
shipment = create(:shipment, order: subject, state: "shipped")
|
388
|
-
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments }
|
388
|
+
expect { subject.ensure_updated_shipments }.not_to change { subject.reload.shipments.pluck(:id) }
|
389
389
|
expect { shipment.reload }.not_to raise_error
|
390
390
|
end
|
391
391
|
end
|
@@ -1102,11 +1102,12 @@ RSpec.describe Spree::Order, type: :model do
|
|
1102
1102
|
|
1103
1103
|
it "raises an error if any shipments are ready" do
|
1104
1104
|
shipment = create(:shipment, order: subject, state: "ready")
|
1105
|
+
|
1105
1106
|
expect {
|
1106
1107
|
expect {
|
1107
1108
|
subject.create_proposed_shipments
|
1108
1109
|
}.to raise_error(Spree::Order::CannotRebuildShipments)
|
1109
|
-
}.not_to change { subject.reload.shipments }
|
1110
|
+
}.not_to change { subject.reload.shipments.pluck(:id) }
|
1110
1111
|
|
1111
1112
|
expect { shipment.reload }.not_to raise_error
|
1112
1113
|
end
|
@@ -1117,7 +1118,7 @@ RSpec.describe Spree::Order, type: :model do
|
|
1117
1118
|
expect {
|
1118
1119
|
subject.create_proposed_shipments
|
1119
1120
|
}.to raise_error(Spree::Order::CannotRebuildShipments)
|
1120
|
-
}.not_to change { subject.reload.shipments }
|
1121
|
+
}.not_to change { subject.reload.shipments.pluck(:id) }
|
1121
1122
|
|
1122
1123
|
expect { shipment.reload }.not_to raise_error
|
1123
1124
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.6.
|
4
|
+
version: 2.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-09-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -294,14 +294,14 @@ dependencies:
|
|
294
294
|
requirements:
|
295
295
|
- - "~>"
|
296
296
|
- !ruby/object:Gem::Version
|
297
|
-
version: '1.
|
297
|
+
version: '1.8'
|
298
298
|
type: :runtime
|
299
299
|
prerelease: false
|
300
300
|
version_requirements: !ruby/object:Gem::Requirement
|
301
301
|
requirements:
|
302
302
|
- - "~>"
|
303
303
|
- !ruby/object:Gem::Version
|
304
|
-
version: '1.
|
304
|
+
version: '1.8'
|
305
305
|
- !ruby/object:Gem::Dependency
|
306
306
|
name: paperclip
|
307
307
|
requirement: !ruby/object:Gem::Requirement
|
@@ -342,14 +342,14 @@ dependencies:
|
|
342
342
|
requirements:
|
343
343
|
- - "~>"
|
344
344
|
- !ruby/object:Gem::Version
|
345
|
-
version: '
|
345
|
+
version: '2.0'
|
346
346
|
type: :runtime
|
347
347
|
prerelease: false
|
348
348
|
version_requirements: !ruby/object:Gem::Requirement
|
349
349
|
requirements:
|
350
350
|
- - "~>"
|
351
351
|
- !ruby/object:Gem::Version
|
352
|
-
version: '
|
352
|
+
version: '2.0'
|
353
353
|
- !ruby/object:Gem::Dependency
|
354
354
|
name: state_machines-activerecord
|
355
355
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1195,7 +1195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1195
1195
|
version: 1.8.23
|
1196
1196
|
requirements: []
|
1197
1197
|
rubyforge_project:
|
1198
|
-
rubygems_version: 2.
|
1198
|
+
rubygems_version: 2.6.10
|
1199
1199
|
signing_key:
|
1200
1200
|
specification_version: 4
|
1201
1201
|
summary: Essential models, mailers, and classes for the Solidus e-commerce project.
|