X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fsend-invoice.cgi;h=435875348b35c0e03c12df83088e931f20028acc;hb=adde23e02a271005a708519efd82c43f388cfdee;hp=08dd0e01c823ae99c0710674e0fd94c3502fae59;hpb=fe4515eb37d76849dd08c62782d86bc7ba311dcd;p=freeside.git

diff --git a/httemplate/misc/send-invoice.cgi b/httemplate/misc/send-invoice.cgi
index 08dd0e01c..435875348 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 ) %>
+<DIV STYLE="text-align: center;">
+<SPAN STYLE="color: red; font-weight: bold;"><% $error %></SPAN><BR>
+<BUTTON TYPE="button" onClick="parent.cClick();">Close</BUTTON>
+</DIV>
+<% 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 ) );
@@ -26,9 +38,13 @@ 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,
+                          }); 
+     };
+my $error = $@;
 
 my $custnum = $cust_bill->getfield('custnum');