get rid of the godawful halfass "invoice" on the post payment screen when posting against a specific invoice, replace with having useless "Auto-apply to invoices" box actually show the payment will be applied to one invoice only... closes: Bug#1241

1 files changed, 11 insertions, 39 deletions

diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 90f1f0026..c0a679b03 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -36,9 +36,12 @@ if ( $cgi->param('error') ) {
 
 my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 
+my $title = 'Post payment';
+$title .= " against Invoice #$linknum" if $link eq 'invnum';
+
 %>
 
-<%=  header("Post payment", '') %>
+<%=  header($title, '') %>
 
 <% if ( $cgi->param('error') ) { %>
 <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
@@ -61,47 +64,9 @@ my $paybatch = "webui-$_date-$$-". rand() * 2**32;
 my $money_char = $conf->config('money_char') || '$';
 my $custnum;
 if ( $link eq 'invnum' ) {
-
   my $cust_bill = qsearchs('cust_bill', { 'invnum' => $linknum } )
     or die "unknown invnum $linknum";
-  print "Invoice #<B>$linknum</B>". ntable("#cccccc",2).
-        '<TR><TD ALIGN="right">Date</TD><TD BGCOLOR="#ffffff">'.
-        time2str("%D", $cust_bill->_date). '</TD></TR>'.
-        '<TR><TD ALIGN="right" VALIGN="top">Items</TD><TD BGCOLOR="#ffffff">';
-  foreach ( $cust_bill->cust_bill_pkg ) { #false laziness with FS::cust_bill
-    if ( $_->pkgnum ) {
-
-      my($cust_pkg)=qsearchs('cust_pkg', { 'pkgnum', $_->pkgnum } );
-      my($part_pkg)=qsearchs('part_pkg',{'pkgpart'=>$cust_pkg->pkgpart});
-      my($pkg)=$part_pkg->pkg;
-
-      if ( $_->setup != 0 ) {
-        print "$pkg Setup<BR>"; # $money_char. sprintf("%10.2f",$_->setup);
-        print join('<BR>',
-          map { "  ". $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-      if ( $_->recur != 0 ) {
-        print
-          "$pkg (" . time2str("%x",$_->sdate) . " - " .
-                                time2str("%x",$_->edate) . ")<BR>";
-          #$money_char. sprintf("%10.2f",$_->recur)
-        print join('<BR>',
-          map { '--->'. $_->[0]. ": ". $_->[1] } $cust_pkg->labels
-        ). '<BR>';
-      }
-
-    } else { #pkgnum Tax
-      print "Tax<BR>" # $money_char. sprintf("%10.2f",$_->setup)
-        if $_->setup != 0;
-    }
-
-  }
-  print '</TD></TR></TABLE><BR><BR>';
-
   $custnum = $cust_bill->custnum;
-
 } elsif ( $link eq 'custnum' ) {
   $custnum = $linknum;
 }
@@ -138,9 +103,16 @@ Payment
   <TD ALIGN="right">Check #</TD>
   <TD COLSPAN=2><INPUT TYPE="text" NAME="payinfo" VALUE="<%= $payinfo %>" SIZE=10></TD>
 </TR>
+
 <TR>
+<% if ( $link eq 'custnum' ) { %>
   <TD ALIGN="right">Auto-apply<BR>to invoices</TD>
   <TD COLSPAN=2><SELECT NAME="apply"><OPTION VALUE="yes" SELECTED>yes<OPTION>no</SELECT></TD>
+<% } elsif ( $link eq 'invnum' ) { %>
+  <TD ALIGN="right">Apply to</TD>
+  <TD COLSPAN=2 BGCOLOR="#ffffff">Invoice #<B><%= $linknum %></B> only</TD>
+  <INPUT TYPE="hidden" NAME="apply" VALUE="no">
+<% } %>
 </TR>
 
 </TABLE>