effective_addresses 1.9.8 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745f86571f2a0f52bf54edf6045a56c5ac5537f1b414344ab55a778b402b8f0b
-  data.tar.gz: ba0656435d9378d950fa2165c7c936bc8a1542827889b60a3cadff148f780ec4
+  metadata.gz: 314234d1308d0c4490e47e3ea34cfcb3f040aa8fd6058324aa7632d2814c2a75
+  data.tar.gz: 1d4483aa861846e02ba59267b011b34bdf079eef4b68a9f47492a963935b186c
 SHA512:
-  metadata.gz: '059f454408860bea37b7627c1269ee37ca7b9835fb04d0bed34e9cb0b20a4128a3dadbd2ab2ff9e7462e632da6cb9512ad96f034122375008f86b04a9e276cf4'
-  data.tar.gz: 7d157adab8db96dffefdb8dbe18037cd37fc1f1858f86afe60c6985d8984161ed1f6b40d8a6297e83cfdc4c5099dd055620c1e9267ee8233a569ca31461fd526
+  metadata.gz: d0809850d34e59c7a5314fa15ad4a5148ebdd6f00adac0ce55ba22ca322f485c221e1c20a771cf506c2edbc2bbd9d8d823555943293bba5cfbdbb312ba82ee91
+  data.tar.gz: 77a1f4d3dc70584ef8e5ed1cf1405f07249a47547a1bdb5da8df61656ebcd90d8484f5cc06a34fa17fc305cc12eba147edbcb9cb6e2776424a78cec885ddd06f

data/app/helpers/effective_addresses_helper.rb

@@ -7,6 +7,7 @@ module EffectiveAddressesHelper
     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)
 
     address = form.object.send(method) || form.object.addresses.build(category: method.to_s.gsub('_address', ''))
+
     effective_address_pre_select(address) if address.new_record?
 
     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,25 +25,32 @@ module EffectiveAddressesHelper
   end
 
   def effective_address_pre_select(address)
-    if EffectiveAddresses.pre_selected_country.present?
-      address.country ||= EffectiveAddresses.pre_selected_country
-      address.state ||= EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
-    elsif defined?(Geocoder) && request.location.present?
+    if address.country.blank? && EffectiveAddresses.pre_selected_country.present?
+      address.country = EffectiveAddresses.pre_selected_country
+    end
+
+    if address.state.blank? && EffectiveAddresses.pre_selected_state.present?
+      address.state = EffectiveAddresses.pre_selected_state
+    end
+
+    if defined?(Geocoder) && request.try(:location).present?
       location = request.location
       address.country = location.country_code
       address.state = location.state_code
       address.postal_code = location.postal_code
       address.city = location.city
     end
+
+    address
   end
 
   def effective_address_regions_collection(regions = nil, resource: nil)
-    if regions.present?
-      countries = regions
+    countries = if regions.present?
+      regions
     elsif EffectiveAddresses.country_codes == :all
-      countries = Carmen::Country.all
+      Carmen::Country.all
     else
-      countries = Carmen::Country.all.select { |c| (EffectiveAddresses.country_codes || []).include?(c.code) }
+      Carmen::Country.all.select { |c| (EffectiveAddresses.country_codes || []).include?(c.code) }
     end
 
     if regions.blank? && EffectiveAddresses.country_codes_priority.present?

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

@@ -13,7 +13,7 @@
   = address.address2
   %br
 
-- if address.respond_to?(:address3) && address.address3.present?
+- if address.try(:address3).present?
   = address.address3
   %br
 

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

@@ -8,7 +8,7 @@
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     = f.errors method
 
-  - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
+  - if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
     = fa.text_field :full_name,
       required: required,
       disabled: same_as_billing,
@@ -49,8 +49,10 @@
         wrapper: wrapper_options
 
     .col-md-5
-      - if fa.object.try(:country_code).present?
-        = fa.select :state_code, effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions),
+      - subregions = Carmen::Country.coded(fa.object.country_code).try(:subregions) if fa.object.country_code.present?
+
+      - if subregions.present?
+        = fa.select :state_code, effective_address_regions_collection(subregions),
           label: 'State / Province',
           required: required,
           disabled: same_as_billing,

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

@@ -9,7 +9,7 @@
 
     - case field
       - when :full_name
-        - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
+        - if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
           = fa.input :full_name, :required => true, :label => 'Full name', :placeholder => 'Full name'
 
       - when :address1
@@ -38,7 +38,7 @@
           = fa.input :state_code,
             :as => (defined?(EffectiveFormInputs) ? :effective_select : :select),
             :label => 'Province / State',
-            :collection => options_for_select(effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions)),
+            :collection => options_for_select(effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).try(:subregions))),
             :prompt => 'please select a country',
             :input_html => { 'data-effective-address-state' => uuid },
             :input_js => { :placeholder => 'Please choose' }

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

@@ -10,7 +10,7 @@
 
     - case field
       - when :full_name
-        - if EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
+        - if local_assigns[:use_full_name] || EffectiveAddresses.use_full_name || fa.object.errors.include?(:full_name)
           = fa.input :full_name,
             required: required,
             disabled: shipping_address_same_as_billing,
@@ -51,7 +51,7 @@
           = fa.input :state_code,
             as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
             required: required,
-            collection: effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).subregions),
+            collection: effective_address_regions_collection(Carmen::Country.coded(fa.object.country_code).try(:subregions)),
             prompt: 'Please choose',
             input_html: {'data-effective-address-state' => uuid},
             input_js: { placeholder: 'Please choose' },

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.8'.freeze
+  VERSION = '1.9.11'.freeze
 end

metadata

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