projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
74db129
)
fix "Inactive" status showing instead of "Suspended" or "Canceled" when there were...
author
ivan
<ivan>
Mon, 18 Oct 2010 03:36:30 +0000
(
03:36
+0000)
committer
ivan
<ivan>
Mon, 18 Oct 2010 03:36:30 +0000
(
03:36
+0000)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
165e45f
..
3b40ffa
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-8114,7
+8114,7
@@
sub status { shift->cust_status(@_); }
sub cust_status {
my $self = shift;
sub cust_status {
my $self = shift;
- for my $status (
qw( prospect active inactive suspended cancelled )
) {
+ for my $status (
FS::cust_main->statuses()
) {
my $method = $status.'_sql';
my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
my $method = $status.'_sql';
my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
@@
-8149,9
+8149,9
@@
use vars qw(%statuscolor);
tie %statuscolor, 'Tie::IxHash',
'prospect' => '7e0079', #'000000', #black? naw, purple
'active' => '00CC00', #green
tie %statuscolor, 'Tie::IxHash',
'prospect' => '7e0079', #'000000', #black? naw, purple
'active' => '00CC00', #green
- 'inactive' => '0000CC', #blue
'suspended' => 'FF9900', #yellow
'cancelled' => 'FF0000', #red
'suspended' => 'FF9900', #yellow
'cancelled' => 'FF0000', #red
+ 'inactive' => '0000CC', #blue
;
sub statuscolor { shift->cust_statuscolor(@_); }
;
sub statuscolor { shift->cust_statuscolor(@_); }
@@
-8321,8
+8321,8
@@
sub cancel_sql {
AND 0 = ( $select_count_pkgs AND $recurring_sql
AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
)
AND 0 = ( $select_count_pkgs AND $recurring_sql
AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
)
- AND 0 = ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
";
";
+# AND 0 = ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
}
}