X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Femail-invoice.cgi;h=8a3dd90b1e0c3ed8ae8a50afdf65d883398cc1a7;hb=6c28b9f6445e9ca8f3f84aaf8f3e61be47c15515;hp=a560a18384b36a239c881b4c9659ccb0696b4c90;hpb=2041a9143fac20b79ead4a1ae01224dedf5b27c2;p=freeside.git

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index a560a1838..8a3dd90b1 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -1,23 +1,18 @@
-<%
+%
+%
+%#untaint invnum
+%my($query) = $cgi->keywords;
+%$query =~ /^((.+)-)?(\d+)$/;
+%my $template = $2;
+%my $invnum = $3;
+%my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
+%die "Can't find invoice!\n" unless $cust_bill;
+%
+%$cust_bill->email($template); 
+%
+%my $custnum = $cust_bill->getfield('custnum');
+%
+%print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
+%
+%
 
-my $conf = new FS::Conf;
-
-#untaint invnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $invnum = $1;
-my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
-die "Can't find invoice!\n" unless $cust_bill;
-
-my $error = send_email(
-  'from'    => $cust_bill->_agent_invoice_from || $conf->config('invoice_from'),
-  'to'      => [ grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ],
-  'subject' => 'Invoice',
-  'body'    => [ $cust_bill->print_text ],
-);
-eidiot($error) if $error;
-
-my $custnum = $cust_bill->getfield('custnum');
-print $cgi->redirect("${p}view/cust_main.cgi?$custnum");
-
-%>