invoices show line items for each service in a package (see the label method

of FS::cust_svc)

2 files changed, 39 insertions, 11 deletions

diff --git a/site_perl/cust_bill.pm b/site_perl/cust_bill.pm
index 6d87b1bb3..0e87755ac 100644
--- a/site_perl/cust_bill.pm
+++ b/site_perl/cust_bill.pm
@@ -308,13 +308,19 @@ sub print_text {
       my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
       my($pkg)=$part_pkg->pkg;
 
-      push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) )
-        if $_->setup != 0;
-      push @buf, (
-        "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                              time2str("%x",$_->edate) . ")",
-        '$' . sprintf("%10.2f",$_->recur)
-      ) if $_->recur != 0;
+      if ( $_->setup != 0 ) {
+        push @buf, ( "$pkg Setup",'$' . sprintf("%10.2f",$_->setup) );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
+
+      if ( $_->recur != 0 ) {
+        push @buf, (
+          "$pkg (" . time2str("%x",$_->sdate) . " - " .
+                                time2str("%x",$_->edate) . ")",
+          '$' . sprintf("%10.2f",$_->recur)
+        );
+        push @buf, map { "  ". $_->[0]. ": ". $_->[1], '' } $cust_pkg->labels;
+      }
 
     } else { #pkgnum Tax
       push @buf,("Tax",'$' . sprintf("%10.2f",$_->setup) ) 
@@ -421,7 +427,7 @@ END
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.6 1999-01-25 12:26:07 ivan Exp $
+$Id: cust_bill.pm,v 1.7 1999-02-09 09:55:05 ivan Exp $
 
 =head1 BUGS
 
@@ -449,7 +455,11 @@ charges can be negative ivan@sisd.com 98-jul-13
 pod, ingegrate with FS::Invoice ivan@sisd.com 98-sep-20
 
 $Log: cust_bill.pm,v $
-Revision 1.6  1999-01-25 12:26:07  ivan
+Revision 1.7  1999-02-09 09:55:05  ivan
+invoices show line items for each service in a package (see the label method
+of FS::cust_svc)
+
+Revision 1.6  1999/01/25 12:26:07  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1999/01/18 21:58:03  ivan
diff --git a/site_perl/cust_pkg.pm b/site_perl/cust_pkg.pm
index 039b65451..1f5a873d5 100644
--- a/site_perl/cust_pkg.pm
+++ b/site_perl/cust_pkg.pm
@@ -44,6 +44,8 @@ FS::cust_pkg - Object methods for cust_pkg objects
 
   $part_pkg = $record->part_pkg;
 
+  @labels = $record->labels;
+
   $error = FS::cust_pkg::order( $custnum, \@pkgparts );
   $error = FS::cust_pkg::order( $custnum, \@pkgparts, \@remove_pkgnums ] );
 
@@ -339,6 +341,18 @@ sub part_pkg {
   qsearchs( 'part_pkg', { 'pkgpart' => $self->pkgpart } );
 }
 
+=item labels
+
+Returns a list of lists, calling the label method for all services
+(see L<FS::cust_svc>) of this billing item.
+
+=cut
+
+sub labels {
+  my $self = shift;
+  map { [ $_->label ] } qsearch ( 'cust_svc', { 'pkgnum' => $self->pkgnum } );
+}
+
 =back
 
 =head1 SUBROUTINES
@@ -463,7 +477,7 @@ sub order {
 
 =head1 VERSION
 
-$Id: cust_pkg.pm,v 1.6 1999-01-25 12:26:12 ivan Exp $
+$Id: cust_pkg.pm,v 1.7 1999-02-09 09:55:06 ivan Exp $
 
 =head1 BUGS
 
@@ -494,7 +508,11 @@ fixed for new agent->agent_type->type_pkgs in &order ivan@sisd.com 98-mar-7
 pod ivan@sisd.com 98-sep-21
 
 $Log: cust_pkg.pm,v $
-Revision 1.6  1999-01-25 12:26:12  ivan
+Revision 1.7  1999-02-09 09:55:06  ivan
+invoices show line items for each service in a package (see the label method
+of FS::cust_svc)
+
+Revision 1.6  1999/01/25 12:26:12  ivan
 yet more mod_perl stuff
 
 Revision 1.5  1999/01/18 21:58:07  ivan