solidus_core 2.0.0 → 2.0.1
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/zone.rb +12 -10
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/testing_support/common_rake.rb +2 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 28837b199c6bd4e7ce50f563024c4bba87df8ba2
|
|
4
|
+
data.tar.gz: 5ef299ef80511e203b2fe84419aa13fa6d7b255b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f296ea6422bf82a2a40ae202bb156f6af769e34eae871beb95b065b94f1fea614e33f277faa7be3841089f43725a1a3fe95e11e3cd2127d20f8361829a2a76a0
|
|
7
|
+
data.tar.gz: 87111e8518daa11b8290566aa98fe8ed1af95dc29ddd4b34074c76d4bb2f6d1203989a1f71e464b27b8faec661fe647f52823cc644b7dc43676f891bc218f6ca
|
data/app/models/spree/zone.rb
CHANGED
|
@@ -16,16 +16,18 @@ module Spree
|
|
|
16
16
|
after_save :remove_previous_default
|
|
17
17
|
|
|
18
18
|
scope :with_member_ids, ->(state_ids, country_ids) do
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
19
|
+
if !state_ids.present? && !country_ids.present?
|
|
20
|
+
none
|
|
21
|
+
else
|
|
22
|
+
spree_zone_members_table = Spree::ZoneMember.arel_table
|
|
23
|
+
matching_state =
|
|
24
|
+
spree_zone_members_table[:zoneable_type].eq("Spree::State").
|
|
25
|
+
and(spree_zone_members_table[:zoneable_id].in(state_ids))
|
|
26
|
+
matching_country =
|
|
27
|
+
spree_zone_members_table[:zoneable_type].eq("Spree::Country").
|
|
28
|
+
and(spree_zone_members_table[:zoneable_id].in(country_ids))
|
|
29
|
+
joins(:zone_members).where(matching_state.or(matching_country)).distinct
|
|
30
|
+
end
|
|
29
31
|
end
|
|
30
32
|
|
|
31
33
|
scope :for_address, ->(address) do
|
data/lib/spree/core/version.rb
CHANGED
|
@@ -17,7 +17,8 @@ namespace :common do
|
|
|
17
17
|
|
|
18
18
|
puts "Setting up dummy database..."
|
|
19
19
|
|
|
20
|
-
sh "
|
|
20
|
+
sh "bin/rails db:environment:set RAILS_ENV=test"
|
|
21
|
+
sh "bin/rails db:drop db:create db:migrate VERBOSE=false RAILS_ENV=test"
|
|
21
22
|
|
|
22
23
|
begin
|
|
23
24
|
require "generators/#{ENV['LIB_NAME']}/install/install_generator"
|
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.0.
|
|
4
|
+
version: 2.0.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: 2016-
|
|
11
|
+
date: 2016-12-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemerchant
|
|
@@ -1409,7 +1409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1409
1409
|
version: '0'
|
|
1410
1410
|
requirements: []
|
|
1411
1411
|
rubyforge_project:
|
|
1412
|
-
rubygems_version: 2.5.
|
|
1412
|
+
rubygems_version: 2.5.2
|
|
1413
1413
|
signing_key:
|
|
1414
1414
|
specification_version: 4
|
|
1415
1415
|
summary: Essential models, mailers, and classes for the Solidus e-commerce project.
|