effective_addresses 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 040257bf768402e6145101e420df24f063c5a8c3
-  data.tar.gz: 0ee1ac756cf2119af9408f88517b5e630e361316
+  metadata.gz: 0028a63a8a2e844fcb596934bad4be1510a2ca9b
+  data.tar.gz: 447d7c0e5e7f94e5d6eb7c474bb108eda0c1a423
 SHA512:
-  metadata.gz: ffcafceb79f86ecd54d39123eee62280af339dffb3103c35b8df8e9573130c5169894bb1e2f417908cbbadaeaaf8c5853d7f24239edcbb76fb8e45f52b5187bd
-  data.tar.gz: 44442cbfb9cee3de8ac731bb212a9a940609c364578f03bee7f5049e184e1d5e272e69fbe1e4e8f55c7063c3b57b17193ba348d04906715c13385a0affc98173
+  metadata.gz: 7bf04d81bec30b72a36d8f2b28c234788ecd9164cfc05765f00a967ca12329862e4794d1daa3e9ffa14df31d2cfb523b74153572b72758a92eb2d4621fa7f12b
+  data.tar.gz: f2cc90da3d12a86b05fe723194392cf7c63a893e5f1348e0e66cff7cf4be11b6e655f8e691ab3bb7cfdbaaccd38951cd529c0830fdc8c69a212c4a59b71f0b2c

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

@@ -0,0 +1,18 @@
+$(document).on 'change', "input[name$='[shipping_address][shipping_address_same_as_billing]']", (event) ->
+  $obj = $(event.currentTarget)
+
+  shipping_fields = $obj.closest('form').find("
+    div[class*='_shipping_address_address1'],
+    div[class*='_shipping_address_address2'],
+    div[class*='_shipping_address_city'],
+    div[class*='_shipping_address_country_code'],
+    div[class*='_shipping_address_state_code'],
+    div[class*='_shipping_address_postal_code']
+  ")
+
+  if $obj.is(':checked')
+    shipping_fields.hide().find('input,select').prop('disabled', true)
+  else
+    shipping_fields.show().find('input,select').removeAttr('disabled')
+
+

data/app/models/concerns/acts_as_addressable.rb

@@ -11,52 +11,62 @@ module ActsAsAddressable
   end
 
   included do
-    has_many :addresses, :as => :addressable, :class_name => 'Effective::Address', :dependent => :delete_all, :autosave => true
+    has_many :addresses, as: :addressable, class_name: 'Effective::Address', dependent: :delete_all, autosave: true
 
-    # Setup validations and methods
+    # Normalize categories
     categories = @acts_as_addressable_opts.try(:flatten) || []
 
-    if categories.first.kind_of?(Hash) # We were passed some validation requirements
-      categories = categories.first
-
-      categories.each do |category, options| # billing, shipping
-        category = category.to_s.gsub('_address', '')
-
-        self.send(:define_method, "#{category}_address") { effective_address(category) }
-        self.send(:define_method, "#{category}_addresses") { effective_addresses(category) }
-
-        validates "#{category}_address", :effective_address_valid => true
+    if categories.first.kind_of?(Hash)
+      categories = categories.first.transform_keys { |category| category.to_s.gsub('_address', '') }
+    else
+      categories = categories.map { |category| category.to_s.gsub('_address', '') }
+    end
 
-        if options.kind_of?(Hash)
-          validates "#{category}_address", :presence => options.fetch(:presence, false)
-          validates "#{category}_address", :effective_address_full_name_presence => options.fetch(:use_full_name, EffectiveAddresses.use_full_name)
+    # Categories can be either:
+    # {'billing'=>{:singular=>true, :use_full_name=>false}, 'shipping'=>{:singular=>true, :use_full_name=>false}}
+    # or
+    # {'billing' => true, 'shipping' => true}
+    # or
+    # ['billing', 'shipping']
+
+    categories.each do |category, options = {}|
+      # Define our two getter methods
+      self.send(:define_method, "#{category}_address") { effective_address(category) }
+      self.send(:define_method, "#{category}_addresses") { effective_addresses(category) }
+
+      # Define our setter method
+      if options.kind_of?(Hash) && options[:singular]
+        self.send(:define_method, "#{category}_address=") { |atts| set_singular_effective_address(category, atts) }
+      else
+        self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
+      end
 
-          if options.fetch(:singular, false)
-            self.send(:define_method, "#{category}_address=") { |atts| set_singular_effective_address(category, atts) }
-          else
-            self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
-          end
+      # Consider validations now
+      validates "#{category}_address", effective_address_valid: true
+
+      case options
+      when Hash
+        validates "#{category}_address", presence: options.fetch(:presence, false)
+        validates "#{category}_address", effective_address_full_name_presence: options.fetch(:use_full_name, EffectiveAddresses.use_full_name)
+      when TrueClass, FalseClass
+        validates "#{category}_address", presence: (options == true)
+        validates "#{category}_address", effective_address_full_name_presence: EffectiveAddresses.use_full_name
+      else
+        raise 'Unexpected options. Expected a Hash or Boolean'
+      end
+    end
 
-        else # Probably just true or false passed
-          validates "#{category}_address", :presence => (options == true)
-          validates "#{category}_address", :effective_address_full_name_presence => EffectiveAddresses.use_full_name
+    if ((categories.try(:keys) rescue nil) || categories).include?('billing') && ((categories.try(:keys) rescue nil) || categories).include?('shipping')
+      self.send(:define_method, :shipping_address_same_as_billing?) { billing_address == shipping_address }
 
-          # Multiple Addresses
-          self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
+      before_validation do
+        if @_effective_addresses_shipping_address_same_as_billing
+          self.shipping_address = self.billing_address
         end
       end
-    else # No validation requirements passed
-      categories.each do |category|
-        category = category.to_s.gsub('_address', '')
 
-        self.send(:define_method, "#{category}_address") { effective_address(category) }
-        self.send(:define_method, "#{category}_addresses") { effective_addresses(category) }
-        self.send(:define_method, "#{category}_address=") { |atts| set_effective_address(category, atts) }
-
-        validates "#{category}_address", :effective_address_valid => true
-        validates "#{category}_address", :effective_address_full_name_presence => EffectiveAddresses.use_full_name
-      end
     end
+
   end
 
   module ClassMethods
@@ -86,9 +96,15 @@ module ActsAsAddressable
       :city         => atts[:city],
       :state_code   => atts[:state_code],
       :country_code => atts[:country_code],
-      :postal_code  => atts[:postal_code]
+      :postal_code  => atts[:postal_code],
+      :shipping_address_same_as_billing => atts[:shipping_address_same_as_billing]
     )
 
