Reverted menu-left-example.png back to original and cleaned up menu-top-example to...

[freeside.git] / httemplate / browse / cust_main_county.cgi

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 58ae550..26a3e21 100755 (executable)
--- 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,
@@ -46,7 +48,7 @@ my $exempt_sub = sub {
 };
 
 my $cs_oldrow;
-my $cell_style;
+my $cell_style = '';
 my $cell_style_sub = sub {
   my $row = shift;
   if ( $cs_oldrow ne $row ) {
@@ -54,11 +56,10 @@ my $cell_style_sub = sub {
       if ( $cs_oldrow->country ne $row->country ) {
         $cell_style = 'border-top:2px solid #000000';
       } elsif ( $cs_oldrow->state ne $row->state ) {
-        #$cell_style = 'border-top:1px solid #cccccc'; #default?
-        $cell_style = 'border-top:1px solid #bbbbbb';
-      } elsif ( $cs_oldrow->state eq $row->state ) {
-        #$cell_style = 'border-top:dashed 1px dark gray';
-        #$cell_style = 'border-top:1px dashed #cccccc';
+        $cell_style = 'border-top:1px solid #888888';
+      } elsif ( $cs_oldrow->county ne $row->county ) {
+        $cell_style = 'border-top:1px solid #cccccc';
+      } else { 
         $cell_style = '';
       }
     }
@@ -441,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 = ();
@@ -454,9 +456,10 @@ 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
   sub { my $label = $seen_state{$_[0]->country}->{$_[0]->state}++
                       ? '' : state_label($_[0]->state, $_[0]->country);
 
@@ -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,
                                      )
           );
@@ -489,6 +492,7 @@ my @fields = (
         $label.$countylinks.$addlink;
       },
 
+  #county
   sub { my $label =
           $seen_county{$_[0]->country}->{$_[0]->state}->{$_[0]->county}++ 
             ? '' : $_[0]->county;
@@ -499,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,
                                               );
@@ -521,25 +525,51 @@ my @fields = (
           : '(all) '.
               expand_link(   desc  => 'Add Counties',
                              row   => $_[0],
-                             label => 'add counties',
+                             label => 'add counties',
                              cgi  => $cgi,
                          );
       },
 
-  sub { $_[0]->city
-          ? $_[0]->city. ' '.
+  #city
+  sub {
+        my $r = shift;
+        if ( $r->city ) {
+
+          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',
-                           row  => $_[0],
+                           label=> 'remove city',
+                           row  => $r,
                            cgi  => $cgi,
-                         )
-          : '(all) '.
-              expand_link(   desc  => 'Add Cities',
-                             row   => $_[0],
-                             label => 'add cities',
-                             cgi  => $cgi,
                          );
+          }
+        } else {
+          '(all) '.
+            expand_link(   desc  => 'Add Cities',
+                           row   => $r,
+                           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 = (
@@ -552,10 +582,24 @@ my @color = (
 if ( $conf->exists('enable_taxclasses') ) {
   push @header, qq!Tax class (<A HREF="${p}edit/part_pkg_taxclass.html">add new</A>)!;
   push @header2, '(per-package classification)';
-  push @fields, sub { $_[0]->taxclass || '(all)&nbsp;'.
-                       separate_taxclasses_link($_[0], 'Separate Taxclasses').
-                       'separate&nbsp;taxclasses</A></FONT>'
-                    };
+  push @fields, sub {
+    my $r = shift;
+    if ( $r->taxclass ) {
+      $r->taxclass;
+    } else {
+      my $sql = 'SELECT COUNT(*) FROM cust_main_county
+                   WHERE country = ? AND state = ? AND county = ?
+                     AND city = ? AND taxclass IS NOT NULL';
+      if ( FS::Record->scalar_sql($sql, map $r->$_,
+                                            qw( country state county city) ) ) {
+        '(none)';
+      } else {
+        '(all)&nbsp;'.
+          separate_taxclasses_link($r, 'Separate Taxclasses').
+          'separate&nbsp;taxclasses</A></FONT>';
+      }
+    }
+  };
   push @color, sub { shift->taxclass ? '000000' : '999999' };
   push @links, '';
   push @link_onclicks, '';
@@ -582,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