optimize customer list, RT#20173

[freeside.git] / FS / FS / cust_main / Status.pm

diff --git a/FS/FS/cust_main/Status.pm b/FS/FS/cust_main/Status.pm
index b5e8986..66ba33f 100644 (file)
--- a/FS/FS/cust_main/Status.pm
+++ b/FS/FS/cust_main/Status.pm
@@ -1,7 +1,7 @@
 package FS::cust_main::Status;
 
 use strict;
-use vars qw( $conf ); # $module ); #$DEBUG $me );
+use vars qw( $conf $module ); #$DEBUG $me );
 use Tie::IxHash;
 use FS::UID;
 use FS::cust_pkg;
@@ -11,7 +11,7 @@ use FS::cust_pkg;
 
 install_callback FS::UID sub { 
   $conf = new FS::Conf;
-  #$module = $conf->config('cust_main-status_module') || 'Classic';
+  $module = $conf->config('cust_main-status_module') || 'Classic';
 };
 
 =head1 NAME
@@ -40,11 +40,9 @@ sub statuscolors {
 
   my %statuscolors;
 
-  my $module = $conf->config('cust_main-status_module') || 'Classic';
-
   if ( $module eq 'Classic' ) {
     tie %statuscolors, 'Tie::IxHash',
-      'prospect'  => '7e0079', #'000000', #black?  naw, purple
+      'prospect'  => 'FF00F5', #'000000', #black?  naw, purple
       'active'    => '00CC00', #green
       'ordered'   => '009999', #teal? cyan?
       'inactive'  => '0000CC', #blue
@@ -53,7 +51,7 @@ sub statuscolors {
     ;
   } elsif ( $module eq 'Recurring' ) {
     tie %statuscolors, 'Tie::IxHash',
-      'prospect'  => '7e0079', #'000000', #black?  naw, purple
+      'prospect'  => 'FF00F5', #'000000', #black?  naw, purple
       'active'    => '00CC00', #green
       'ordered'   => '009999', #teal? cyan?
       'suspended' => 'FF9900', #yellow
@@ -68,6 +66,21 @@ sub statuscolors {
 
 }
 
+sub statuslabels {
+  #my $self = shift; #i guess i'm a class method
+
+  my %statuslabels = (
+      'prospect'  => 'No packages',
+      'active'    => 'Active',
+      'ordered'   => 'Ordered',
+      'inactive'  => 'Inactive',
+      'suspended' => 'Suspended',
+      'cancelled' => 'Cancelled',
+  );
+
+  \%statuslabels;
+}
+
 =item cancelled_sql
 
 =cut
@@ -87,8 +100,6 @@ sub cancelled_sql {
     AND 0 < ( $select_count_pkgs AND $cancelled_sql   )
   ";
 
-  my $module = $conf->config('cust_main-status_module') || 'Classic';
-
   if ( $module eq 'Classic' ) {
     $sql .=
       " AND 0 = (  $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " ) ";