diff options
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 4 | ||||
| -rw-r--r-- | FS/FS/cust_pay.pm | 120 | ||||
| -rw-r--r-- | FS/FS/part_pkg/flat.pm | 7 | ||||
| -rw-r--r-- | FS/FS/pay_batch/RBC.pm | 8 |
4 files changed, 70 insertions, 69 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index a5a38fdc2..51b49e4f0 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1027,10 +1027,10 @@ sub _make_lines { || $cust_pkg->expire > $cmp_time ) ) { - + warn " bill setup\n" if $DEBUG > 1; - unless ($cust_pkg->waive_setup) { + unless ( $cust_pkg->waive_setup ) { $lineitems++; $setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) }; diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm index 5031793ff..4c82d106e 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -662,53 +662,75 @@ sub send_receipt { || ! $cust_bill ) { - my $msgnum = $conf->config('payment_receipt_msgnum', $cust_main->agentnum); - if ( $msgnum ) { - - my %substitutions = (); - $substitutions{invnum} = $opt->{cust_bill}->invnum if $opt->{cust_bill}; - - my $msg_template = qsearchs('msg_template',{ msgnum => $msgnum}); - unless ($msg_template) { - warn "send_receipt could not load msg_template"; - return; - } - - my $cust_msg = $msg_template->prepare( - 'cust_main' => $cust_main, - 'object' => $self, - 'from_config' => 'payment_receipt_from', - 'substitutions' => \%substitutions, - 'msgtype' => 'receipt', + $error = $self->send_message_receipt( + 'cust_main' => $cust_main, + 'cust_bill' => $opt->{cust_bill}, + 'msgnum' => $conf->config('payment_receipt_msgnum', $cust_main->agentnum) ); - $error = $cust_msg ? $cust_msg->insert : 'error preparing msg_template'; - if ($error) { - warn "send_receipt: $error"; - return; - } + #not manual and no noemail flag (here or on the customer) + } elsif ( ! $opt->{'noemail'} && ! $cust_main->invoice_noemail ) { + # check to see if they want to send specific message template as receipt for auto payments + if ( $conf->config('payment_receipt_msgnum_auto', $cust_main->agentnum) ) { + $error = $self->send_message_receipt( + 'cust_main' => $cust_main, + 'cust_bill' => $opt->{cust_bill}, + 'msgnum' => $conf->config('payment_receipt_msgnum_auto', $cust_main->agentnum), + ); + } + else { my $queue = new FS::queue { - 'job' => 'FS::cust_msg::process_send', + 'job' => 'FS::cust_bill::queueable_email', 'paynum' => $self->paynum, 'custnum' => $cust_main->custnum, }; - $error = $queue->insert( $cust_msg->custmsgnum ); - } else { + my %opt = ( + 'invnum' => $cust_bill->invnum, + 'no_coupon' => 1, + ); - warn "payment_receipt is on, but no payment_receipt_msgnum\n"; + if ( my $mode = $conf->config('payment_receipt_statement_mode') ) { + $opt{'mode'} = $mode; + } else { + # backward compatibility, no good fix for this yet as some people may + # still have "invoice_latex_statement" and such options + $opt{'template'} = 'statement'; + $opt{'notice_name'} = 'Statement'; + } + $error = $queue->insert(%opt); } - #not manual and no noemail flag (here or on the customer) - } elsif ( ! $opt->{'noemail'} && ! $cust_main->invoice_noemail ) { - # check to see if they want to send specific message template as receipt for auto payments - my $msgnum = $conf->config('payment_receipt_msgnum_auto', $cust_main->agentnum); + + } + + warn "send_receipt: $error\n" if $error; +} + +=item send_message_receipt + +sends out a message receipt. +$error = $self->send_message_receipt( + 'cust_main' => $cust_main, + 'cust_bill' => $opt->{cust_bill}, + 'msgnum' => $conf->config('payment_receipt_msgnum', $cust_main->agentnum) + ); + +=cut + +sub send_message_receipt { + my ($self, %opt) = @_; + my $cust_main = $opt{'cust_main'}; + my $cust_bill = $opt{'cust_bill'}; + my $msgnum = $opt{'msgnum'}; + my $error = ''; + if ( $msgnum ) { my %substitutions = (); - $substitutions{invnum} = $opt->{cust_bill}->invnum if $opt->{cust_bill}; + $substitutions{invnum} = $cust_bill->invnum if $cust_bill; my $msg_template = qsearchs('msg_template',{ msgnum => $msgnum}); unless ($msg_template) { @@ -726,7 +748,7 @@ sub send_receipt { $error = $cust_msg ? $cust_msg->insert : 'error preparing msg_template'; if ($error) { warn "send_receipt: $error"; - return; + return $error; } my $queue = new FS::queue { @@ -736,36 +758,12 @@ sub send_receipt { }; $error = $queue->insert( $cust_msg->custmsgnum ); - } - else { - my $queue = new FS::queue { - 'job' => 'FS::cust_bill::queueable_email', - 'paynum' => $self->paynum, - 'custnum' => $cust_main->custnum, - }; - - my %opt = ( - 'invnum' => $cust_bill->invnum, - 'no_coupon' => 1, - ); - - if ( my $mode = $conf->config('payment_receipt_statement_mode') ) { - $opt{'mode'} = $mode; - } else { - # backward compatibility, no good fix for this yet as some people may - # still have "invoice_latex_statement" and such options - $opt{'template'} = 'statement'; - $opt{'notice_name'} = 'Statement'; - } - - $error = $queue->insert(%opt); + } else { + warn "payment_receipt is on, but no payment_receipt_msgnum\n"; + $error = "payment_receipt is on, but no payment_receipt_msgnum"; } - - - } - - warn "send_receipt: $error\n" if $error; + return $error; } =item cust_bill_pay diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index cfee58465..6fd9c7d08 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -128,13 +128,12 @@ sub calc_setup { my $discount = 0; if ( $charge > 0 ) { - $param->{'setup_charge'} = $charge; - $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param); - delete $param->{'setup_charge'}; + $param->{'setup_charge'} = $charge; + $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param); + delete $param->{'setup_charge'}; } sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) ); - } sub base_setup { diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm index 21dae4256..1577a7f85 100644 --- a/FS/FS/pay_batch/RBC.pm +++ b/FS/FS/pay_batch/RBC.pm @@ -174,6 +174,11 @@ $name = 'RBC'; die "invalid branch/routing number '$aba'\n"; } + ## set custname to business name if business checking or savings account is used otherwise leave as first and last name. + my $custname = $cust_pay_batch->cust_main->first . ' ' . $cust_pay_batch->cust_main->last; + $custname = $cust_pay_batch->cust_main->company + if (($cust_pay_batch->{Hash}->{paytype} eq "Business checking" || $cust_pay_batch->{Hash}->{paytype} eq "Business savings") && $cust_pay_batch->cust_main->company); + $i++; ## set to D for debit by default, then override to what cust_pay_batch has as payments may not have paycode. @@ -194,8 +199,7 @@ $name = 'RBC'; sprintf("%010.0f",$cust_pay_batch->amount*100). ' '. time2str("%Y%j", time + 86400). - sprintf("%-30.30s", encode('utf8', $cust_pay_batch->cust_main->first . ' ' . - $cust_pay_batch->cust_main->last)). + sprintf("%-30.30s", encode('utf8', $custname)). 'E'. # English ' '. sprintf("%-15s", $shortname). |