qualification address handling changes, RT#7111

3 files changed, 81 insertions, 70 deletions

diff --git a/httemplate/edit/process/qual.cgi b/httemplate/edit/process/qual.cgi
index de076edda..a702047c5 100644
--- a/httemplate/edit/process/qual.cgi
+++ b/httemplate/edit/process/qual.cgi
@@ -45,14 +45,18 @@ my $locationnum = $1;
 
 my $error = '';
 my $cust_location = '';
+my %location_hash = (
+  map { $_ => scalar($cgi->param($_)) }
+    qw( address1 address2 city county state zip country geocode ),
+    grep scalar($cgi->param($_)),
+      qw( location_type location_number location_kind )
+);
+
 if ( $locationnum == -1 ) { # adding a new one
 
   $cust_location = new FS::cust_location {
     $cust_or_prospect."num" => $custnum_or_prospectnum,
-    map { $_ => scalar($cgi->param($_)) }
-      qw( address1 address2 city county state zip country geocode ),
-      grep scalar($cgi->param($_)),
-        qw( location_type location_number location_kind )
+    %location_hash,
   };
 
           #locationnum '': default service location
@@ -62,15 +66,21 @@ if ( $locationnum == -1 ) { # adding a new one
           #locationnum -2: address not required for qual
 } elsif ( $locationnum == -2 && $phonenum eq '' ) {
   $error = "Nothing to qualify - neither phone number nor address specified";
+
+} else { #existing location, possibly with an edit
+  $cust_location = qsearchs('cust_location', { 'locationnum'=>$locationnum })
+    or die "Unknown locationnum $locationnum";
+  $cust_location->$_($location_hash{$_}) foreach keys %location_hash;
 }
 
 my $qual = new FS::qual {
   'status' => 'N',
 };
-$qual->phonenum($phonenum) if $phonenum ne '';
+$qual->phonenum($phonenum)       if $phonenum ne '';
+#$qual->locationnum($locationnum) if $locationnum > 0;
+$qual->exportnum($exportnum)     if $exportnum > 0;
 $qual->set( $cust_or_prospect."num" => $custnum_or_prospectnum )
   unless $locationnum == -1 || $locationnum > 0;
-$qual->exportnum($exportnum) if $exportnum > 0;
 
 $error ||= $qual->insert( 'cust_location' => $cust_location );
 
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 0b91add52..f36f2c4cd 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -20,7 +20,7 @@ Example:
 % if ( $opt{'alt_format'} ) {
 
 <TR>
-    <<%$th%> ALIGN="right">Location kind</<%$th%>>
+    <<%$th%> ALIGN="right">Location&nbsp;kind</<%$th%>>
     <TD>
     <% include('/elements/select.html',
                  'cgi'        => $cgi,
@@ -79,7 +79,7 @@ Example:
       >
 
 <TR>
-    <<%$th%> ALIGN="right">Unit type and #</<%$th%>>
+    <<%$th%> ALIGN="right">Unit&nbsp;type&nbsp;and&nbsp;#</<%$th%>>
     <TD COLSPAN=7>
 
 %     my $location_type = scalar($cgi->param('location_type'))
@@ -136,15 +136,9 @@ Example:
                <% $style %>
         >
 
-%   if ( $object->get($pre.'address2') ) {
-
-%     #XXX try to parse first
-%     if ( 0 ) {
-%     } else { #XXX i don't work so well when the dropdown is changed :/  i probably need to be triggered by "default service address"
-        Can't parse unit type and number from <B><% $object->get($pre.'address2') |h %></B>
-%    }
-
-% }
+%    #XXX i don't work so well when the dropdown is changed :/  i probably need to be triggered by "default service address"
+%    $alt_err =~ s/(ship_)?address2/'<B>'.encode_entities($object->get($1.'address2')).'<\/B>'/e;
+     <% $alt_err %>
 
     </TD>
 
@@ -219,6 +213,8 @@ $object->set($pre.'state', $statedefault )
   unless $object->get($pre.'state')
          || $object->get($pre.'country') ne $countrydefault;
 
+my $alt_err = ($opt{'alt_format'} && !$disabled) ? $object->alternize : '';
+
 my @style = ();
 push @style, 'background-color: #dddddd' if $disabled;
 
diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index bb10a83de..d17e4dfee 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -23,27 +23,39 @@ Example:
 
 <SCRIPT TYPE="text/javascript">
 
+  function location_disable(what) {
+%   for (@location_fields, 'city_select') { 
+      what.form.<%$_%>.disabled = true;
+      var ftype = what.form.<%$_%>.tagName;
+      if( ftype == 'SELECT') changeSelect(what.form.<%$_%>, '');
+      else what.form.<%$_%>.value = '';
+      if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#dddddd';
+%   } 
+  }
+
+  function location_enable(what) {
+%   for (grep { $_ ne 'location_number' } @location_fields, 'city_select') { 
+      what.form.<%$_%>.disabled = false;
+      var ftype = what.form.<%$_%>.tagName;
+      if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#ffffff';
+      if( ftype == 'INPUT' ) what.form.<%$_%>.value = '';
+%   } 
+
+    if ( what.form.location_type.options[what.form.location_type.selectedIndex].value ) {
+      what.form.location_number.disabled = false;
+      what.form.location_number.style.backgroundColor = '#ffffff';
+    }
+    what.form.location_number.value = '';
+  }
+
   function locationnum_changed(what) {
     var locationnum = what.options[what.selectedIndex].value;
     if ( locationnum == -2 ) {
-%         for (@location_fields, 'city_select') { 
-            what.form.<%$_%>.disabled = true;
-	    var ftype = what.form.<%$_%>.tagName;
-	    if( ftype == 'SELECT') changeSelect(what.form.<%$_%>, '');
-	    else what.form.<%$_%>.value = '';
-            what.form.<%$_%>.style.backgroundColor = '#dddddd';
-%         } 
-	return;
+      location_disable(what);
+      return;
     }
-    
     if ( locationnum == -1 ) {
-
-%     for (@location_fields, 'city_select') { 
-        what.form.<%$_%>.disabled = false;
-        what.form.<%$_%>.style.backgroundColor = '#ffffff';
-	var ftype = what.form.<%$_%>.tagName;
-	if( ftype == 'INPUT' ) what.form.<%$_%>.value = '';
-%     } 
+      location_enable(what);
 
       changeSelect(what.form.country, <% $countrydefault |js_string %>);
 
@@ -52,52 +64,45 @@ Example:
                                           ''
                                         )
                      );
+      return;
+    }
 
-    } else {
+    if ( locationnum == 0 ) {
+%     if ( $cust_main ) {
+      what.form.address1.value = <% $cust_main->get($prefix.'address1') |js_string %>;
+      what.form.address2.value = <% $cust_main->get($prefix.'address2') |js_string %>;
+      what.form.city.value = <% $cust_main->get($prefix.'city') |js_string %>;
+      what.form.zip.value = <% $cust_main->get($prefix.'zip') |js_string %>;
 
-      if ( locationnum == 0 ) {
-%       if ( $cust_main ) {
-        what.form.address1.value = <% $cust_main->get($prefix.'address1') |js_string %>;
-        what.form.address2.value = <% $cust_main->get($prefix.'address2') |js_string %>;
-        what.form.city.value = <% $cust_main->get($prefix.'city') |js_string %>;
-        what.form.zip.value = <% $cust_main->get($prefix.'zip') |js_string %>;
+      changeSelect(what.form.country, <% $cust_main->get($prefix.'country') | js_string %> );
 
-        changeSelect(what.form.country, <% $cust_main->get($prefix.'country') | js_string %> );
-
-        country_changed( what.form.country,
-                         fix_state_factory( <% $cust_main->get($prefix.'state') | js_string %>,
-                                            <% $cust_main->get($prefix.'county') | js_string %>
-                                          )
-                       );
-%       }
+      country_changed( what.form.country,
+                       fix_state_factory( <% $cust_main->get($prefix.'state') | js_string %>,
+                                          <% $cust_main->get($prefix.'county') | js_string %>
+                                        )
+                     );
+%     }
 
-      } else {
-        get_location( locationnum, update_location );
-      } 
+    } else {
+      get_location( locationnum, update_location );
+    } 
 
-%     if ( $editable ) {
-        if ( locationnum == 0 ) {
-%     }
+%   if ( $editable ) {
+      if ( locationnum == 0 ) {
+%   }
 
-%#sleep/wait until dropdowns are updated?
-%         for (@location_fields, 'city_select') { 
-            what.form.<%$_%>.disabled = true;
-            what.form.<%$_%>.style.backgroundColor = '#dddddd';
-%         } 
+%       #sleep/wait until dropdowns are updated?
+        location_disable(what);
 
-%     if ( $editable ) {
-        } else {
+%   if ( $editable ) {
+      } else {
 
-%#sleep/wait until dropdowns are updated?
-%         for (@location_fields, 'city_select') { 
-            what.form.<%$_%>.disabled = false;
-            what.form.<%$_%>.style.backgroundColor = '#ffffff';
-%         } 
+%       #sleep/wait until dropdowns are updated?
+        location_enable(what);
 
-        }
-%     }
+      }
+%   }
 
-    }
   }
 
   function fix_state_factory (state, county) {
@@ -181,7 +186,7 @@ Example:
              'disabled'     => $disabled,
              'no_asterisks' => 1,
              'no_bold'      => $opt{'no_bold'},
-	     'alt_format'   => $opt{'alt_format'},
+             'alt_format'   => $opt{'alt_format'},
           )
 %>