X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fsend-invoice.cgi;h=dea081020ed46b1abfb5a7e01ee90559c7eaff7c;hb=02a46bc015742668a7f6d9336a190fec3141ff56;hp=08dd0e01c823ae99c0710674e0fd94c3502fae59;hpb=fe4515eb37d76849dd08c62782d86bc7ba311dcd;p=freeside.git
diff --git a/httemplate/misc/send-invoice.cgi b/httemplate/misc/send-invoice.cgi
index 08dd0e01c..dea081020 100644
--- a/httemplate/misc/send-invoice.cgi
+++ b/httemplate/misc/send-invoice.cgi
@@ -1,4 +1,16 @@
+% if ($cgi->param('popup')) {
+% my $title = $error ? 'Error sending invoice email' : 'Invoice email sent';
+<% include('/elements/header-popup.html', $title ) %>
+
+<% $error %>
+
+
+<% include('/elements/footer.html') %>
+% } elsif ( $error ) {
+% errorpage($error);
+% } else {
<% $cgi->redirect("${p}view/cust_main.cgi?$custnum") %>
+% }
<%once>
my %method = ( map { $_=>1 } qw( email print fax_invoice ) );
@@ -13,6 +25,7 @@ my $invnum = $cgi->param('invnum');
my $template = $cgi->param('template');
my $notice_name = $cgi->param('notice_name') if $cgi->param('notice_name');
my $method = $cgi->param('method');
+my $no_coupon = $cgi->param('no_coupon');
my $mode;
if ( $cgi->param('mode') =~ /^(\d+)$/ ) {
$mode = $1;
@@ -26,9 +39,14 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
die "Can't find invoice!\n" unless $cust_bill;
$cust_bill->set('mode' => $mode) if $mode;
-$cust_bill->$method({ 'template' => $template,
- 'notice_name' => $notice_name,
- });
+
+#these methods die instead of return errors, so, handle that without a backtrace
+eval { $cust_bill->$method({ 'template' => $template,
+ 'notice_name' => $notice_name,
+ 'no_coupon' => $no_coupon,
+ });
+ };
+my $error = $@;
my $custnum = $cust_bill->getfield('custnum');