projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Thinktel VoIP provisioning, #32084
[freeside.git]
/
FS
/
FS
/
cust_main_Mixin.pm
diff --git
a/FS/FS/cust_main_Mixin.pm
b/FS/FS/cust_main_Mixin.pm
index
769b049
..
bdad511
100644
(file)
--- a/
FS/FS/cust_main_Mixin.pm
+++ b/
FS/FS/cust_main_Mixin.pm
@@
-2,7
+2,7
@@
package FS::cust_main_Mixin;
use strict;
use vars qw( $DEBUG $me );
use strict;
use vars qw( $DEBUG $me );
-use Carp qw( confess );
+use Carp qw( confess
carp cluck
);
use FS::UID qw(dbh);
use FS::cust_main;
use FS::Record qw( qsearch qsearchs );
use FS::UID qw(dbh);
use FS::cust_main;
use FS::Record qw( qsearch qsearchs );
@@
-38,6
+38,7
@@
sub cust_linked { $_[0]->custnum; }
sub cust_main {
my $self = shift;
sub cust_main {
my $self = shift;
+ cluck ref($self). '->cust_main called' if $DEBUG;
$self->cust_linked ? qsearchs('cust_main', {custnum => $self->custnum}) : '';
}
$self->cust_linked ? qsearchs('cust_main', {custnum => $self->custnum}) : '';
}
@@
-234,12
+235,26
@@
linked to a customer.
=cut
sub ucfirst_cust_status {
=cut
sub ucfirst_cust_status {
+ carp "ucfirst_cust_status deprecated, use cust_status_label";
+ local($FS::cust_main::ucfirst_nowarn) = 1;
my $self = shift;
$self->cust_linked
? ucfirst( $self->cust_status(@_) )
: $self->cust_unlinked_msg;
}
my $self = shift;
$self->cust_linked
? ucfirst( $self->cust_status(@_) )
: $self->cust_unlinked_msg;
}
+=item cust_status_label
+
+=cut
+
+sub cust_status_label {
+ my $self = shift;
+
+ $self->cust_linked
+ ? FS::cust_main::cust_status_label($self)
+ : $self->cust_unlinked_msg;
+}
+
=item cust_statuscolor
Given an object that contains fields from cust_main (say, from a JOINed
=item cust_statuscolor
Given an object that contains fields from cust_main (say, from a JOINed
@@
-525,7
+540,7
@@
sub process_email_search_result {
my $job = shift;
#warn "$me process_re_X $method for job $job\n" if $DEBUG;
my $job = shift;
#warn "$me process_re_X $method for job $job\n" if $DEBUG;
- my $param =
thaw(decode_base64(shift))
;
+ my $param =
shift
;
warn Dumper($param) if $DEBUG;
$param->{'job'} = $job;
warn Dumper($param) if $DEBUG;
$param->{'job'} = $job;