effective_addresses 1.9.8 → 1.9.9
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 +4 -4
- data/app/views/effective/addresses/_form_with.html.haml +4 -2
- data/app/views/effective/addresses/_formtastic.html.haml +1 -1
- data/app/views/effective/addresses/_simple_form.html.haml +1 -1
- 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: fd974c66e5bcdc5eaa644505a3cdc1dcad2aaa54de34597bb81d1bdef2c403f9
|
|
4
|
+
data.tar.gz: 215d02c276840271457e6322d979abb53ad27c996af3e748466d16fbed3c8179
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d365f1068f255e29cf975e5e88877519eb600c1238a5d53e85bd8a0a0411721f3e80d2c5d4af7770dd9dab34110b732d0826b7ca40d2be627ce37c35921c4f42
|
|
7
|
+
data.tar.gz: 2ccb92180c02b9ddd9251d8262d476845079c92ced8e475f2247015037009760925958d68fab710b81f5c8cd2f2fef912d3e2c2c8457e79bcc5400beb297a1ba
|
|
@@ -37,12 +37,12 @@ module EffectiveAddressesHelper
|
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
def effective_address_regions_collection(regions = nil, resource: nil)
|
|
40
|
-
if regions.present?
|
|
41
|
-
|
|
40
|
+
countries = if regions.present?
|
|
41
|
+
regions
|
|
42
42
|
elsif EffectiveAddresses.country_codes == :all
|
|
43
|
-
|
|
43
|
+
Carmen::Country.all
|
|
44
44
|
else
|
|
45
|
-
|
|
45
|
+
Carmen::Country.all.select { |c| (EffectiveAddresses.country_codes || []).include?(c.code) }
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
if regions.blank? && EffectiveAddresses.country_codes_priority.present?
|
|
@@ -49,8 +49,10 @@
|
|
|
49
49
|
wrapper: wrapper_options
|
|
50
50
|
|
|
51
51
|
.col-md-5
|
|
52
|
-
-
|
|
53
|
-
|
|
52
|
+
- subregions = Carmen::Country.coded(fa.object.country_code).try(:subregions) if fa.object.country_code.present?
|
|
53
|
+
|
|
54
|
+
- if subregions.present?
|
|
55
|
+
= fa.select :state_code, effective_address_regions_collection(subregions),
|
|
54
56
|
label: 'State / Province',
|
|
55
57
|
required: required,
|
|
56
58
|
disabled: same_as_billing,
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
= fa.input :state_code,
|
|
39
39
|
:as => (defined?(EffectiveFormInputs) ? :effective_select : :select),
|
|
40
40
|
:label => 'Province / State',
|
|
41
|
-
:collection => options_for_select(effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions)),
|
|
41
|
+
:collection => options_for_select(effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).try(:subregions))),
|
|
42
42
|
:prompt => 'please select a country',
|
|
43
43
|
:input_html => { 'data-effective-address-state' => uuid },
|
|
44
44
|
:input_js => { :placeholder => 'Please choose' }
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
= fa.input :state_code,
|
|
52
52
|
as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
|
|
53
53
|
required: required,
|
|
54
|
-
collection: effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions),
|
|
54
|
+
collection: effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).try(:subregions)),
|
|
55
55
|
prompt: 'Please choose',
|
|
56
56
|
input_html: {'data-effective-address-state' => uuid},
|
|
57
57
|
input_js: { placeholder: 'Please choose' },
|
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.9
|
|
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-
|
|
11
|
+
date: 2022-04-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|