[freeside-commits] freeside/httemplate/view/cust_main/payment_history invoice.html, 1.5, 1.5.2.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history
In directory wavetail.420.am:/tmp/cvs-serv4030/httemplate/view/cust_main/payment_history

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	invoice.html 
Log Message:
promised payment date for invoices, #13554

Index: invoice.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/invoice.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -w -d -r1.5 -r1.5.2.1
--- invoice.html	18 May 2011 01:06:28 -0000	1.5
+++ invoice.html	8 Dec 2011 21:13:58 -0000	1.5.2.1
@@ -1,4 +1,4 @@
-<% $link %><% $invoice %><% $link ? '</A>' : '' %><% $delete %><% $events %>
+<% $link %><% $invoice %><% $link ? '</A>' : '' %><% $delete %><% $under %>
 <%init>
 
 my( $cust_bill, %opt ) = @_;
@@ -8,10 +8,17 @@
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $invoice = emt("Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed);
+
+my $under = '';
+if ( $cust_bill->owed > 0 ) {
 $invoice = '<B><FONT SIZE="+1" COLOR="#FF0000">' .
     emt("Open Invoice #[_1] (Balance [_2])",$cust_bill->display_invnum,$cust_bill->owed) .
-    '</FONT></B>'
-if ( $cust_bill->owed > 0 );
+    '</FONT></B>';
+  if ( $cust_bill->promised_date ) {
+    $under .= '<BR>'. emt('Payment promised on [_1]',
+        time2str($opt{'date_format'}, $cust_bill->promised_date));
+  }
+} #if $cust_bill->owed
 
 my $invnum = $cust_bill->invnum;
 
@@ -34,10 +41,10 @@
           || $curuser->access_right('View customer billing events')
         )
    ) {
-  $events =
-    qq!<BR><FONT SIZE="-1"><A HREF="${p}search/cust_event.html?invnum=$invnum!.
-    '">( '.emt('View invoice events').' )</A></FONT>';
+  $under .=
+    qq!<BR><A HREF="${p}search/cust_event.html?invnum=$invnum">( !.
+      emt('View invoice events').' )</A>';
 }
-#
+$under = '<FONT SIZE="-1">'.$under.'</FONT>' if length($under);
 
 </%init>