From e5731af379db55e629ad3ea4cd14ea53554e0595 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 16 Jan 2014 01:46:50 -0800 Subject: [PATCH] don't allow a start date for packages definitions with prorate_defer_bill, RT#25650 --- FS/FS/part_pkg/flat.pm | 10 +++++++++- httemplate/misc/cust-part_pkg.cgi | 12 +++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index ee5e84710..9bd225d1b 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -245,7 +245,15 @@ sub is_free_options { sub is_prepaid { 0; } #no, we're postpaid -sub can_start_date { ! shift->option('start_1st', 1) } +sub can_start_date { + my $self = shift; + my %opt = @_; + + ! $self->option('start_1st', 1) && ( ! $self->option('sync_bill_date',1) + || ! $self->option('prorate_defer_bill',1) + || ! $opt{'num_ncancelled_pkgs'} + ); +} sub can_discount { 1; } diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi index f6e91d93b..9850fb017 100644 --- a/httemplate/misc/cust-part_pkg.cgi +++ b/httemplate/misc/cust-part_pkg.cgi @@ -31,6 +31,14 @@ my $default_start_date = $conf->exists('order_pkg-no_start_date') ? '' : $cust_main->next_bill_date; +#num_billing_pkgs may be slightly better (will allow you to fill in a start +# date in the weird edge case where you're using sync_next_bill and +# prorate_defer_bill in flat.pm and there's one-time charges hanging around +# for this customer but no active ones) +#but we don't have an easy method for that, and definitely don't want to pull +# all package objects +my $num_ncancelled_pkgs = $cust_main ? $cust_main->num_ncancelled_pkgs : 0; + my @return = map { my $start_date = $_->delay_start_date || $default_start_date; @@ -39,7 +47,9 @@ my @return = map { ( $_->pkgpart, $_->pkg_comment, $_->can_discount, - $_->can_start_date, + $_->can_start_date( + num_ncancelled_pkgs => $num_ncancelled_pkgs, + ), $start_date, ) } -- 2.11.0