X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_pay.html;h=ba4cfdafc2f18a10e9a33d1ea2854935191c19fd;hb=420d984948f76376ec18a731031926e9e769f9b0;hp=c9b2d51b518c0138c86775140f38c12344c11dba;hpb=8ef00c68688492b2afa3dde8d3d467f89f238c40;p=freeside.git
diff --git a/httemplate/view/cust_pay.html b/httemplate/view/cust_pay.html
index c9b2d51b5..ba4cfdafc 100644
--- a/httemplate/view/cust_pay.html
+++ b/httemplate/view/cust_pay.html
@@ -3,8 +3,10 @@
<& /elements/header-popup.html, mt("$thing Receipt") &>
% } elsif ( $link eq 'print' ) {
@@ -77,7 +79,7 @@
<% $cust_pay->payby_name %> #<% $cust_pay->paymask %> |
-% if ( $cust_pay->payby =~ /^(CARD|CHEK|LECB)$/ && $cust_pay->paybatch ) {
+% if ( $cust_pay->payby =~ /^(CARD|CHEK|LECB)$/ && $cust_pay->processor ) {
<% mt('Processor') |h %> |
@@ -86,16 +88,39 @@
<% mt('Authorization #') |h %> |
- <% $cust_pay->authorization %> |
+ <% $cust_pay->auth %> |
-% if ( $cust_pay->order_number ) {
-
- <% mt('Order #') |h %> |
- <% $cust_pay->order_number %> |
-
-% }
+% }
+% # API allows setting this for any payby
+% if ( $cust_pay->order_number ) {
+
+ <% mt('Order #') |h %> |
+ <% $cust_pay->order_number %> |
+
+% }
+
+% if ( $cust_pay->payby eq 'CASH' && $cust_pay->payinfo ) {
+
+ <% mt('Bank') |h %> |
+ <% $cust_pay->bank %> |
+
+
+
+ <% mt('Teller #') |h %> |
+ <% $cust_pay->teller %> |
+
+
+
+ <% mt('Depositor') |h %> |
+ <% $cust_pay->depositor %> |
+
+
+
+ <% mt('Account #') |h %> |
+ <% $cust_pay->account %> |
+
% }
% if ( $conf->exists('pkg-balances') && $cust_pay->pkgnum ) {
@@ -134,8 +159,8 @@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $curuser->access_right('View invoices') #remove this in 1.9 EVENTUALLY
- || $curuser->access_right('View customer payments');
+ unless $curuser->access_right('View invoices') #remove this in 2.5 (2.7?)
+ || $curuser->access_right('View payments');
$cgi->param('paynum') =~ /^(\d+)$/ or die "no paynum";
my $paynum = $1;
@@ -158,11 +183,13 @@ my $cust_pay = qsearchs({
});
die "$thing #$paynum not found!" unless $cust_pay;
+my $cust_main = $cust_pay->cust_main;
+
my $pr_link = "${p}view/cust_pay.html?link=print;paynum=$paynum;void=$void";
my $email_link = "${p}view/cust_pay.html?link=email;paynum=$paynum;void=$void";
my $custnum = $cust_pay->custnum;
-my $display_custnum = $cust_pay->cust_main->display_custnum;
+my $display_custnum = $cust_main->display_custnum;
my $conf = new FS::Conf;
@@ -173,8 +200,9 @@ tie my %payby, 'Tie::IxHash', FS::payby->payby2longname;
my $email_error;
if ( $link eq 'email' ) {
- my $email_error = $cust_pay->send_receipt(
- 'manual' => 1,
+ $email_error = $cust_pay->send_receipt(
+ 'manual' => 1,
+ 'cust_main' => $cust_main,
);
warn "can't send payment receipt/statement: $email_error" if $email_error;