effective_addresses 1.9.6 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46461b09d7aa12fd73789e0d29640bac574d2b7295bb68ce8568cc64c0b52f30
-  data.tar.gz: 00b4f0c30fedc4ddaa7cf8a700a221768ad077322846494093850a575bf45d11
+  metadata.gz: fd974c66e5bcdc5eaa644505a3cdc1dcad2aaa54de34597bb81d1bdef2c403f9
+  data.tar.gz: 215d02c276840271457e6322d979abb53ad27c996af3e748466d16fbed3c8179
 SHA512:
-  metadata.gz: 1fb5fb6857f90e57e50fe17e4f28aa27732fb932dd57a9287041a8afb25b63ada63c6c8d870871026c4bbb51067b8ea6de7b33b68e6634a6c90141706358adc1
-  data.tar.gz: 61324d4eecfa40edc2c3b5cfc2957d59d96463e5bb3f55b2ad7d339a67c7cde1f849f4882f4167910311a6fc6e9788470015ce2acaa8b6edfaa96fa6fc080814
+  metadata.gz: d365f1068f255e29cf975e5e88877519eb600c1238a5d53e85bd8a0a0411721f3e80d2c5d4af7770dd9dab34110b732d0826b7ca40d2be627ce37c35921c4f42
+  data.tar.gz: 2ccb92180c02b9ddd9251d8262d476845079c92ced8e475f2247015037009760925958d68fab710b81f5c8cd2f2fef912d3e2c2c8457e79bcc5400beb297a1ba

data/app/helpers/effective_addresses_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EffectiveAddressesHelper
   def effective_address_fields(form, method = 'billing', options = {})
     method = (method.to_s.include?('_address') ? method.to_s : "#{method}_address")
@@ -23,8 +25,8 @@ module EffectiveAddressesHelper
 
   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?
+      address.country ||= EffectiveAddresses.pre_selected_country
+      address.state ||= EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
     elsif defined?(Geocoder) && request.location.present?
       location = request.location
       address.country = location.country_code
@@ -35,12 +37,12 @@ module EffectiveAddressesHelper
   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/models/concerns/acts_as_addressable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ActsAsAddressable
 
 module ActsAsAddressable

data/app/models/effective/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   class Address < ActiveRecord::Base
     self.table_name = EffectiveAddresses.addresses_table_name.to_s

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

@@ -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

@@ -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

@@ -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/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 EffectiveAddresses::Engine.routes.draw do
   scope :module => 'effective' do
     match 'addresses/subregions/:country_code', to: 'addresses#subregions', as: 'address_subregions', via: :get

data/lib/effective_addresses/version.rb

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

metadata

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