From: Mark Wells <mark@freeside.biz>
Date: Fri, 29 Mar 2013 22:00:51 +0000 (-0700)
Subject: "Edit Location" should standardize, #13763, #14717
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=75ddd5240b233dd45f1d748f628e01238be0e751;p=freeside.git

"Edit Location" should standardize, #13763, #14717
---

diff --git a/httemplate/edit/cust_location.cgi b/httemplate/edit/cust_location.cgi
index 80b27c2b3..a5e7d209e 100755
--- a/httemplate/edit/cust_location.cgi
+++ b/httemplate/edit/cust_location.cgi
@@ -7,20 +7,28 @@ ACTION="<% $p %>edit/process/cust_location.cgi" METHOD=POST>
 <INPUT TYPE="hidden" NAME="locationnum" VALUE="<% $locationnum %>">
 
 <% ntable('#cccccc') %>
-<% include('/elements/location.html',
+<& /elements/location.html,
             'object'        => $cust_location,
             'no_asterisks'  => 1,
-            ) %>
+&>
+<& /elements/standardize_locations.html,
+            'form'          => 'EditLocationForm',
+            'callback'      => 'document.EditLocationForm.submit();',
+&>
 </TABLE>
 
 <BR>
 <SCRIPT TYPE="text/javascript">
-function areyousure() {
-  return confirm('Modify this service location?');
+function go() {
+% if ( FS::Conf->new->config('address_standardize_method') ) {
+  standardize_locations();
+% } else {
+  confirm('Modify this service location?') &&
+    document.EditLocationForm.submit();
+% }
 }
 </SCRIPT>
-<INPUT TYPE="submit" VALUE="Submit" onclick="return areyousure()">
-
+<INPUT TYPE="button" NAME="submitButton" VALUE="Submit" onclick="go()">
 </FORM>
 </BODY>
 </HTML>