X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_pay.html;h=2f23d9e1451d952f81bc93576f40b6f85489d36f;hp=2d1a22b0796a9c0314879b6a1e21da680cb6d998;hb=74a3083375ccc3a0dc8b74f9b39392989d088656;hpb=9ed8adbf1ab5aba8181903e9c262f2b69dba6cbc

diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html
index 2d1a22b07..2f23d9e14 100644
--- a/httemplate/view/cust_pay.html
+++ b/httemplate/view/cust_pay.html
@@ -1,17 +1,25 @@
 % if ( $link eq 'popup' ) { 
 
-  <% include('/elements/header-popup.html', "Payment Receipt" ) %>
+  <% include('/elements/header-popup.html', "$thing Receipt" ) %>
 
   <CENTER><A HREF="javascript:self.parent.location = '<% $pr_link %>'">Print</A></CENTER><BR>
 
 % } elsif ( $link eq 'print' ) { 
 
-  <% include('/elements/header-popup.html', "Payment Receipt" ) %>
+  <% include('/elements/header-popup.html', "$thing Receipt" ) %>
+  
+% #it would be nice if the menubar could be hidden for print, but better to
+% # have it available than not, otherwise the user winds up at a dead end
+  <% menubar(
+       "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
+     )
+  %>
+  <BR><BR>
 
 % } else { 
 
-  <% include('/elements/header.html', "Payment Receipt", menubar(
-       "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+  <% include('/elements/header.html', "$thing Receipt", menubar(
+       "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
        'Print receipt' => $pr_link,
      ))
   %>
@@ -40,6 +48,20 @@
   <TD BGCOLOR="#FFFFFF"><B><% time2str"%a&nbsp;%b&nbsp;%o,&nbsp;%Y&nbsp;%r", $cust_pay->_date %></B></TD>
 </TR>
 
+% if ( $void ) {
+
+  <TR>
+    <TD ALIGN="right">Void Date</TD>
+    <TD BGCOLOR="#FFFFFF"><B><% time2str"%a&nbsp;%b&nbsp;%o,&nbsp;%Y&nbsp;%r", $cust_pay->void_date %></B></TD>
+  </TR>
+
+%#  <TR>
+%#    <TD ALIGN="right">Void reason</TD>
+%#    <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->reason %></B></TD>
+%#  </TR>
+
+% }
+
 <TR>
   <TD ALIGN="right">Amount</TD>
   <TD BGCOLOR="#FFFFFF"><B><% $money_char. $cust_pay->paid %></B></TD>
@@ -71,6 +93,15 @@
 
 % }
 
+% if ( $conf->exists('pkg-balances') && $cust_pay->pkgnum ) {
+%   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_pay->pkgnum } );
+    <TR>
+      <TD ALIGN="right">For package</TD>
+      <TD BGCOLOR="#FFFFFF"><B><% $cust_pkg->pkg_label_long %></B></TD>
+    </TR>
+
+% }
+
 </TABLE>
 
 % if ( $link eq 'print' ) {
@@ -93,8 +124,8 @@
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 die "access denied"
-  unless $curuser->access_right('View invoices') #remove this in 1.9
-      || $curuser->access_right('View customer payments');
+  unless $curuser->access_right('View invoices') #remove this in 1.9 EVENTUALLY
+  || $curuser->access_right('View customer payments');
 
 $cgi->param('paynum') =~ /^(\d+)$/ or die "no paynum";
 my $paynum = $1;
@@ -104,18 +135,23 @@ if ( $cgi->param('link') =~ /^(\w+)$/ ) {
   $link = $1;
 }
 
+my $void = $cgi->param('void') ? 1 : 0;
+my $thing = $void ? 'Voided Payment' : 'Payment';
+my $table = $void ? 'cust_pay_void'  : 'cust_pay';
+
 my $cust_pay = qsearchs({
-  'select'    => 'cust_pay.*',
-  'table'     => 'cust_pay',
+  'select'    => "$table.*",
+  'table'     => $table,
   'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
   'hashref'   => { 'paynum' => $paynum },
   'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
 });
-die "Payment #$paynum not found!" unless $cust_pay;
+die "$thing #$paynum not found!" unless $cust_pay;
 
-my $pr_link = "${p}view/cust_pay.html?link=print;paynum=$paynum";
+my $pr_link = "${p}view/cust_pay.html?link=print;paynum=$paynum;void=$void";
 
 my $custnum = $cust_pay->custnum;
+my $display_custnum = $cust_pay->cust_main->display_custnum;
 
 my $conf = new FS::Conf;