effective_addresses 1.11.2 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66533e87c7a7da2a8328a1adab981fa04b84fc694e9563dc7775a131953d167
-  data.tar.gz: 1f5b37866d4ecd280033175ffb19752a3014bb90cc551d3368cd42b5f3cd422f
+  metadata.gz: fdee75d31b431c6efbde72fe1cd277cd95dce281445616a819a8559087d1401f
+  data.tar.gz: b0fb7c4babcb490b5ffc877c47d5f5e811411a8bf76524815646bb7e58fd8a8e
 SHA512:
-  metadata.gz: aead11f98356d3cfe682606f761ee150414bd0e98c6932cce5657354bd5e8c8c1d14cd172db86dc0aa7dffc3f978656baef91402d52fbc6f10895de2f85ef1d3
-  data.tar.gz: 9340f0b4ccff8dd533c0a045e089a11cfa0fb4af00a3ad62ad4a548582b74de4a6a997df5700db7e55dd02e5003420239611f689de120baea62e41f2f37f8813
+  metadata.gz: 65dea3c72e2738550087312d8134d641ca97d782966e5042f31e880ab57d056643a17217f4c171aba21b3a19862fa66cd08e276a2a835185c51455212121cc13
+  data.tar.gz: 701feaed5e27cac932a97aa5e3e8351a1a7c1f525479b54422c41d5a267172cc4752bab75f3ec5502fc53d62f3cb6b8c955cc58a2c281499e3b6d786dc31b552

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

@@ -15,7 +15,7 @@
       wrapper: wrapper_options
 
   = fa.text_field :address1,
-    label: 'Address',
+    label: (local_assigns[:label] || method.to_s.titleize),
     required: required,
     disabled: same_as_billing,
     wrapper: wrapper_options

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.11.2'.freeze
+  VERSION = '1.11.4'.freeze
 end

metadata

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