X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fsend-invoice.cgi;h=dea081020ed46b1abfb5a7e01ee90559c7eaff7c;hp=32dfe276d685fb75f1e55b05f3a01b538d3a33ca;hb=cee66872f5c67825cae5a0f86da3fb0657c4ebae;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984

diff --git a/httemplate/misc/send-invoice.cgi b/httemplate/misc/send-invoice.cgi
index 32dfe276d..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 ) %>
+<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 ) );
@@ -13,6 +25,11 @@ 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;
+}
 
 $method .= '_invoice' if $method eq 'fax'; #!
 
@@ -21,9 +38,15 @@ die "unknown method $method" unless $method{$method};
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-$cust_bill->$method({ 'template'    => $template,
-                      'notice_name' => $notice_name,
-                   }); 
+$cust_bill->set('mode' => $mode) if $mode;
+
+#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');