diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_pkg.pm | 25 | ||||
| -rw-r--r-- | FS/FS/cust_pkg_reason.pm | 23 |
2 files changed, 41 insertions, 7 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 09808a45f..834d2efb8 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -772,6 +772,22 @@ sub last_bill { $cust_bill_pkg ? $cust_bill_pkg->sdate : $self->setup || 0; } +=item last_cust_pkg_reason + +Returns the most recent FS::reason associated with the package. + +=cut + +sub last_cust_pkg_reason { + my $self = shift; + qsearchs( { + 'table' => 'cust_pkg_reason', + 'hashref' => { 'pkgnum' => $self->pkgnum, }, + 'extra_sql'=> "AND date <= ". time, + 'order_by' => 'ORDER BY date DESC LIMIT 1', + } ); +} + =item last_reason Returns the most recent FS::reason associated with the package. @@ -779,13 +795,8 @@ Returns the most recent FS::reason associated with the package. =cut sub last_reason { - my $self = shift; - my $cust_pkg_reason = qsearchs( { - 'table' => 'cust_pkg_reason', - 'hashref' => { 'pkgnum' => $self->pkgnum, }, - 'extra_sql'=> 'ORDER BY date DESC LIMIT 1', - } ); - qsearchs ( 'reason', { 'reasonnum' => $cust_pkg_reason->reasonnum } ) + my $cust_pkg_reason = shift->last_cust_pkg_reason; + $cust_pkg_reason->reason if $cust_pkg_reason; } diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm index 2f927401f..24808f944 100644 --- a/FS/FS/cust_pkg_reason.pm +++ b/FS/FS/cust_pkg_reason.pm @@ -106,6 +106,29 @@ sub check { $self->SUPER::check; } +=item reason + +Returns the reason (see L<FS::reason>) associated with this cust_pkg_reason. + +=cut + +sub reason { + my $self = shift; + qsearchs( 'reason', { 'reasonnum' => $self->reasonnum } ); +} + +=item reasontext + +Returns the text of the reason (see L<FS::reason>) associated with this +cust_pkg_reason. + +=cut + +sub reasontext { + my $reason = shift->reason; + $reason ? $reason->reason : ''; +} + =back =head1 BUGS |