projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was generated by cvs2svn to compensate for changes in r11022,
[freeside.git]
/
httemplate
/
view
/
cust_pay.html
diff --git
a/httemplate/view/cust_pay.html
b/httemplate/view/cust_pay.html
index
2f23d9e
..
1408b3d
100644
(file)
--- a/
httemplate/view/cust_pay.html
+++ b/
httemplate/view/cust_pay.html
@@
-2,7
+2,10
@@
<% include('/elements/header-popup.html', "$thing Receipt" ) %>
<% include('/elements/header-popup.html', "$thing Receipt" ) %>
- <CENTER><A HREF="javascript:self.parent.location = '<% $pr_link %>'">Print</A></CENTER><BR>
+ <div align="center">
+ <A HREF="javascript:self.parent.location = '<% $pr_link %>'">Print</A> |
+ <A HREF="javascript:self.location = '<% $email_link %>'">Re-email</A>
+ </div><BR>
% } elsif ( $link eq 'print' ) {
% } elsif ( $link eq 'print' ) {
@@
-15,7
+18,12
@@
)
%>
<BR><BR>
)
%>
<BR><BR>
-
+% } elsif ( $link eq 'email' ) {
+% if ( $email_error ) {
+ <% include('/elements/header-popup.html', "Error re-emailing receipt: $email_error" ) %>
+% } else {
+ <% include('/elements/header-popup.html', "Re-emailed receipt" ) %>
+% }
% } else {
<% include('/elements/header.html', "$thing Receipt", menubar(
% } else {
<% include('/elements/header.html', "$thing Receipt", menubar(
@@
-26,7
+34,7
@@
% }
% }
-% unless ($link
eq 'popup'
) {
+% unless ($link
=~ /^(popup|email)$/
) {
<% include('/elements/small_custview.html',
$custnum,
scalar($conf->config('countrydefault')),
<% include('/elements/small_custview.html',
$custnum,
scalar($conf->config('countrydefault')),
@@
-110,9
+118,14
@@
window.print();
</SCRIPT>
window.print();
</SCRIPT>
-% }
+% }
elsif ( $link eq 'email' ) {
-% if ( $link =~ /^(popup|print)$/ ) {
+ <SCRIPT TYPE="text/javascript">
+ window.top.location.reload();
+ </SCRIPT>
+
+% }
+% if ( $link =~ /^(popup|print|email)$/ ) {
</BODY>
</HTML>
% } else {
</BODY>
</HTML>
% } else {
@@
-149,6
+162,7
@@
my $cust_pay = qsearchs({
die "$thing #$paynum not found!" unless $cust_pay;
my $pr_link = "${p}view/cust_pay.html?link=print;paynum=$paynum;void=$void";
die "$thing #$paynum not found!" unless $cust_pay;
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 $custnum = $cust_pay->custnum;
my $display_custnum = $cust_pay->cust_main->display_custnum;
@@
-159,4
+173,14
@@
my $money_char = $conf->config('money_char') || '$';
tie my %payby, 'Tie::IxHash', FS::payby->payby2longname;
tie my %payby, 'Tie::IxHash', FS::payby->payby2longname;
+my $email_error;
+
+if ( $link eq 'email' ) {
+ my $email_error = $cust_pay->send_receipt(
+ 'manual' => 1,
+ );
+
+ warn "can't send payment receipt/statement: $email_error" if $email_error;
+}
+
</%init>
</%init>