X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fcust_main_county.cgi;h=26a3e21b9662c0bbdb3b8659eef01a0d2254674d;hp=c6484cacd589fb0aaa752c9b26d29c0ff91b6bd7;hb=ac8410cdb67639afeb84c84e975fffadf3e6cce1;hpb=ade7fd5f694fcc47e4a0ffb606c0dc08ecb322fb

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index c6484cacd..26a3e21b9 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -10,7 +10,9 @@
                            'table'    => 'cust_main_county',
                            'hashref'  => $hashref,
                            'order_by' =>
-                             'ORDER BY country, state, county, city, taxclass',
+                              'ORDER BY country, state, county, city, '.
+                              'district, taxclass, '.
+                              "COALESCE(taxname, '')",
                          },
      'count_query'    => $count_query,
      'header'         => \@header,
@@ -440,11 +442,12 @@ if ( $taxclass ) {
 
 $cell_style = '';
 
-my @header        = ( 'Country', 'State/Province', 'County', 'City' );
-my @header2       = ( '', '', '', '', );
-my @links         = ( '', '', '', '', );
-my @link_onclicks = ( '', '', '', '', );
-my $align = 'llll';
+my @header        = ( 'Country', 'State/Province', 'County', 'City', '' );
+# last column is 'district', but usually unused
+my @header2       = ( '', '', '', '', '' );
+my @links         = ( '', '', '', '', '' );
+my @link_onclicks = ( '', '', '', '', '' );
+my $align = 'lllll';
 
 my %seen_country = ();
 my %seen_state = ();
@@ -453,7 +456,7 @@ my %seen_county = ();
 my @fields = (
   sub { my $country = shift->country;
         return '' if $seen_country{$country}++;
-        code2country($country). " ($country)";
+        FS::geocode_Mixin->code2country($country). " ($country)";
       },
 
   #state
@@ -464,13 +467,13 @@ my @fields = (
                              ? ' '. add_link(
                                  desc => 'Add more counties',
                                  col  => 'state',
-                                 label=> 'add more counties',
+                                 label=> 'add more counties',
                                  row  => $_[0],
                                  cgi  => $cgi,
                                ).
                                ' '. collapse_link(
                                  col  => 'state',
-                                 label=> 'remove all counties',
+                                 label=> 'remove all counties',
                                  row  => $_[0],
                                  cgi  => $cgi,
                                )
@@ -481,7 +484,7 @@ my @fields = (
               ? ''
               : ' '. expand_link( desc  => 'Add States',
                                        row   => $_[0],
-                                       label => 'add states',
+                                       label => 'add states',
                                        cgi  => $cgi,
                                      )
           );
@@ -500,18 +503,18 @@ my @fields = (
                        ? ' '. add_link(
                            desc => 'Add more cities',
                            col  => 'county',
-                           label=> 'add more cities',
+                           label=> 'add more cities',
                            row  => $_[0],
                            cgi  => $cgi,
                          ).
                          ' '. collapse_link(
                            col  => 'county',
-                           label=> 'remove all cities',
+                           label=> 'remove all cities',
                            row  => $_[0],
                            cgi  => $cgi,
                          )
                        : ' '. remove_link( col  => 'county',
-                                                label=> 'remove county',
+                                                label=> 'remove county',
                                                 row  => $_[0],
                                                 cgi  => $cgi,
                                               );
@@ -522,7 +525,7 @@ my @fields = (
           : '(all) '.
               expand_link(   desc  => 'Add Counties',
                              row   => $_[0],
-                             label => 'add counties',
+                             label => 'add counties',
                              cgi  => $cgi,
                          );
       },
@@ -532,12 +535,13 @@ my @fields = (
         my $r = shift;
         if ( $r->city ) {
 
-          if ( $r->taxclass ) { #but if it has a taxclass, can't remove
+          if ( $r->taxclass #but if it has a taxclass, can't remove
+              or $r->district ) { # or a district
             $r->city;
           } else {
             $r->city. ' '.
               remove_link( col  => 'city',
-                           label=> 'remove city',
+                           label=> 'remove city',
                            row  => $r,
                            cgi  => $cgi,
                          );
@@ -546,11 +550,26 @@ my @fields = (
           '(all) '.
             expand_link(   desc  => 'Add Cities',
                            row   => $r,
-                           label => 'add cities',
+                           label => 'add cities',
                            cgi  => $cgi,
                        );
         }
       },
+
+  #district
+  sub {
+        my $r = shift;
+        if ( $r->district ) {
+          $r->district . ' '.
+            remove_link( col  => 'district',
+                         label=> 'remove district',
+                         row  => $r,
+                         cgi  => $cgi,
+                       );
+        }
+        # manually editing districts is not exactly intended
+      },
+
 );
 
 my @color = (
@@ -607,7 +626,8 @@ my $cb_sub = sub {
   my $cust_main_county = shift;
 
   if ( $cb_oldrow ) {
-    if (    $cb_oldrow->city     ne $cust_main_county->city 
+    if (    $cb_oldrow->district ne $cust_main_county->district
+         || $cb_oldrow->city     ne $cust_main_county->city 
          || $cb_oldrow->county   ne $cust_main_county->county  
          || $cb_oldrow->state    ne $cust_main_county->state  
          || $cb_oldrow->country  ne $cust_main_county->country