From f4ffa3596c3b8bfc9e862c2a7e8efc68f86207ab Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 12 Feb 2004 06:31:37 +0000
Subject: re-email invoice, closes: bug#526 and have print and email invoice
 links redirect back to top of customer view page instead of #history tag

---
 httemplate/misc/email-invoice.cgi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 httemplate/misc/email-invoice.cgi

(limited to 'httemplate/misc/email-invoice.cgi')

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
new file mode 100755
index 000000000..7ab1613ee
--- /dev/null
+++ b/httemplate/misc/email-invoice.cgi
@@ -0,0 +1,23 @@
+<%
+
+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'    => $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");
+
+%>
-- 
cgit v1.2.1


From 1cd72a6f1bd5ca39410f525779f5ca4ee9228a1c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 3 Jun 2004 10:09:08 +0000
Subject: also fix agent-specific From: address on "re-email" link

---
 httemplate/misc/email-invoice.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/misc/email-invoice.cgi')

diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi
index 7ab1613ee..a560a1838 100755
--- a/httemplate/misc/email-invoice.cgi
+++ b/httemplate/misc/email-invoice.cgi
@@ -10,7 +10,7 @@ my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
 my $error = send_email(
-  'from'    => $conf->config('invoice_from'),
+  '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 ],
-- 
cgit v1.2.1