From: ivan <ivan>
Date: Mon, 11 Apr 2011 01:24:41 +0000 (+0000)
Subject: fix misfire of USPS address correction on non-new locations, RT#12183
X-Git-Tag: freeside_2_3_0~422
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b09d6c6464fa59fb4a0797df00ce1f2aec051b6c

fix misfire of USPS address correction on non-new locations, RT#12183
---

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 1399240d9..8b1895fae 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -199,7 +199,10 @@ Example:
 <TR>
   <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service&nbsp;location' %></<%$th%>>
   <TD COLSPAN=7>
-    <SELECT NAME="locationnum" onChange="locationnum_changed(this);">
+    <SELECT NAME     = "locationnum"
+            ID       = "locationnum"
+            onChange = "locationnum_changed(this);"
+    >
 % if ( !$prospect_main && !$opt{'disable_empty'} ) {
       <OPTION VALUE=""><% $opt{'empty_label'} || '(default service address)' |h %>
 % }
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index 17c56055e..18ad74606 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -94,6 +94,7 @@
 
     <INPUT TYPE  = "hidden"
            NAME  = "locationnum"
+           ID    = "locationnum"
            VALUE = "<% scalar($cgi->param('lock_locationnum')) |h %>"
     >
 
@@ -136,7 +137,7 @@
 <BR>
 % my $onclick = $cgi->param('lock_locationnum')
 %                 ? 'document.OrderPkgForm.submit()'
-%                 : 'standardize_locations()';
+%                 : 'standardize_new_location()';
 <INPUT NAME="submitButton"
        TYPE="button"
        VALUE="Order Package"
@@ -144,6 +145,21 @@
        <% $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>
 </HTML>