$dbh->commit or die $dbh->errstr if $oldAutoCommit;
#payment receipt
- my $trigger = $conf->config('payment_receipt-trigger') || 'cust_pay';
+ my $trigger = $conf->config('payment_receipt-trigger',
+ $self->cust_main->agentnum) || 'cust_pay';
if ( $trigger eq 'cust_pay' ) {
my $error = $self->send_receipt(
'manual' => $options{'manual'},
my $conf = new FS::Conf;
- return '' unless $conf->exists('payment_receipt');
+ return '' unless $conf->exists('payment_receipt', $cust_main->agentnum);
my @invoicing_list = $cust_main->invoicing_list_emailonly;
return '' unless @invoicing_list;
my $error = '';
if ( ( exists($opt->{'manual'}) && $opt->{'manual'} )
- || ! $conf->exists('invoice_html_statement')
+ #|| ! $conf->exists('invoice_html_statement')
|| ! $cust_bill
)
{
-
- if ( $conf->exists('payment_receipt_msgnum')
- && $conf->config('payment_receipt_msgnum')
- )
- {
- my $msg_template =
- FS::msg_template->by_key($conf->config('payment_receipt_msgnum'));
- $error = $msg_template->send('cust_main'=> $cust_main, 'object'=> $self);
+ my $msgnum = $conf->config('payment_receipt_msgnum', $cust_main->agentnum);
+ if ( $msgnum ) {
+ my $msg_template = FS::msg_template->by_key($msgnum);
+ $error = $msg_template->send(
+ 'cust_main' => $cust_main,
+ 'object' => $self,
+ 'from_config' => 'payment_receipt_from',
+ );
} elsif ( $conf->exists('payment_receipt_email') ) {
} else {
- warn "payment_receipt is on, but no payment_receipt_msgnum or invoice_html_statement is configured\n";
+ warn "payment_receipt is on, but no payment_receipt_msgnum\n";
}
};
$error = $queue->insert(
- 'invnum' => $cust_bill->invnum,
- 'template' => 'statement',
+ 'invnum' => $cust_bill->invnum,
+ 'template' => 'statement',
+ 'notice_name' => 'Statement',
+ 'no_coupon' => 1,
);
}