[freeside-commits] branch master updated. 05a8005cb5435fbdb3552af855a77934b58eac91

[Mark Wells]

The branch, master has been updated
       via  05a8005cb5435fbdb3552af855a77934b58eac91 (commit)
       via  85966165df6b5fcdaf4b2c1c19335c401317cc33 (commit)
      from  7c2e9c37a5b57e1d58868613660602da20a0d9de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05a8005cb5435fbdb3552af855a77934b58eac91
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Mar 15 15:58:21 2013 -0700

    fix editing of service address fields, from #21327

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 49406a0..5671e7a 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 f2f584f..b7e86ba 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 b142aa6..6855233 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

commit 85966165df6b5fcdaf4b2c1c19335c401317cc33
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Mar 15 15:54:09 2013 -0700

    better error message

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index be00213..49406a0 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -285,7 +285,8 @@ if ( $cgi->param('error') ) {
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum=$1;
-  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+  $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
+    or die "custnum $custnum not found";
   if ( $cust_main->dbdef_table->column('paycvv')
        && length($cust_main->paycvv)             ) {
     my $paycvv = $cust_main->paycvv;

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/cust_main.cgi           |    5 +++--
 httemplate/edit/cust_main/top_misc.html |   13 +++++++++++--
 httemplate/elements/location.html       |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)