spree_core 4.1.0.rc1 → 4.1.0.rc2
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
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bdc19a0196b06913c237d25f4e45315ea03abf5a5b30e5e660440339daf7e5f0
|
|
4
|
+
data.tar.gz: c5d95ff6a5ca995ae81ee67ffbfe8b17a09a24afd5f83cfa5e7fc1a3b19a1fb9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '098925f7a1dc32e87a5a1a0798b13a7983d86a1fe5cb8f2f20f9ffb50eb0098c79785e81c849d1137bba1362d01edfd9fe3cdf904092943c3a354f47a057ec3c'
|
|
7
|
+
data.tar.gz: 8f052c9cc5437ad254105c6e5236968a81c7dd5c1f8af4fd086f97bf684784b3b64f7aaeae317a1840225931848958f7007ae6ffc1b63b319d820062b2cb8cab
|
data/app/models/spree/order.rb
CHANGED
|
@@ -51,7 +51,7 @@ module Spree
|
|
|
51
51
|
go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
|
|
52
52
|
go_to_state :confirm, if: ->(order) { order.confirmation_required? }
|
|
53
53
|
go_to_state :complete
|
|
54
|
-
remove_transition from: :delivery, to: :confirm
|
|
54
|
+
remove_transition from: :delivery, to: :confirm, unless: ->(order) { order.confirmation_required? }
|
|
55
55
|
end
|
|
56
56
|
|
|
57
57
|
self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items store]
|
|
@@ -12,6 +12,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
|
|
|
12
12
|
store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
|
|
13
13
|
store.meta_keywords = preference_store.get('spree/app_configuration/default_meta_keywords') {}
|
|
14
14
|
store.seo_title = preference_store.get('spree/app_configuration/default_seo_title') {}
|
|
15
|
+
store.default_currency = preference_store.get('spree/app_configuration/currency') { 'USD' }
|
|
15
16
|
store.save!
|
|
16
17
|
else
|
|
17
18
|
# we set defaults for the things we now require
|
|
@@ -13,22 +13,23 @@ module Spree
|
|
|
13
13
|
end
|
|
14
14
|
|
|
15
15
|
def included(host)
|
|
16
|
-
generator_method = method(:generate_permalink)
|
|
17
16
|
generator_instance = self
|
|
18
17
|
|
|
19
18
|
host.class_eval do
|
|
20
19
|
validates(:number, presence: true, uniqueness: { allow_blank: true })
|
|
21
20
|
|
|
22
21
|
before_validation do |instance|
|
|
23
|
-
instance.number ||=
|
|
22
|
+
instance.number ||= generate_permalink(host)
|
|
24
23
|
end
|
|
25
24
|
|
|
26
25
|
define_singleton_method(:number_generator) { generator_instance }
|
|
26
|
+
|
|
27
|
+
def generate_permalink(host)
|
|
28
|
+
host.number_generator.generate_permalink(host)
|
|
29
|
+
end
|
|
27
30
|
end
|
|
28
31
|
end
|
|
29
32
|
|
|
30
|
-
private
|
|
31
|
-
|
|
32
33
|
def generate_permalink(host)
|
|
33
34
|
length = @length
|
|
34
35
|
|
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: 4.1.0.
|
|
4
|
+
version: 4.1.0.rc2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-02-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemerchant
|
|
@@ -1102,7 +1102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1102
1102
|
- !ruby/object:Gem::Version
|
|
1103
1103
|
version: 1.8.23
|
|
1104
1104
|
requirements: []
|
|
1105
|
-
rubygems_version: 3.0.
|
|
1105
|
+
rubygems_version: 3.0.6
|
|
1106
1106
|
signing_key:
|
|
1107
1107
|
specification_version: 4
|
|
1108
1108
|
summary: The bare bones necessary for Spree.
|