+    if category == 'shipping' && add.shipping_address_same_as_billing?
+      @_effective_addresses_shipping_address_same_as_billing = true
+      return
+    end
+
     self.addresses << add unless (add == effective_address(category))
   end
 
@@ -97,7 +113,7 @@ module ActsAsAddressable
 
     atts = HashWithIndifferentAccess.new(atts.kind_of?(Effective::Address) ? atts.attributes : atts)
 
-    (effective_address(category) || self.addresses.build()).tap do |existing|
+    add = (effective_address(category) || self.addresses.build()).tap do |existing|
       existing.category     = category.to_s
       existing.full_name    = atts[:full_name]
       existing.address1     = atts[:address1]
@@ -106,7 +122,13 @@ module ActsAsAddressable
       existing.state_code   = atts[:state_code]
       existing.country_code = atts[:country_code]
       existing.postal_code  = atts[:postal_code]
+      existing.shipping_address_same_as_billing = atts[:shipping_address_same_as_billing]
+    end
+
+    if category == 'shipping' && add.shipping_address_same_as_billing?
+      @_effective_addresses_shipping_address_same_as_billing = true
     end
+
   end
 
 end

data/app/models/effective/address.rb

@@ -1,11 +1,12 @@
 module Effective
   class Address < ActiveRecord::Base
     self.table_name = EffectiveAddresses.addresses_table_name.to_s
+    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
 
-    belongs_to :addressable, :polymorphic => true, :touch => true
+    belongs_to :addressable, polymorphic: true, touch: true
 
     validates :category, :address1, :city, :country_code, :postal_code, presence: true, if: Proc.new { |address| address.present? }
     validates :state_code, presence: true, if: Proc.new { |address| address.present? && (address.country_code.blank? || Carmen::Country.coded(address.country_code).try(:subregions).present?) }
@@ -91,7 +92,7 @@ module Effective
       self_attrs = self.attributes
       other_attrs = other_address.respond_to?(:attributes) ? other_address.attributes : {}
 
