diff options
Diffstat (limited to 'httemplate/misc')
| -rwxr-xr-x | httemplate/misc/email-invoice.cgi | 9 | ||||
| -rwxr-xr-x | httemplate/misc/fax-invoice.cgi | 8 | ||||
| -rwxr-xr-x | httemplate/misc/print-invoice.cgi | 9 |
3 files changed, 15 insertions, 11 deletions
diff --git a/httemplate/misc/email-invoice.cgi b/httemplate/misc/email-invoice.cgi index a3130c79f..34afa9084 100755 --- a/httemplate/misc/email-invoice.cgi +++ b/httemplate/misc/email-invoice.cgi @@ -4,14 +4,17 @@ my $conf = new FS::Conf; #untaint invnum my($query) = $cgi->keywords; -$query =~ /^(\d*)$/; -my $invnum = $1; +$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; my $error = send_email( $cust_bill->generate_email( - 'from' => $cust_bill->_agent_invoice_from || $conf->config('invoice_from'), + 'from' => + ( $cust_bill->_agent_invoice_from || $conf->config('invoice_from') ), + 'template' => $template, ) ); eidiot($error) if $error; diff --git a/httemplate/misc/fax-invoice.cgi b/httemplate/misc/fax-invoice.cgi index 46b2a1721..d490b8e79 100755 --- a/httemplate/misc/fax-invoice.cgi +++ b/httemplate/misc/fax-invoice.cgi @@ -5,15 +5,15 @@ my $lpr = $conf->config('lpr'); #untaint invnum my($query) = $cgi->keywords; -$query =~ /^(\d*)$/; -my $invnum = $1; +$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; - my $error = &FS::Misc::send_fax( dialstring => $cust_bill->cust_main->getfield('fax'), - docdata => [ $cust_bill->print_ps ], + docdata => [ $cust_bill->print_ps('', $template) ], ); die $error if $error; diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi index 144f6156a..5eeef3482 100755 --- a/httemplate/misc/print-invoice.cgi +++ b/httemplate/misc/print-invoice.cgi @@ -5,17 +5,18 @@ my $lpr = $conf->config('lpr'); #untaint invnum my($query) = $cgi->keywords; -$query =~ /^(\d*)$/; -my $invnum = $1; +$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; open(LPR,"|$lpr") or die "Can't open $lpr: $!"; if ( $conf->exists('invoice_latex') ) { - print LPR $cust_bill->print_ps; #( date ) + print LPR $cust_bill->print_ps('', $template); #( date ) } else { - print LPR $cust_bill->print_text; #( date ) + print LPR $cust_bill->print_text('', $template); #( date ) } close LPR |