From 92b6628c08e4478e48b6f250320a3e3e93262ec2 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Tue, 31 Mar 2015 11:53:29 -0700 Subject: more flexible package suspend/unsuspend fees, #26828 --- FS/FS/reason.pm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'FS/FS/reason.pm') diff --git a/FS/FS/reason.pm b/FS/FS/reason.pm index 9c34dd98a..6f4bf62d9 100644 --- a/FS/FS/reason.pm +++ b/FS/FS/reason.pm @@ -50,7 +50,7 @@ FS::Record. The following fields are currently supported: L) of a package to be ordered when the package is unsuspended. Typically this will be some kind of reactivation fee. Attaching it to a suspension reason allows the reactivation fee to be charged for some -suspensions but not others. +suspensions but not others. DEPRECATED. =item unsuspend_hold - 'Y' or ''. If unsuspend_pkgpart is set, this tells whether to bill the unsuspend package immediately ('') or to wait until @@ -60,6 +60,15 @@ the customer's next invoice ('Y'). If enabled, the customer will be credited for their remaining time on suspension. +=item feepart - for suspension reasons, the feepart of a fee to be +charged when a package is suspended for this reason. + +=item fee_hold - 'Y' or ''. If feepart is set, tells whether to bill the fee +immediately ('') or wait until the customer's next invoice ('Y'). + +=item fee_on_unsuspend - If feepart is set, tells whether to charge the fee +on suspension ('') or unsuspension ('Y'). + =back =head1 METHODS @@ -121,10 +130,14 @@ sub check { || $self->ut_foreign_keyn('unsuspend_pkgpart', 'part_pkg', 'pkgpart') || $self->ut_flag('unsuspend_hold') || $self->ut_flag('unused_credit') + || $self->ut_foreign_keyn('feepart', 'part_fee', 'feepart') + || $self->ut_flag('fee_on_unsuspend') + || $self->ut_flag('fee_hold') ; return $error if $error; } else { - foreach (qw(unsuspend_pkgpart unsuspend_hold unused_credit)) { + foreach (qw(unsuspend_pkgpart unsuspend_hold unused_credit feepart + fee_on_unsuspend fee_hold)) { $self->set($_ => ''); } } @@ -192,7 +205,6 @@ sub new_or_existing { $reason; } - =head1 BUGS =head1 SEE ALSO -- cgit v1.2.1