effective_addresses 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657cd274dfe063bcd3fb821c88385cccc827fab5
-  data.tar.gz: 285737033853c79a7813b22f1f7f1b3c1846282f
+  metadata.gz: ff3f966afab7e2c3b8199c448af7fea1ceee0411
+  data.tar.gz: ff0c0b5f1b79f540088db80a4199204873ff6e1c
 SHA512:
-  metadata.gz: 8d8e4ffb57497467499ed14e00198fc9a9dca2bd0e98a8bed2cbef0b75d1786626ab423081f402edda6d24d2ec3384f2d82c2d4ca5015b6e63c9edf58b97f0d1
-  data.tar.gz: 2c3baf1a628670734d026be960f264fedfeb840333495ea7e991c37caa7b8926473d67fb56f18409335b213aacf7ce7b287232f407c22f8221e031521c4af248
+  metadata.gz: aafa438364c21b562ab22fbfd5456f5ea760aeec032d243daa5f14571e9cb6cb1e77c62b249425b6a7554a4230648f2ff78cf4975328c0f6bbeb1eb78225e011
+  data.tar.gz: 12fc4c7ad7132879f28e982aa7e4a658879c5e670f2d1eac59db063997e09db6a7d17a2a4389b0dc320f33751385085261487bbc3ead260c4cdfd84b3bd90bcb

data/app/assets/javascripts/effective_addresses/shipping_address_same_as_billing.js.coffee

@@ -5,6 +5,7 @@ $(document).on 'change', "input[name$='[shipping_address][shipping_address_same_
     div[class*='_shipping_address_full_name'],
     div[class*='_shipping_address_address1'],
     div[class*='_shipping_address_address2'],
+    div[class*='_shipping_address_address3'],
     div[class*='_shipping_address_city'],
     div[class*='_shipping_address_country_code'],
     div[class*='_shipping_address_state_code'],

data/app/models/concerns/acts_as_addressable.rb

@@ -91,6 +91,7 @@ module ActsAsAddressable
       existing.full_name    = address.full_name
       existing.address1     = address.address1
       existing.address2     = address.address2
+      existing.address3     = address.address3 if address.respond_to?(:address3)
       existing.city         = address.city
       existing.state_code   = address.state_code
       existing.country_code = address.country_code
@@ -116,6 +117,7 @@ module ActsAsAddressable
       existing.full_name    = address.full_name
       existing.address1     = address.address1
       existing.address2     = address.address2
+      existing.address3     = address.address3 if address.respond_to?(:address3)
       existing.city         = address.city
       existing.state_code   = address.state_code
       existing.country_code = address.country_code

data/app/models/effective/address.rb

@@ -111,6 +111,7 @@ module Effective
       output += "#{full_name}\n" if full_name.present?
       output += "#{address1}\n" if address1.present?
       output += "#{address2}\n" if address2.present?
+      output += "#{address3}\n" if respond_to?(:address3) && address3.present?
       output += [city.presence, state_code.presence, " #{postal_code.presence}"].compact.join(' ')
       output += "\n"
       output += country.to_s

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

@@ -8,9 +8,16 @@
 
 = address.address1
 %br
+
 - if address.address2.present?
   = address.address2
   %br
+
+- if address.respond_to?(:address3) && address.address3.present?
+  = address.address3
+  %br
+
 = [address.city.presence, address.state_code.presence, ' ' + address.postal_code.presence].compact.join(' ').html_safe
+
 %br
 = address.country.to_s

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

@@ -26,6 +26,13 @@
     disabled: same_as_billing,
     wrapper: wrapper_options
 
+  - if fa.object.respond_to?(:address3)
+    = fa.text_field :address3,
+      label: false,
+      required: false,
+      disabled: same_as_billing,
+      wrapper: wrapper_options
+
   = fa.text_field :city,
     required: required,
     disabled: same_as_billing,

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

@@ -18,6 +18,9 @@
       - when :address2
         = fa.input :address2, :label => false
 
+      - when :address3
+        = fa.input :address3, :label => false
+
       - when :city
         = fa.input :city, :placeholder => 'City'
 

data/config/locales/simple_form.en.yml

@@ -5,6 +5,7 @@ en:
         full_name: Full name
         address1: Address 1
         address2: Address 2
+        address3: Address 3
         country_code: Country
         state_code: Province / State
         postal_code: Postal / Zip code

data/db/migrate/01_create_effective_addresses.rb.erb

@@ -7,6 +7,10 @@ class CreateEffectiveAddresses < ActiveRecord::Migration[4.2]
       t.string :full_name
       t.string :address1
       t.string :address2
+
+      # Uncomment this if you want 3 address fields
+      # t.string :address3
+
       t.string :city
       t.string :state_code
       t.string :country_code

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.8.3'.freeze
+  VERSION = '1.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Extend any ActiveRecord object to have one or more named addresses. Includes