effective_addresses 1.9.7 → 1.9.10
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/helpers/effective_addresses_helper.rb +6 -6
- data/app/views/effective/addresses/_address.html.haml +1 -1
- data/app/views/effective/addresses/_form_with.html.haml +5 -3
- data/app/views/effective/addresses/_formtastic.html.haml +2 -2
- data/app/views/effective/addresses/_simple_form.html.haml +2 -2
- 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: 0c807a8092382e92e91d4f5ca5044e0db66c6b65f5c429a012001d65574368a7
|
|
4
|
+
data.tar.gz: f137ade40e7a67a34cb0aa7deab9d41d703aba1b9d7c073bf8d180bb5d75c138
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2c6d33356448efa633b0854f5a7f27b4c72d34dfbf2caa8bbfcadddfc394462492eff4286e30aa6ac4f23a5bd21c72b5d1a5afd6f2338e0c58b2c0e6b7f60afb
|
|
7
|
+
data.tar.gz: 82a70d7781ef2a260711db99f4b2a507b8cf86b37e5e360419ec1713c8c6a61dc2573d2b7a1196d5b858f2a1bbc3547d157964d7078e83c21a4f28cc18a73eb5
|
|
@@ -25,8 +25,8 @@ module EffectiveAddressesHelper
|
|
|
25
25
|
|
|
26
26
|
def effective_address_pre_select(address)
|
|
27
27
|
if EffectiveAddresses.pre_selected_country.present?
|
|
28
|
-
address.country
|
|
29
|
-
address.state
|
|
28
|
+
address.country ||= EffectiveAddresses.pre_selected_country
|
|
29
|
+
address.state ||= EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
|
|
30
30
|
elsif defined?(Geocoder) && request.location.present?
|
|
31
31
|
location = request.location
|
|
32
32
|
address.country = location.country_code
|
|
@@ -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?
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
- if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
|
|
9
9
|
= f.errors method
|
|
10
10
|
|
|
11
|
-
- if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
11
|
+
- if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
12
12
|
= fa.text_field :full_name,
|
|
13
13
|
required: required,
|
|
14
14
|
disabled: same_as_billing,
|
|
@@ -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,
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
|
|
10
10
|
- case field
|
|
11
11
|
- when :full_name
|
|
12
|
-
- if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
12
|
+
- if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
13
13
|
= fa.input :full_name, :required => true, :label => 'Full name', :placeholder => 'Full name'
|
|
14
14
|
|
|
15
15
|
- when :address1
|
|
@@ -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' }
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
- case field
|
|
12
12
|
- when :full_name
|
|
13
|
-
- if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
13
|
+
- if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
|
|
14
14
|
= fa.input :full_name,
|
|
15
15
|
required: required,
|
|
16
16
|
disabled: shipping_address_same_as_billing,
|
|
@@ -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.10
|
|
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:
|
|
11
|
+
date: 2022-05-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|