[freeside-commits] freeside/FS/FS cust_bill.pm,1.240,1.241

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv5470

Modified Files:
	cust_bill.pm 
Log Message:
show 60 chars on typeset invoices but only 32 on plaintext, RT#3905

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- cust_bill.pm	15 Apr 2009 02:15:45 -0000	1.240
+++ cust_bill.pm	15 Apr 2009 02:29:36 -0000	1.241
@@ -2280,7 +2280,7 @@
   
     # credits
     my $credittotal = 0;
-    foreach my $credit ( $self->_items_credits ) {
+    foreach my $credit ( $self->_items_credits('trim_len'=>60) ) {
 
       my $total;
       $total->{'total_item'} = &$escape_function($credit->{'description'});
@@ -2302,10 +2302,13 @@
         push @total_items, $total;
       }
 
-      push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
-
     }
     $invoice_data{'credittotal'} = sprintf('%.2f', $credittotal);
+
+    #credits (again)
+    foreach my $credit ( $self->_items_credits('trim_len'=>32) ) {
+      push @buf, [ $credit->{'description'}, $money_char.$credit->{'amount'} ];
+    }
   
     # payments
     my $paymenttotal = 0;
@@ -2918,7 +2921,8 @@
 }
 
 sub _items_credits {
-  my $self = shift;
+  my( $self, %opt ) = @_;
+  my $trim_len = $opt{'trim_len'} || 60;
 
   my @b;
   #credits
@@ -2926,7 +2930,7 @@
 
     #something more elaborate if $_->amount ne $_->cust_credit->credited ?
 
-    my $reason = substr($_->cust_credit->reason,0,32);
+    my $reason = substr($_->cust_credit->reason, 0, $trim_len);
     $reason .= '...' if length($reason) < length($_->cust_credit->reason);
     $reason = " ($reason) " if $reason;