effective_addresses 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32d89c74a1a34f8e5041c39c032d008962c1652
-  data.tar.gz: efec422df8c03983d1c20e3ba25cafd55af0315a
+  metadata.gz: 5a8531e0a31f4d58907f8bcb3bacaaae1af4cfb7
+  data.tar.gz: aae93b337212735a1b73c96a5c29563c3a2beb24
 SHA512:
-  metadata.gz: 1f99a65cdf7f530756ff3f661ef841f3442177b2ae0ff56bc328cfbf850ac82ab319dc9197821222302c552799e6fe4ac5c11d01d29ad7191777286464645bd2
-  data.tar.gz: b8c8753e538ce28192d20dd65f666a3c906ddb6a09599055a0da0a19cbc28b737515b94585fae863af3b430c19a8618b477ed0ad035254c88f7f67e15e4183f7
+  metadata.gz: 0884e243f405c371070fe834fa76bf6b25783320c9733bd1068238130377ca2a048719e0f977c4712db553a6fcc1ca7ecafc44d4d3a9c5e8f079e69ce0424bc1
+  data.tar.gz: b709b990babe0e6a6f1ba171afc0e7e700b16e8831cb29564af184ef7bd0f809bfbb15b81b7e921f11ba84e374782d909f3905cf80871aba04db1df8f47eec03

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

@@ -2,6 +2,7 @@ $(document).on 'change', "input[name$='[shipping_address][shipping_address_same_
   $obj = $(event.currentTarget)
 
   shipping_fields = $obj.closest('form').find("
+    div[class*='_shipping_address_full_name'],
     div[class*='_shipping_address_address1'],
     div[class*='_shipping_address_address2'],
     div[class*='_shipping_address_city'],

data/app/controllers/effective/addresses_controller.rb

@@ -8,7 +8,7 @@ module Effective
       if @subregions.present?
         render :partial => 'effective/addresses/subregions'
       else
-        render :text => "<option value=''>None Available</option>"
+        render :body => "<option value=''>None Available</option>"
       end
     end
   end

data/app/models/effective/address.rb

@@ -123,8 +123,11 @@ module Effective
     end
 
     def shipping_address_same_as_billing?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
+      if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails 5
+        ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
+      else
+        ActiveRecord::Type::Boolean.new.cast(self.shipping_address_same_as_billing)
+      end
     end
-
   end
 end

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

@@ -13,10 +13,10 @@
           = fa.input :full_name, :required => true, :label => 'Full name', :placeholder => 'Full name'
 
       - when :address1
-        = fa.input :address1, :placeholder => 'Address', :label => "Address 1"
+        = fa.input :address1, :placeholder => 'Address', :label => "Address"
 
       - when :address2
-        = fa.input :address2, :label => 'Address 2'
+        = fa.input :address2, :label => false
 
       - when :city
         = fa.input :city, :placeholder => 'City'

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

@@ -18,12 +18,14 @@
 
       - when :address1
         = fa.input :address1,
+          label: 'Address',
           required: required,
           disabled: shipping_address_same_as_billing,
           wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :address2
         = fa.input :address2,
+          label: false,
           required: false,
           disabled: shipping_address_same_as_billing,
           wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.6.2'.freeze
+  VERSION = '1.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails