solidus_core 2.1.0.rc1 → 2.1.0

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/spree/price.rb +1 -1
  3. data/db/default/spree/stores.rb +1 -1
  4. data/lib/spree/core/version.rb +1 -1
  5. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6c66409a6f87b3a90858c73c06bd98dc912c9dfa
4
- data.tar.gz: '0148e46c9524d70114def79a9945127920e00289'
3
+ metadata.gz: 5f13c8544ce3ba77d4caf42287a68f8fa4a03d58
4
+ data.tar.gz: 5fe553761f79bc61f4be5b8ef3fdaa5f31976836
5
5
  SHA512:
6
- metadata.gz: ae05f78d66d73feae17890ea3632d76c6712d1358cc1173613bdfd0c6fb214dbaad740fe1b9a12249397555bf3ec405b60aae833a69f3b96f76bcf86ffec1b44
7
- data.tar.gz: 4f11abc46de577ac3aeff8cecc95e1f91fb1c8fd30c1546f3f7ad0b0da68a01161617c4a7b5ca6ec6acfe50bb4f7ede887815ae625dc86dc67142e729a436ea5
6
+ metadata.gz: 55dba61d25cb8bdd9a811c815c96a2e1bc87e73fda9f04f6b2871709ee724735de18bd9dd28744d4c7890b860922e8f90a746b7e6820a64ecbc5057d46606e5c
7
+ data.tar.gz: db6e781a3053c1fa55f565ac84d5c583fe0e733b32aa1ba1642e132986057145919ee71ce72635bcf5decd8e19a9f241f855c59b29d255a32470baabbac2d73d
data/app/models/spree/price.rb CHANGED
@@ -18,7 +18,7 @@ module Spree
18
18
  validates :currency, inclusion: { in: ::Money::Currency.all.map(&:iso_code), message: :invalid_code }
19
19
  validates :country, presence: true, unless: -> { for_any_country? }
20
20
 
21
- scope :currently_valid, -> { order("country_iso IS NULL, updated_at DESC") }
21
+ scope :currently_valid, -> { order("country_iso IS NULL, updated_at DESC, id DESC") }
22
22
  scope :for_master, -> { joins(:variant).where(spree_variants: { is_master: true }) }
23
23
  scope :for_variant, -> { joins(:variant).where(spree_variants: { is_master: false }) }
24
24
  scope :for_any_country, -> { where(country: nil) }
data/db/default/spree/stores.rb CHANGED
@@ -5,6 +5,6 @@ unless Spree::Store.where(code: 'spree').exists?
5
5
  s.name = 'Spree Demo Site'
6
6
  s.url = 'demo.spreecommerce.com'
7
7
  s.mail_from_address = 'spree@example.com'
8
- s.cart_tax_country_iso = Spree::Config.admin_vat_location
8
+ s.cart_tax_country_iso = 'US'
9
9
  end.save!
10
10
  end
data/lib/spree/core/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Spree
2
2
  def self.solidus_version
3
- "2.1.0.rc1"
3
+ "2.1.0"
4
4
  end
5
5
 
6
6
  def self.solidus_gem_version
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.1.0.rc1
4
+ version: 2.1.0
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-12-22 00:00:00.000000000 Z
11
+ date: 2017-01-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -1402,7 +1402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1402
1402
  version: 1.8.23
1403
1403
  requirements: []
1404
1404
  rubyforge_project:
1405
- rubygems_version: 2.5.2
1405
+ rubygems_version: 2.6.8
1406
1406
  signing_key:
1407
1407
  specification_version: 4
1408
1408
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.