X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_pay.html;h=2f23d9e1451d952f81bc93576f40b6f85489d36f;hb=624b2d44625f69d71175c3348cae635d580c890b;hp=4037d3525f777f37f6326bb9a16a0bdbfbb13d3f;hpb=64d25e2c55bb46c56108ab56c141e0feb69f6540;p=freeside.git
diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html
index 4037d3525..2f23d9e14 100644
--- a/httemplate/view/cust_pay.html
+++ b/httemplate/view/cust_pay.html
@@ -1,25 +1,25 @@
% if ( $link eq 'popup' ) {
- <% include('/elements/header-popup.html', "Payment Receipt" ) %>
+ <% include('/elements/header-popup.html', "$thing Receipt" ) %>
Print
% } 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 (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
)
%>
% } 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,
))
%>
@@ -48,6 +48,20 @@
<% time2str"%a %b %o, %Y %r", $cust_pay->_date %> |
+% if ( $void ) {
+
+
+ Void Date |
+ <% time2str"%a %b %o, %Y %r", $cust_pay->void_date %> |
+
+
+%#
+%# Void reason |
+%# <% $cust_pay->reason %> |
+%#
+
+% }
+
Amount |
<% $money_char. $cust_pay->paid %> |
@@ -79,6 +93,15 @@
% }
+% if ( $conf->exists('pkg-balances') && $cust_pay->pkgnum ) {
+% my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_pay->pkgnum } );
+
+ For package |
+ <% $cust_pkg->pkg_label_long %> |
+
+
+% }
+
% if ( $link eq 'print' ) {
@@ -101,7 +124,8 @@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $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;
@@ -111,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;