X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=b804f4548bfd96864359d3aa4d52b521332da32b;hb=7acc76e0ead0d88cb225c88016c778c8feb9a075;hp=bb10a83def61853be8b9abb2ccdc4a7d0b2a9131;hpb=fced2ed0147049fded427862a3517c172f86513e;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index bb10a83de..b804f4548 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -23,27 +23,50 @@ 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_clear(what) {
+%   for (grep { $_ ne 'location_number' } @location_fields, 'city_select') { 
+      var ftype = what.form.<%$_%>.tagName;
+      if( ftype == 'INPUT' ) what.form.<%$_%>.value = '';
+%   }
+%   if ( $opt{'alt_format'} ) {
+      changeSelect(what.form.location_kind, '');
+      changeSelect(what.form.location_type, '');
+      what.form.location_number.value = '';
+%   }
+  }
+
+  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 ( $opt{'alt_format'} ) {
+    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';
+    }
+%   }
+  }
+
   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;
+    if ( locationnum == -2 ) { //(not required)
+      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 = '';
-%     } 
+    if ( locationnum == -1 ) { //Add new location
+      location_clear(what);
 
       changeSelect(what.form.country, <% $countrydefault |js_string %>);
 
@@ -53,51 +76,50 @@ Example:
                                         )
                      );
 
