projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4.x-style
[freeside.git]
/
httemplate
/
view
/
cust_pay.html
diff --git
a/httemplate/view/cust_pay.html
b/httemplate/view/cust_pay.html
index
76a2488
..
ba4cfda
100644
(file)
--- a/
httemplate/view/cust_pay.html
+++ b/
httemplate/view/cust_pay.html
@@
-3,8
+3,10
@@
<& /elements/header-popup.html, mt("$thing Receipt") &>
<div align="center">
<& /elements/header-popup.html, mt("$thing Receipt") &>
<div align="center">
- <A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A> |
- <A HREF="javascript:self.location = '<% $email_link %>'"><% mt('Re-email') |h %></A>
+ <A HREF="javascript:self.parent.location = '<% $pr_link %>'"><% mt('Print') |h %></A>
+% if ( $cust_main->invoicing_list_emailonly ) {
+ | <A HREF="javascript:self.location = '<% $email_link %>'"><% mt('Re-email') |h %></A>
+% }
</div><BR>
% } elsif ( $link eq 'print' ) {
</div><BR>
% } elsif ( $link eq 'print' ) {
@@
-89,13
+91,14
@@
<TD BGCOLOR="#FFFFFF"><B><% $cust_pay->auth %></B></TD>
</TR>
<TD BGCOLOR="#FFFFFF"><B><% $cust_pay->auth %></B></TD>
</TR>
-% if ( $cust_pay->order_number ) {
- <TR>
- <TD ALIGN="right"><% mt('Order #') |h %></TD>
- <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->order_number %></B></TD>
- </TR>
-% }
+% }
+% # API allows setting this for any payby
+% if ( $cust_pay->order_number ) {
+ <TR>
+ <TD ALIGN="right"><% mt('Order #') |h %></TD>
+ <TD BGCOLOR="#FFFFFF"><B><% $cust_pay->order_number %></B></TD>
+ </TR>
% }
% if ( $cust_pay->payby eq 'CASH' && $cust_pay->payinfo ) {
% }
% if ( $cust_pay->payby eq 'CASH' && $cust_pay->payinfo ) {
@@
-180,11
+183,13
@@
my $cust_pay = qsearchs({
});
die "$thing #$paynum not found!" unless $cust_pay;
});
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 $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;
my $conf = new FS::Conf;
@@
-195,8
+200,9
@@
tie my %payby, 'Tie::IxHash', FS::payby->payby2longname;
my $email_error;
if ( $link eq 'email' ) {
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;
);
warn "can't send payment receipt/statement: $email_error" if $email_error;