correct last_bill problems with $0 invoice (non-existant) edge cases

[freeside.git] / httemplate / edit / REAL_cust_pkg.cgi

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index 8ea0e08..e44acba 100755 (executable)
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -1,5 +1,6 @@
+<!-- mason kludge -->
 <%
-# <!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
+# <!-- $Id: REAL_cust_pkg.cgi,v 1.5 2003-04-01 01:22:24 ivan Exp $ -->
 
 my $error ='';
 my $pkgnum = '';
@@ -44,7 +45,7 @@ print '<FORM NAME="formname" ACTION="process/REAL_cust_pkg.cgi" METHOD="POST">',
 print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: $error</FONT>!
   if $error;
 
-print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
+print ntable("#cccccc",2),
       '<TR><TD ALIGN="right">Package number</TD><TD BGCOLOR="#ffffff">',
       $pkgnum, '</TD></TR>',
       '<TR><TD ALIGN="right">Package</TD><TD BGCOLOR="#ffffff">',
@@ -55,26 +56,41 @@ print &ntable("#cccccc"), '<TR><TD>', &ntable("#cccccc",2),
       $otaker,  '</TD></TR>',
       '<TR><TD ALIGN="right">Setup date</TD><TD>'.
       '<INPUT TYPE="text" NAME="setup" SIZE=32 VALUE="',
-      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>',
-      '<TR><TD ALIGN="right">Next bill date</TD><TD>',
+      ( $setup ? time2str("%c %z (%Z)",$setup) : "" ), '"></TD></TR>';
+
+print '<TR><TD ALIGN="right">Last bill date</TD><TD>',
+      '<INPUT TYPE="text" NAME="last_bill" SIZE=32 VALUE="',
+      ( $cust_pkg->last_bill
+        ? time2str("%c %z (%Z)", $cust_pkg->last_bill)
+        : ""                                          ),
+      '"></TD></TR>'
+  if $cust_pkg->dbdef_table->column('last_bill');
+
+print '<TR><TD ALIGN="right">Next bill date</TD><TD>',
       '<INPUT TYPE="text" NAME="bill" SIZE=32 VALUE="',
-      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>',
-;
+      ( $bill ? time2str("%c %z (%Z)",$bill) : "" ), '"></TD></TR>';
 
 print '<TR><TD ALIGN="right">Suspension date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$susp), '</TD></TR>'
   if $susp;
 
-print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
-       time2str("%D",$expire), '</TD></TR>'
-  if $expire;
+#print '<TR><TD ALIGN="right">Expiration date</TD><TD BGCOLOR="#ffffff">',
+#       time2str("%D",$expire), '</TD></TR>'
+#  if $expire;
+print '<TR><TD ALIGN="right">Expiration date'.
+      '</TD><TD>',
+      '<INPUT TYPE="text" NAME="expire" SIZE=32 VALUE="',
+      ( $expire ? time2str("%c %z (%Z)",$expire) : "" ), '">'.
+      '<BR><FONT SIZE=-1>(will <b>cancel</b> this package'.
+      ' when the date is reached)</FONT>'.
+      '</TD></TR>';
 
 print '<TR><TD ALIGN="right">Cancellation date</TD><TD BGCOLOR="#ffffff">',
        time2str("%D",$cancel), '</TD></TR>'
   if $cancel;
 
 %>
-</TABLE></TD></TR></TABLE>'.
+</TABLE>
 <BR><INPUT TYPE="submit" VALUE="Apply Changes">
 </FORM>
 </BODY>