-    } else {
+      location_enable(what);
+      return;
+    }
+    if ( locationnum == -3 ) { //service address location for qualificaitons
+      what.form.address1.value = <% $cust_location->address1 |js_string %>;
+      what.form.address2.value = <% $cust_location->address2 |js_string %>;
+      what.form.city.value = <% $cust_location->city |js_string %>;
+      what.form.zip.value = <% $cust_location->zip |js_string %>;
+%     if ( $opt{'alt_format'} ) {
+        what.form.location_number.value = <% $cust_location->location_number |js_string %>;
+        changeSelect(what.form.location_kind, <% $cust_location->location_kind |js_string %> );
+        changeSelect(what.form.location_type, <% $cust_location->location_type |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_location->country | js_string %> );
 
-        changeSelect(what.form.country, <% $cust_main->get($prefix.'country') | js_string %> );
+      country_changed( what.form.country,
+                       fix_state_factory( <% $cust_location->state | js_string %>,
+                                          <% $cust_location->county | js_string %>
+                                        )
+                     );
+      location_enable(what);
+      return;
+    }
 
-        country_changed( what.form.country,
-                         fix_state_factory( <% $cust_main->get($prefix.'state') | js_string %>,
-                                            <% $cust_main->get($prefix.'county') | js_string %>
-                                          )
-                       );
-%       }
+%# default service address is now just another location
+    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) {
@@ -133,10 +155,17 @@ Example:
   function update_location( string ) {
     var hash = eval('('+string+')');
     document.getElementById('address1').value = hash['address1'];
-    document.getElementById('address2').value = hash['address2'];
     document.getElementById('city').value     = hash['city'];
     document.getElementById('zip').value      = hash['zip'];
 
+%   if ( $opt{'alt_format'} ) {
+      changeSelect( document.getElementById('location_kind'), hash['location_kind']);
+      changeSelect( document.getElementById('location_type'), hash['location_type']);
+      document.getElementById('location_number').value = hash['location_number'];
+%   } else {
+      document.getElementById('address2').value = hash['address2'];
+%   }
+
     var country_el = document.getElementById('country');
 
     changeSelect( country_el, hash['country'] );
@@ -151,17 +180,22 @@ Example:
 </SCRIPT>
 
 <TR>
-  <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service&nbsp;location' %></<%$th%>>
+  <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %></<%$th%>>
   <TD COLSPAN=7>
-    <SELECT NAME="locationnum" onChange="locationnum_changed(this);">
-% if ( !$prospect_main ) {
-      <OPTION VALUE=""><% $opt{'empty_label'} || '(default service address)' |h %>
+    <SELECT NAME     = "locationnum"
+            ID       = "locationnum"
+            onChange = "locationnum_changed(this);"
+    >
+% if ( $cust_main ) {
+      <OPTION VALUE="<% $cust_main->ship_locationnum %>"><% $opt{'empty_label'} || '(default service address)' |h %>
 % }
 % if ( $opt{'is_optional'} ) {
     <OPTION VALUE="-2" <% $locationnum == -2 ? 'SELECTED' : ''%>><% $opt{'optional_label'} || '(not required)' |h %>
 % }
 %
 %     foreach my $loc ( @cust_location ) {
+%       # don't show the ship_location redundantly
+%       next if $cust_main && $cust_main->ship_locationnum == $loc->locationnum;
         <OPTION VALUE="<% $loc->locationnum %>"
                 <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
         ><% $loc->line |h %>
@@ -181,10 +215,13 @@ Example:
              'disabled'     => $disabled,
              'no_asterisks' => 1,
              'no_bold'      => $opt{'no_bold'},
-	     'alt_format'   => $opt{'alt_format'},
+             'alt_format'   => $opt{'alt_format'},
+             'enable_coords'=> 1,
           )
 %>
-
+<SCRIPT TYPE="text/javascript">
+  locationnum_changed(document.getElementById('locationnum'));
+</SCRIPT>
 <%init>
 
 my $conf = new FS::Conf;
@@ -197,8 +234,7 @@ my $cgi           = $opt{'cgi'};
 my $cust_pkg      = $opt{'cust_pkg'};
 my $cust_main     = $opt{'cust_main'};
 my $prospect_main = $opt{'prospect_main'};
-
-my $prefix = ($cust_main && length($cust_main->ship_last)) ? 'ship_' : '';
+die "cust_main or prospect_main required" unless $cust_main or $prospect_main;
 
 my $locationnum = '';
 if ( $cgi->param('error') ) {
@@ -210,9 +246,9 @@ if ( $cgi->param('error') ) {
   } elsif ($prospect_main) {
     my @cust_location = $prospect_main->cust_location;
     $locationnum = $cust_location[0]->locationnum if scalar(@cust_location)==1;
-  } else { #?
+  } else { #$cust_main
     $cgi->param('locationnum') =~ /^(\-?\d*)$/ or die "illegal locationnum";
-    $locationnum = $1;
+    $locationnum = $1 || $cust_main->ship_locationnum;
   }
 }
 
@@ -221,25 +257,27 @@ if ( $cgi->param('error') ) {
 my $editable = $cust_main ? 0 : 1; #could use explicit control
 my $addnew = $cust_main ? 1 : ( $locationnum>0 ? 0 : 1 );
 
-my @location_fields = qw( address1 address2 city county state zip country );
+my @location_fields = qw( address1 address2 city county state zip country
+                          latitude longitude
+                        );
 if ( $opt{'alt_format'} ) {
     push @location_fields, qw( location_type location_number location_kind );
 }
 
-my $cust_location;
+my $cust_location; #the one that shows by default in the location edit space
 if ( $locationnum && $locationnum > 0 ) {
   $cust_location = qsearchs('cust_location', { 'locationnum' => $locationnum } )
     or die "unknown locationnum";
 } else {
   $cust_location = new FS::cust_location;
-  if ( $locationnum == -1 ) {
+  if ( $locationnum == -1 || $locationnum == -3 ) {
     $cust_location->$_( $cgi->param($_) ) foreach @location_fields;
   } elsif ( $cust_pkg && $cust_pkg->locationnum ) {
     my $pkg_location = $cust_pkg->cust_location;
     $cust_location->$_( $pkg_location->$_ ) foreach @location_fields;
     $opt{'empty_label'} ||= 'package address: '.$pkg_location->line;
   } elsif ( $cust_main ) {
-    $cust_location->$_( $cust_main->get($prefix.$_) ) foreach @location_fields;
+    $cust_location = $cust_main->ship_location; #I think
   }
 }
 
@@ -250,7 +288,7 @@ my $location_sort = sub {
   or lc($a->address2) cmp lc($b->address2)
 };
 
-my @cust_location = ();
+my @cust_location;
 push @cust_location, $cust_main->cust_location if $cust_main;
 push @cust_location, $prospect_main->cust_location if $prospect_main;
 push @cust_location, $cust_location
@@ -259,14 +297,27 @@ push @cust_location, $cust_location
 
 @cust_location = sort $location_sort grep !$_->disabled, @cust_location;
 
+$cust_location = $cust_location[0]
+  if ( $prospect_main )
+  && !$opt{'is_optional'}
+  && @cust_location;
+
 my $disabled =
   ( $locationnum < 0
     || ( $editable && $locationnum )
-    || ( $prospect_main && !$opt{'is_optional'} && !@cust_location && $addnew )
+    || ( $prospect_main
+         && !$opt{'is_optional'} && !@cust_location && $addnew
+       )
   )
     ? ''
     : 'DISABLED';
 
+if ( $cust_main && $opt{'alt_format'} && ! @cust_location ) {
+  $cust_location->locationnum(-3);
+  $cust_location->alternize;
+  push @cust_location, $cust_location;
+}
+
 my $th = $opt{'no_bold'} ? 'TD' : 'TH';
 
 </%init>