diff options
author | Mark Wells <mark@freeside.biz> | 2016-01-31 21:07:08 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-01-31 21:07:24 -0800 |
commit | 12560fb5a69ddace43dc267b44894acb5352c98c (patch) | |
tree | ea04e98ae2b1dbf316de76f32f3251a2ff941d76 /FS/FS/reason.pm | |
parent | 7643e364c22eeca302f09a87ea968175ce01985b (diff) |
unused_credit flag for cancellation reasons, #27911
Diffstat (limited to 'FS/FS/reason.pm')
-rw-r--r-- | FS/FS/reason.pm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/FS/FS/reason.pm b/FS/FS/reason.pm index e62bf342b..d87911e22 100644 --- a/FS/FS/reason.pm +++ b/FS/FS/reason.pm @@ -56,7 +56,7 @@ suspensions but not others. DEPRECATED. whether to bill the unsuspend package immediately ('') or to wait until the customer's next invoice ('Y'). -=item unused_credit - 'Y' or ''. For suspension reasons only (for now). +=item unused_credit - 'Y' or ''. For suspension or cancellation reasons. If enabled, the customer will be credited for their remaining time on suspension. @@ -125,23 +125,30 @@ sub check { ; return $error if $error; - if ( $self->reasontype->class eq 'S' ) { + my $class = $self->reasontype->class; + + if ( $class eq 'S' ) { $error = $self->ut_numbern('unsuspend_pkgpart') || $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 feepart + foreach (qw(unsuspend_pkgpart unsuspend_hold feepart fee_on_unsuspend fee_hold)) { $self->set($_ => ''); } } + if ( $class eq 'S' or $class eq 'C' ) { + $error = $self->ut_flag('unused_credit'); + } else { + $self->set('unused_credit', ''); + } + $self->SUPER::check; } |