From: Mark Wells Date: Thu, 18 Jun 2015 00:45:15 +0000 (-0700) Subject: fix interaction of agent choice, agent-ship_address, and "same" checkbox, #21327... X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=7516543c5faa680e7fd8e672ef2b5e3d3b97995a;p=freeside.git fix interaction of agent choice, agent-ship_address, and "same" checkbox, #21327 and #27545 --- diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html index e484c732d..e16aafafc 100644 --- a/httemplate/edit/cust_main/basics.html +++ b/httemplate/edit/cust_main/basics.html @@ -56,6 +56,7 @@ % # unlock/lock service location var f = what.form; + var was_same = f['same'].checked; if ( ship_locked_agents[agentnum] ) { % # For this agent, the service location (except address2) % # should be locked to the agent's location. @@ -72,16 +73,25 @@ % # disabled, then they contain some agent's address, which is % # no longer meaningful. So set them back to the customer's % # current location. + var is_same = true; for(var i=0; i rescom_changed(document.getElementById('residential_commercial_Residential')); agent_changed(document.getElementById('agentnum')); - samechanged(document.getElementById('same')); + + if ( $('#same').prop('checked') ) { + $('#div_ship_location').hide(); + } else { + $('#div_ship_location').show(); + } + diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index a7803c875..90f20265a 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -262,8 +262,9 @@ Example: %# For address standardization: %# keep a clean copy of the address so we know if we need %# to re-standardize -% foreach (qw(address1 city state country zip latitude -% longitude censustract district addr_clean) ) { +% foreach (qw(locationname address1 city state country zip latitude +% longitude censustract district addr_clean +% ) ) { <& hidden.html, field => 'old_'.$pre.$_, value => $object->get($_) &> % } %# Placeholders