effective_addresses 1.9.9 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd974c66e5bcdc5eaa644505a3cdc1dcad2aaa54de34597bb81d1bdef2c403f9
-  data.tar.gz: 215d02c276840271457e6322d979abb53ad27c996af3e748466d16fbed3c8179
+  metadata.gz: 2eb87bcd5e2d0b539e5dc27eaaffda71ac6bae2c95742fbdd75269160ada6a32
+  data.tar.gz: c86451bdef0b5dc667ee0221ec10600bfcd5fd846ace0fbcfb3c5c6d2e4aa5b2
 SHA512:
-  metadata.gz: d365f1068f255e29cf975e5e88877519eb600c1238a5d53e85bd8a0a0411721f3e80d2c5d4af7770dd9dab34110b732d0826b7ca40d2be627ce37c35921c4f42
-  data.tar.gz: 2ccb92180c02b9ddd9251d8262d476845079c92ced8e475f2247015037009760925958d68fab710b81f5c8cd2f2fef912d3e2c2c8457e79bcc5400beb297a1ba
+  metadata.gz: d6697c436d4d56e8e4b4454c4c3027247468fa59d9cf49572360b7a56d9fec28311c671c6af9f5d70196bac13a43f7b5e9f07c3cef68fbbb99be0c709ddb0faf
+  data.tar.gz: 47b035caafa985f7eec3b448329ac4b1ddbab54b9699ff9072f13bfc8abe4b333e59a1c3ff4b80794734012d9f68a26aca5df97bb81a1aadd99b1d99da67465e

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,16 +25,23 @@ 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)

data/app/models/effective/address.rb

@@ -6,7 +6,7 @@ module Effective
     attr_accessor :shipping_address_same_as_billing
 
     POSTAL_CODE_CA = /\A[A-Z]{1}\d{1}[A-Z]{1}\ \d{1}[A-Z]{1}\d{1}\z/  # Matches 'T5Z 2B1'
-    POSTAL_CODE_US = /\A\d{5}\z/ # Matches 5 digits
+    POSTAL_CODE_US = /\A\d{5}(-\d{4})?\z/ # matches 5 digits plus optional hyphen and 4 digits
 
     belongs_to :addressable, polymorphic: true, touch: true
 
@@ -93,6 +93,7 @@ module Effective
           code = code.insert(3, ' ') if code.length == 6
         elsif country_code == 'US'
           code = code.gsub(/[^0-9]/, '')
+          code = code.insert(5, '-') if code.length == 9
         end
       end
 

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,

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

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,

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.9'.freeze
+  VERSION = '1.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.10.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails