diff options
author | ivan <ivan> | 2009-10-23 01:41:31 +0000 |
---|---|---|
committer | ivan <ivan> | 2009-10-23 01:41:31 +0000 |
commit | 746f6813f5ab28b249ac7abf124298591bb43b7d (patch) | |
tree | fdb0e36e1289d5968954fa825fb36e3015b602dc | |
parent | 7b214537055fd8260b30f25036d3bf701cdf7167 (diff) |
add cust_bill-consolidate_services config to collapse multiple phone numbers (or whatever) into as few lines as possible on invoices, RT#5223
-rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
-rw-r--r-- | FS/FS/cust_pkg.pm | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 13bec18b1..688879fa2 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2901,6 +2901,13 @@ worry that config_items is freeside-specific and icky. }, { + 'key' => 'cust_bill-consolidate_services', + 'section' => 'billing', + 'description' => 'Consolidate service display into fewer lines on invoices rather than one per service.', + 'type' => 'checkbox', + }, + + { 'key' => 'suspend_email_admin', 'section' => '', 'description' => 'Destination admin email address to enable suspension notices', diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index e839eb93e..fc44540a1 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -1881,7 +1881,18 @@ sub _labels_short { if ( $num > $max_same_services ) { push @labels, "$label ($num)"; } else { - push @labels, map { "$label: $_" } @values; + if ( $conf->exists('cust_bill-consolidate_services') ) { + # push @labels, "$label: ". join(', ', @values); + while ( @values ) { + my $detail = "$label: "; + $detail .= shift(@values). ', ' + while @values && length($detail.$values[0]) < 78; + $detail =~ s/, $//; + push @labels, $detail; + } + } else { + push @labels, map { "$label: $_" } @values; + } } } |