bundled package presentation improvements

[freeside.git] / FS / FS / cust_bill_pkg.pm

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index d15200e..638e707 100644 (file)
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -55,7 +55,7 @@ supported:
 
 =item edate - ending date of recurring fee
 
-=item itemdesc - Line item description (currentlty used only when pkgnum is 0 or -1)
+=item itemdesc - Line item description (overrides normal package description)
 
 =item quantity - If not set, defaults to 1
 
@@ -116,10 +116,9 @@ sub insert {
 
   foreach my $detail ( @{$self->get('details')} ) {
     my $cust_bill_pkg_detail = new FS::cust_bill_pkg_detail {
-      'pkgnum' => $self->pkgnum,
-      'invnum' => $self->invnum,
-      'format' => (ref($detail) ? $detail->[0] : '' ),
-      'detail' => (ref($detail) ? $detail->[1] : $detail ),
+      'billpkgnum' => $self->billpkgnum,
+      'format'     => (ref($detail) ? $detail->[0] : '' ),
+      'detail'     => (ref($detail) ? $detail->[1] : $detail ),
     };
     $error = $cust_bill_pkg_detail->insert;
     if ( $error ) {
@@ -268,20 +267,33 @@ sub details {
 
   $format_sub = sub { my $detail = shift;
                       $csv->parse($detail) or return "can't parse $detail";
-                      join(' & ', map { '\small{'. &$escape_function($_). '}' }
-                                  $csv->fields );
+                      #join(' & ', map { '\small{'. &$escape_function($_). '}' }
+                      #            $csv->fields );
+                      my $result = '';
+                      my $column = 1;
+                      foreach ($csv->fields) {
+                        $result .= ' & ' if $column > 1;
+                        if ($column > 6) {                     # KLUDGE ALERT!
+                          $result .= '\multicolumn{1}{l}{\small{'.
+                                     &$escape_function($_). '}}';
+                        }else{
+                          $result .= '\small{'.  &$escape_function($_). '}';
+                        }
+                        $column++;
+                      }
+                      $result;
                     }
     if $format eq 'latex';
 
+  $format_sub = $opt{format_function} if $opt{format_function};
+
   map { ( $_->format eq 'C'
           ? &{$format_sub}( $_->detail )
           : &{$escape_function}( $_->detail )
         )
       }
     qsearch ({ 'table'    => 'cust_bill_pkg_detail',
-               'hashref'  => { 'pkgnum' => $self->pkgnum,
-                               'invnum' => $self->invnum,
-                             },
+               'hashref'  => { 'billpkgnum' => $self->billpkgnum },
                'order_by' => 'ORDER BY detailnum',
             });
     #qsearch ( 'cust_bill_pkg_detail', { 'lineitemnum' => $self->lineitemnum });
@@ -300,7 +312,7 @@ sub desc {
   my $self = shift;
 
   if ( $self->pkgnum > 0 ) {
-    $self->part_pkg->pkg;
+    $self->itemdesc || $self->part_pkg->pkg;
   } else {
     $self->itemdesc || 'Tax';
   }