diff options
| -rwxr-xr-x | httemplate/edit/cust_main.cgi | 2 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/top_misc.html | 13 | ||||
| -rw-r--r-- | httemplate/elements/location.html | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 49406a0b4..5671e7a2b 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -106,7 +106,7 @@ function samechanged(what) { t1.style.display = ''; } } -samechanged(document.getElementById('same')); +//samechanged(document.getElementById('same')); </SCRIPT> <BR> diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html index f2f584fc5..b7e86ba78 100644 --- a/httemplate/edit/cust_main/top_misc.html +++ b/httemplate/edit/cust_main/top_misc.html @@ -40,6 +40,10 @@ var agentnum = what.value; var f = what.form; if ( ship_locked_agents[agentnum] ) { +% # For this agent, the service location (except address2) +% # should be locked to the agent's location. +% # Set the ship_ fields to those values (just for display) and +% # then disable them. for(var x in ship_locked_agents[agentnum]) { f['ship_'+x].value = ship_locked_agents[agentnum][x]; f['ship_'+x].disabled = true; @@ -47,12 +51,17 @@ f['same'].checked = false; f['same'].disabled = true; } else { +% # Unlock the ship_ location fields. If they were previously +% # disabled, then they contain some agent's address, which is +% # no longer meaningful. So set them back to the customer's +% # current location. for(var i=0; i<ship_fields.length; i++) { x = ship_fields[i]; - f['ship_'+x].value = ''; + if ( f['ship_'+x].disabled ) { + f['ship_'+x].value = f['old_ship_'+x].value; + } f['ship_'+x].disabled = false; } - f['same'].checked = true; f['same'].disabled = false; } samechanged(f['same']); diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index b142aa690..685523314 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -240,7 +240,7 @@ Example: %# 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 addr_clean) ) { +% longitude censustract district addr_clean) ) { <INPUT TYPE="hidden" NAME="old_<%$pre.$_%>" ID="old_<%$pre.$_%>" VALUE="<% $object->get($_) |h%>"> % } %# Placeholders |