X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=34ed78dd400911e2ef10958a62ae99005ce57c24;hb=9a6e080912eb49a601b574591321cfc915359dc0;hp=780bf96ad391d959bec7a0930d831889acd334a7;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 780bf96ad..34ed78dd4 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -31,6 +31,9 @@ Example:
       else what.form.<%$_%>.value = '';
       if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#dddddd';
 %   } 
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.disabled = true;
+    }
   }
 
   function location_clear(what) {
@@ -38,6 +41,9 @@ Example:
       var ftype = what.form.<%$_%>.tagName;
       if( ftype == 'INPUT' ) what.form.<%$_%>.value = '';
 %   }
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.value = '';
+    }
 %   if ( $opt{'alt_format'} ) {
       changeSelect(what.form.location_kind, '');
       changeSelect(what.form.location_type, '');
@@ -51,6 +57,9 @@ Example:
       var ftype = what.form.<%$_%>.tagName;
       if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#ffffff';
 %   } 
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.disabled = false;
+    }
 %   if ( $opt{'alt_format'} ) {
       if ( what.form.location_type &&
            what.form.location_type.options[what.form.location_type.selectedIndex].value ) {
@@ -174,30 +183,14 @@ Example:
 <TR>
   <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %></<%$th%>>
   <TD COLSPAN=7>
-    <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 %>
-%     }
-%     if ( $addnew ) {
-        <OPTION VALUE="-1"
-                <% $locationnum == -1 ? 'SELECTED' : '' %>
-        >Add new location
-%     }
-    </SELECT>
+
+    <& /elements/select-cust_location.html,
+         %opt,
+         'curr_value'    => $locationnum,
+         'cust_location' => \@cust_location,
+         'onchange'      => 'locationnum_changed(this);',
+    &>
+
   </TD>
 </TR>
 
@@ -209,11 +202,16 @@ Example:
              'no_bold'      => $opt{'no_bold'},
              'alt_format'   => $opt{'alt_format'},
              'enable_coords'=> 1,
+             'enable_censustract' => 1,
           )
 %>
-<SCRIPT TYPE="text/javascript">
-  locationnum_changed(document.getElementById('locationnum'));
-</SCRIPT>
+
+% unless ( $prospect_main ) {
+  <SCRIPT TYPE="text/javascript">
+    locationnum_changed(document.getElementById('locationnum'));
+  </SCRIPT>
+% }
+
 <%init>
 
 my $conf = new FS::Conf;
@@ -274,8 +272,12 @@ if ( $locationnum && $locationnum > 0 ) {
 $cust_location->coord_auto('Y');
 
 my $location_sort = sub {
+  #enabled w/label_prefix _location #    $a->locationname cmp $b->locationname
+                                    # or 
         $a->country   cmp $b->country
+  or lc($a->state)    cmp lc($b->state)
   or lc($a->city)     cmp lc($b->city)
+  or lc($a->county)   cmp lc($b->county)
   or lc($a->address1) cmp lc($b->address1)
   or lc($a->address2) cmp lc($b->address2)
 };