projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix first port addition on new routers, RT#10574
[freeside.git]
/
FS
/
FS
/
cust_pay.pm
diff --git
a/FS/FS/cust_pay.pm
b/FS/FS/cust_pay.pm
index
014affe
..
29f3ddc
100644
(file)
--- a/
FS/FS/cust_pay.pm
+++ b/
FS/FS/cust_pay.pm
@@
-297,7
+297,8
@@
sub insert {
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
#payment receipt
$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'},
if ( $trigger eq 'cust_pay' ) {
my $error = $self->send_receipt(
'manual' => $options{'manual'},
@@
-533,7
+534,7
@@
sub send_receipt {
my $conf = new FS::Conf;
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 @invoicing_list = $cust_main->invoicing_list_emailonly;
return '' unless @invoicing_list;
@@
-543,17
+544,13
@@
sub send_receipt {
my $error = '';
if ( ( exists($opt->{'manual'}) && $opt->{'manual'} )
my $error = '';
if ( ( exists($opt->{'manual'}) && $opt->{'manual'} )
- || ! $conf->exists('invoice_html_statement')
+
#
|| ! $conf->exists('invoice_html_statement')
|| ! $cust_bill
)
{
|| ! $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'));
+ 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);
} elsif ( $conf->exists('payment_receipt_email') ) {
$error = $msg_template->send('cust_main'=> $cust_main, 'object'=> $self);
} elsif ( $conf->exists('payment_receipt_email') ) {
@@
-602,7
+599,7
@@
sub send_receipt {
} else {
} 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";
}
}
@@
-614,8
+611,10
@@
sub send_receipt {
};
$error = $queue->insert(
};
$error = $queue->insert(
- 'invnum' => $cust_bill->invnum,
- 'template' => 'statement',
+ 'invnum' => $cust_bill->invnum,
+ 'template' => 'statement',
+ 'notice_name' => 'Statement',
+ 'no_coupon' => 1,
);
}
);
}