effective_addresses 1.9.10 → 1.9.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/effective_addresses_helper.rb +12 -4
- data/lib/effective_addresses/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 314234d1308d0c4490e47e3ea34cfcb3f040aa8fd6058324aa7632d2814c2a75
|
|
4
|
+
data.tar.gz: 1d4483aa861846e02ba59267b011b34bdf079eef4b68a9f47492a963935b186c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d0809850d34e59c7a5314fa15ad4a5148ebdd6f00adac0ce55ba22ca322f485c221e1c20a771cf506c2edbc2bbd9d8d823555943293bba5cfbdbb312ba82ee91
|
|
7
|
+
data.tar.gz: 77a1f4d3dc70584ef8e5ed1cf1405f07249a47547a1bdb5da8df61656ebcd90d8484f5cc06a34fa17fc305cc12eba147edbcb9cb6e2776424a78cec885ddd06f
|
|
@@ -7,6 +7,7 @@ module EffectiveAddressesHelper
|
|
|
7
7
|
required = (form.object._validators[method.to_sym].any? { |v| v.kind_of?(ActiveRecord::Validations::PresenceValidator) && (v.options[:if].blank? || (v.options[:if].respond_to?(:call) ? f.object.instance_exec(&v.options[:if]) : v.options[:if])) } rescue true)
|
|
8
8
|
|
|
9
9
|
address = form.object.send(method) || form.object.addresses.build(category: method.to_s.gsub('_address', ''))
|
|
10
|
+
|
|
10
11
|
effective_address_pre_select(address) if address.new_record?
|
|
11
12
|
|
|
12
13
|
opts = { required: required, field_order: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code] }.merge(options).merge({:f => form, :address => address, :method => method})
|
|
@@ -24,16 +25,23 @@ module EffectiveAddressesHelper
|
|
|
24
25
|
end
|
|
25
26
|
|
|
26
27
|
def effective_address_pre_select(address)
|
|
27
|
-
if EffectiveAddresses.pre_selected_country.present?
|
|
28
|
-
address.country
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
if address.country.blank? && EffectiveAddresses.pre_selected_country.present?
|
|
29
|
+
address.country = EffectiveAddresses.pre_selected_country
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
if address.state.blank? && EffectiveAddresses.pre_selected_state.present?
|
|
33
|
+
address.state = EffectiveAddresses.pre_selected_state
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
if defined?(Geocoder) && request.try(:location).present?
|
|
31
37
|
location = request.location
|
|
32
38
|
address.country = location.country_code
|
|
33
39
|
address.state = location.state_code
|
|
34
40
|
address.postal_code = location.postal_code
|
|
35
41
|
address.city = location.city
|
|
36
42
|
end
|
|
43
|
+
|
|
44
|
+
address
|
|
37
45
|
end
|
|
38
46
|
|
|
39
47
|
def effective_address_regions_collection(regions = nil, resource: nil)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_addresses
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.9.
|
|
4
|
+
version: 1.9.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-05-
|
|
11
|
+
date: 2022-05-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|