-      [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at', 'addressable_type', 'addressable_id') }
+      [self_attrs, other_attrs].each { |attrs| attrs.except!('id', 'created_at', 'updated_at', 'addressable_type', 'addressable_id', 'category') }
 
       self_attrs == other_attrs
     end
@@ -120,5 +121,10 @@ module Effective
     def to_html
       to_s.gsub(/\n/, "<br>\n").gsub('  ', '&nbsp;&nbsp;').html_safe
     end
+
+    def shipping_address_same_as_billing?
+      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
+    end
+
   end
 end

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

@@ -1,32 +1,55 @@
 = f.simple_fields_for method, (address || f.object.send(method) || f.object.addresses.build(:category => method.to_s.gsub('_address', ''))), (EffectiveAddresses.simple_form_options || {}) do |fa|
   - uuid = fa.object_id
   - method = method.to_sym
+  - shipping_address_same_as_billing = (fa.object.category == 'shipping') && (f.object.try(:shipping_address_same_as_billing?) || false)
 
   - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
     - fa.object.errors.add(:address1, f.object.errors[method].first)
 
+  - if fa.object.category == 'shipping' && f.object.respond_to?(:shipping_address_same_as_billing?)
+    = fa.input :shipping_address_same_as_billing,
+      as: :boolean,
+      label: 'My shipping address is the same as my billing address',
+      required: false,
+      input_html: { checked: shipping_address_same_as_billing }
+
   - field_order.each do |field|
 
     - case field
       - when :full_name
         - if use_full_name || fa.object.errors.include?(:full_name)
-          = fa.input :full_name, required: required
+          = fa.input :full_name,
+            required: required,
+            disabled: shipping_address_same_as_billing,
+            wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :address1
-        = fa.input :address1, required: required
+        = fa.input :address1,
+          required: required,
+          disabled: shipping_address_same_as_billing,
+          wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :address2
-        = fa.input :address2
+        = fa.input :address2,
+          required: false,
+          disabled: shipping_address_same_as_billing,
+          wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :city
-        = fa.input :city, required: required, input_html: { 'data-effective-address-city' => uuid }
+        = fa.input :city,
+          required: required,
+          input_html: { 'data-effective-address-city' => uuid },
+          disabled: shipping_address_same_as_billing,
+          wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :country_code
         = fa.input :country_code,
           as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
           required: required,
           collection: region_options_for_simple_form_select(),
-          input_html: {'data-effective-address-country' => uuid}
+          input_html: {'data-effective-address-country' => uuid},
+          disabled: shipping_address_same_as_billing,
+          wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :state_code
         - if fa.object.try(:country_code).present?
@@ -36,16 +59,24 @@
             collection: region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions),
             prompt: 'Please choose',
             input_html: {'data-effective-address-state' => uuid},
-            input_js: { placeholder: 'Please choose' }
+            input_js: { placeholder: 'Please choose' },
+            disabled: shipping_address_same_as_billing,
+            wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
         - else
           = fa.input :state_code,
             as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
             required: required,
-            disabled: true,
             collection: [],
             prompt: 'Please choose a country first',
             input_html: { 'data-effective-address-state' => uuid },
-            input_js: { placeholder: 'Please choose a country first' }
+            input_js: { placeholder: 'Please choose a country first' },
+            disabled: true,
+            wrapper_html: { style: ('display: none;' if shipping_address_same_as_billing) }
 
       - when :postal_code
-        = fa.input :postal_code, required: required, input_html: { 'data-effective-address-postal-code' => uuid }
+        = fa.input :postal_code,
+          required: required,
+          input_html: { 'data-effective-address-postal-code' => uuid },
+          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.5.1'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/effective_addresses.rb

@@ -21,7 +21,7 @@ module EffectiveAddresses
   end
 
   def self.permitted_params
-    [:address1, :address2, :city, :country_code, :state_code, :postal_code, :full_name]
+    [:address1, :address2, :city, :country_code, :state_code, :postal_code, :full_name, :shipping_address_same_as_billing]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,6 +233,7 @@ files:
 - Rakefile
 - app/assets/javascripts/effective_addresses.js
 - app/assets/javascripts/effective_addresses/address_fields.js.coffee
+- app/assets/javascripts/effective_addresses/shipping_address_same_as_billing.js.coffee
 - app/controllers/effective/addresses_controller.rb
 - app/helpers/effective_addresses_helper.rb
 - app/models/concerns/acts_as_addressable.rb