From 7070356f09267ce78440bff9f36d7ce6cfcd1802 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 16 Jan 2014 01:46:47 -0800 Subject: don't allow a start date for packages definitions with prorate_defer_bill, RT#25650 --- httemplate/misc/cust-part_pkg.cgi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'httemplate/misc/cust-part_pkg.cgi') diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi index 54973bc19..afe8e4249 100644 --- a/httemplate/misc/cust-part_pkg.cgi +++ b/httemplate/misc/cust-part_pkg.cgi @@ -39,6 +39,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; @@ -47,7 +55,9 @@ my @return = map { ( $_->pkgpart, $_->pkg_comment, $_->can_discount, - $_->can_start_date, + $_->can_start_date( + num_ncancelled_pkgs => $num_ncancelled_pkgs, + ), $start_date, ) } -- cgit v1.2.1