diff options
| author | ivan <ivan> | 2011-04-11 01:24:50 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-11 01:24:50 +0000 |
| commit | 4dfd652efeda65ee26be10d7941a25a4317f6d57 (patch) | |
| tree | d5a014fb4b2066fbc333c64e5df92d8d664c7b0c /httemplate | |
| parent | 0b7d38278c191627a0e81eba16e894265fe9d300 (diff) | |
fix misfire of USPS address correction on non-new locations, RT#12183
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/tr-select-cust_location.html | 5 | ||||
| -rw-r--r-- | httemplate/misc/order_pkg.html | 17 |
2 files changed, 20 insertions, 2 deletions
diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html index 6de034669..49478f26a 100644 --- a/httemplate/elements/tr-select-cust_location.html +++ b/httemplate/elements/tr-select-cust_location.html @@ -145,7 +145,10 @@ Example: <TR> <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service location' %></<%$th%>> <TD COLSPAN=7> - <SELECT NAME="locationnum" onChange="locationnum_changed(this);"> + <SELECT NAME = "locationnum" + ID = "locationnum" + onChange = "locationnum_changed(this);" + > <OPTION VALUE=""><% $opt{'empty_label'} || '(default service address)' |h %> % my @locations = $cust_main ? $cust_main->cust_location : (); % push @locations, $cust_location diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index b232debd7..92ec095b7 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -107,7 +107,22 @@ %> <BR> -<INPUT NAME="submitButton" TYPE="button" VALUE="Order Package" onClick = "this.disabled=true; standardize_locations();" <% $pkgpart ? '' : 'DISABLED' %>> +<INPUT NAME="submitButton" TYPE="button" VALUE="Order Package" onClick = "this.disabled=true; standardize_new_location();" <% $pkgpart ? '' : 'DISABLED' %>> + +<SCRIPT TYPE="text/javascript"> + + function standardize_new_location() { + var form = document.OrderPkgForm; + var loc = form.locationnum; + if (loc.type = 'select-one' && loc.options[loc.selectedIndex].value == -1) { + standardize_locations(); + } else { + form.submit(); + } + } + +</SCRIPT> + </FORM> </BODY> |