effective_addresses 1.11.1 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cea39f0fbbd41a2fe3102bb1921df46493eb70ff3fec72d044a98787cafd28e5
-  data.tar.gz: 11ec3bb2eeca4d3c4fe92d4bea98427aa5168c6da0391a60ab2fad3e80285e88
+  metadata.gz: 875531cb4889a5a4bac22dfee65f6e03c02cb58835f132eddcce745e19e4581e
+  data.tar.gz: 81d53f0f6a5d82eccf5af47b301efff084ae3c0751ff434a8a03a73a66a7ac9a
 SHA512:
-  metadata.gz: b78b1a0607d0ae04104dab5fab3d2f75afeeed568d01f6fa4297c7ce94c8a7becd85c1f490d22221a270ccbf46d56828faf72d7e3ec62cecea043cb05ab363fd
-  data.tar.gz: 13f3841abe2ade90009e17ce9d6f9192fd6ce43edde87a664651cd602c79274b147380e31c63db7207c3c7293a530c9db1ec1d090d05572f42e811d099e55fe2
+  metadata.gz: 7140b689a093ba423b5fb253145fecf750742ffa4a0bf5334f526f1b9d2be0209efcdfd53d87feb8858bd4d08e74554a01fe01786ad0e324749ac0e79c7de481
+  data.tar.gz: 474a68e289138b8418cf3808ae19eeef1e18a78717e2658ac2a1377eff7142e289f7de20db2ba678b0892c91baad515b24754e49e7e06c5d04a5cf69cc32b4b5

data/app/helpers/effective_addresses_helper.rb

@@ -62,12 +62,16 @@ module EffectiveAddressesHelper
     countries = countries.map { |c| [c.name, c.code] }.sort! { |a, b| a.first <=> b.first }
 
     if regions.blank? && EffectiveAddresses.country_codes_priority.present?
-      countries.unshift(*
-        EffectiveAddresses.country_codes_priority.map do |code|
-          country = Carmen::Country.coded(code)
-          [country.name, country.code]
-        end + [['-------------------', '-', disabled: :disabled]]
-      )
+      priorities = EffectiveAddresses.country_codes_priority.map do |code|
+        country = Carmen::Country.coded(code)
+        [country.name, country.code]
+      end
+
+      unless EffectiveAddresses.country_codes.kind_of?(Array)
+        priorities << ['-------------------', '-', disabled: :disabled]
+      end
+
+      countries.unshift(*priorities)
     end
 
     # Special behaviour if the address has CAN, we treat it as CA

data/app/views/effective/addresses/_form_with.html.haml

@@ -1,9 +1,9 @@
 = f.fields_for method, (address || f.object.send(method) || f.object.addresses.build(category: method.to_s.gsub('_address', ''))) do |fa|
   - uuid = fa.object_id
   - method = method.to_sym
-  - same_as_billing = (fa.object.category == 'shipping') && (f.object.try(:shipping_address_same_as_billing?) || false)
+  - same_as_billing = (fa.object.category == 'shipping') && f.object.try(:shipping_address_same_as_billing?)
   - required = (required && !same_as_billing)
-  - wrapper_options = (same_as_billing ? { style: 'display: none;', class: 'form-group shipping_address_form_group' } : {})
+  - wrapper_options = { class: "form-group #{method}_form_group", style: ('display: none;' if same_as_billing) }
 
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     = f.errors method

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.11.1'.freeze
+  VERSION = '1.11.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails