effective_addresses 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e242bd222bdf45a2b873aea1cb4a99966fbd3d7
-  data.tar.gz: 510cde83910aee2c94fda85928003375da8bf9e5
+  metadata.gz: 742ed0f8a13e8cd868c30a9ea21bcc5127ce1d83
+  data.tar.gz: 906cbb169041cecb056b26dad96ca16987377a8c
 SHA512:
-  metadata.gz: a2ddc40defbc7a58d324f33e83329e3ee6b133eebf2542e44d605c973a38f11f861156362dc93ebd4e33fce0a061f2a41322038301260dcc0dfc2d3f112ef438
-  data.tar.gz: 4ce4c776b7ab5a11c985005151ff0522dee5440938675cefd7b415c0d30c8909725aca9d828954091b038f85297ff8b89e49e1321e72ce5e4e4c80763642cf5d
+  metadata.gz: 9c8cc534ac07028ef8ff23c14ef7f4412e0b6f3864f89b20d262cee16c5e53598a518f7f5853a98d011637ea4d6aa271727a0b111be026baf571e888d6ef40d1
+  data.tar.gz: 966f184e10f6d77dbd88daa0ef11d02830ed2ef834b0e71a6ea025cf806df85c05068a0f208406d09233e55e3bba30630cc53fe56d239575050c3f3328d27fad

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2018 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -8,12 +8,13 @@ $(document).on 'change', "input[name$='[shipping_address][shipping_address_same_
     div[class*='_shipping_address_city'],
     div[class*='_shipping_address_country_code'],
     div[class*='_shipping_address_state_code'],
-    div[class*='_shipping_address_postal_code']
+    div[class*='_shipping_address_postal_code'],
+    div[class*='shipping_address_form_group']
   ")
 
   if $obj.is(':checked')
-    shipping_fields.hide().find('input,select').prop('disabled', true)
+    shipping_fields.hide().find('input,select').prop('disabled', true).prop('required', true)
   else
-    shipping_fields.show().find('input,select').removeAttr('disabled')
+    shipping_fields.show().find('input,select').removeAttr('disabled').removeAttr('required')
 
 

data/app/helpers/effective_addresses_helper.rb

@@ -7,17 +7,20 @@ 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)
     use_full_name = form.object._validators[method.to_sym].any? { |v| v.kind_of?(EffectiveAddressFullNamePresenceValidator) }
 
-    address = form.object.send(method) || form.object.addresses.build(:category => method.to_s.gsub('_address', ''))
+    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, :use_full_name => use_full_name, :field_order => [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code]}.merge(options).merge({:f => form, :address => address, :method => method})
+    opts = { required: required, use_full_name: use_full_name, field_order: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code] }.merge(options).merge({:f => form, :address => address, :method => method})
 
-    if form.class.name == 'SimpleForm::FormBuilder'
-      render :partial => 'effective/addresses/address_fields_simple_form', :locals => opts
-    elsif form.class.name == 'Formtastic::FormBuilder'
-      render :partial => 'effective/addresses/address_fields_formtastic', :locals => opts
+    case form.class.name
+    when 'Effective::FormBuilder'
+      render partial: 'effective/addresses/form_with', locals: opts
+    when 'SimpleForm::FormBuilder'
+      render partial: 'effective/addresses/simple_form', locals: opts
+    when 'Formtastic::FormBuilder'
+      render partial: 'effective/addresses/formtastic', locals: opts
     else
-      raise 'Unsupported FormBuilder.  You must use formtastic or simpleform. Sorry.'
+      raise 'Unsupported FormBuilder.  You must use formtastic, simpleform or effective_bootstrap. Sorry.'
     end
   end
 

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

@@ -0,0 +1,66 @@
+= f.fields_for method, (address || f.object.send(method) || f.object.addresses.build(category: method.to_s.gsub('_address', ''))) do |fa|
+  - uuid = fa.object_id
+  - method = method.to_sym
+  - same_as_billing = (fa.object.category == 'shipping') && (f.object.try(:shipping_address_same_as_billing?) || false)
+  - required = (required && !same_as_billing)
+  - wrapper_options = (same_as_billing ? { style: 'display: none;', class: 'form-group shipping_address_form_group' } : {})
+
+  - if ((f.object.errors.include?(method) && !f.object.errors.include?(:addresses)) rescue false)
+    = f.errors method
+
+  - if use_full_name || fa.object.errors.include?(:full_name)
+    = fa.text_field :full_name,
+      required: required,
+      disabled: same_as_billing,
+      wrapper: wrapper_options
+
+  = fa.text_field :address1,
+    label: 'Address',
+    required: required,
+    disabled: same_as_billing,
+    wrapper: wrapper_options
+
+  = fa.text_field :address2,
+    label: false,
+    required: required,
+    disabled: same_as_billing,
+    wrapper: wrapper_options
+
+  = fa.text_field :city,
+    required: required,
+    disabled: same_as_billing,
+    input_html: { 'data-effective-address-city' => uuid },
+    wrapper: wrapper_options
+
+  = fa.select :country_code, region_options_for_simple_form_select(),
+    required: required,
+    disabled: same_as_billing,
+    input_html: { 'data-effective-address-country' => uuid },
+    wrapper: wrapper_options
+
+  - if fa.object.try(:country_code).present?
+    = fa.select :state_code, region_options_for_simple_form_select(Carmen::Country.coded(fa.object.country_code).subregions),
+      required: required,
+      disabled: same_as_billing,
+      input_html: { 'data-effective-address-state' => uuid },
+      wrapper: wrapper_options
+  - else
+    = fa.select :state_code, [],
+      required: required,
+      disabled: true,
+      input_html: { 'data-effective-address-state' => uuid },
+      input_js: { placeholder: 'Please choose a country first' },
+      wrapper: wrapper_options
+
+  = fa.text_field :postal_code,
+    required: required,
+    disabled: same_as_billing,
+    input_html: { 'data-effective-address-postal-code' => uuid },
+    wrapper: wrapper_options
+
+  - if fa.object.category == 'shipping' && f.object.respond_to?(:shipping_address_same_as_billing?)
+    = fa.check_box :shipping_address_same_as_billing,
+      label: 'Shipping address is same as billing address',
+      required: false,
+      feedback: false,
+      input_html: { checked: same_as_billing }

data/config/routes.rb

@@ -3,7 +3,7 @@ Rails.application.routes.draw do
 end
 
 EffectiveAddresses::Engine.routes.draw do
-  scope :module => 'effective' do
-    match 'addresses/subregions/:country_code', :to => 'addresses#subregions', :as => 'address_subregions', :via => :get
+  scope module: 'effective' do
+    match 'addresses/subregions/:country_code', to: 'addresses#subregions', as: 'address_subregions', via: :get
   end
 end

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,8 +72,9 @@ files:
 - app/models/validators/effective_address_full_name_presence_validator.rb
 - app/models/validators/effective_address_valid_validator.rb
 - app/views/effective/addresses/_address.html.haml
-- app/views/effective/addresses/_address_fields_formtastic.html.haml
-- app/views/effective/addresses/_address_fields_simple_form.html.haml
+- app/views/effective/addresses/_form_with.html.haml
+- app/views/effective/addresses/_formtastic.html.haml
+- app/views/effective/addresses/_simple_form.html.haml
 - app/views/effective/addresses/_subregions.html.haml
 - config/effective_addresses.rb
 - config/locales/simple_form.en.yml