my @print_text = $self->print_text('', $template);
my @invoicing_list = $self->cust_main->invoicing_list;
- if ( grep { $_ ne 'POST' } @invoicing_list ) { #email invoice
+ if ( grep { $_ ne 'POST' } @invoicing_list or !@invoicing_list ) { #email
+
+ #better to notify this person than silence
+ @invoicing_list = ($invoice_from) unless @invoicing_list;
+
#false laziness w/FS::cust_pay::delete & fs_signup_server && ::realtime_card
#$ENV{SMTPHOSTS} = $smtpmachine;
$ENV{MAILADDRESS} = $invoice_from;
}
- if ( ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list ) { #postal
+ if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
open(LPR, "|$lpr")
or return "Can't open pipe to $lpr: $!";
print LPR @print_text;
time2str("%x", $cust_bill_pkg->edate),
);
- } else { #pkgnum Tax
+ } else { #pkgnum tax
next unless $cust_bill_pkg->setup != 0;
+ my $itemdesc = defined $cust_bill_pkg->dbdef_table->column('itemdesc')
+ ? ( $cust_bill_pkg->itemdesc || 'Tax' )
+ : 'Tax';
($pkg, $setup, $recur, $sdate, $edate) =
- ( 'Tax', sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
+ ( $itemdesc, sprintf("%10.2f",$cust_bill_pkg->setup), '', '', '' );
}
$csv->combine(
=item realtime_card
-Attempts to pay this invoice with a Business::OnlinePayment realtime gateway.
-See http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
-for supproted processors.
+Attempts to pay this invoice with a credit card payment via a
+Business::OnlinePayment realtime gateway. See
+http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supported processors.
=cut
sub realtime_card {
my $self = shift;
+ $self->realtime_bop('CC', @_);
+}
+
+=item realtime_ach
+
+Attempts to pay this invoice with an electronic check (ACH) payment via a
+Business::OnlinePayment realtime gateway. See
+http://search.cpan.org/search?mode=module&query=Business%3A%3AOnlinePayment
+for supported processors.
+
+=cut
+
+sub realtime_ach {
+ my $self = shift;
+ $self->realtime_bop('CHECK', @_);
+}
+
+sub realtime_bop {
+ my $self = shift;
+ my $method = shift;
my $cust_main = $self->cust_main;
my $amount = $self->owed;
unless ( $processor =~ /^Business::OnlinePayment::(.*)$/ ) {
- return "Real-time card processing not enabled (processor $processor)";
+ return "Real-time card/ACH processing not enabled (processor $processor)";
}
my $bop_processor = $1; #hmm?
my $address = $cust_main->address1;
$address .= ", ". $cust_main->address2 if $cust_main->address2;
- #fix exp. date
- #$cust_main->paydate =~ /^(\d+)\/\d*(\d{2})$/;
- $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
- my $exp = "$2/$1";
-
my($payname, $payfirst, $paylast);
- if ( $cust_main->payname ) {
+ if ( $cust_main->payname && $method ne 'CHECK' ) {
$payname = $cust_main->payname;
$payname =~ /^\s*([\w \,\.\-\']*)?\s+([\w\,\.\-\']+)\s*$/
or do {
$description = eval qq("$dtempl");
}
+
+ my %content;
+ if ( $method eq 'CC' ) {
+ $content{card_number} = $cust_main->payinfo;
+ $cust_main->paydate =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
+ $content{expiration} = "$2/$1";
+ } elsif ( $method eq 'CHECK' ) {
+ my($account_number,$routing_code) = $cust_main->payinfo;
+ ( $content{account_number}, $content{routing_code} ) =
+ split('@', $cust_main->payinfo);
+ $content{bank_name} = $cust_main->payname;
+ }
my $transaction =
new Business::OnlinePayment( $bop_processor, @bop_options );
$transaction->content(
- 'type' => 'CC',
+ %content,
+ 'type' => $method,
'login' => $bop_login,
'password' => $bop_password,
'action' => $action1,
'state' => $cust_main->state,
'zip' => $cust_main->zip,
'country' => $cust_main->country,
- 'card_number' => $cust_main->payinfo,
- 'expiration' => $exp,
'referer' => 'http://cleanwhisker.420.am/',
'email' => $email,
'phone' => $cust_main->daytime || $cust_main->night,
new Business::OnlinePayment( $bop_processor, @bop_options );
my %capture = (
- type => 'CC',
+ %content,
+ type => $method,
action => $action2,
login => $bop_login,
password => $bop_password,
amount => $amount,
authorization => $auth,
description => $description,
- card_number => $cust_main->payinfo,
- expiration => $exp,
);
foreach my $field (qw( authorization_source_code returned_ACI transaction_identifier validation_code
if ( $transaction->is_success() ) {
+ my %method2payby = (
+ 'CC' => 'CARD',
+ 'CHECK' => 'CHEK',
+ );
+
my $cust_pay = new FS::cust_pay ( {
'invnum' => $self->invnum,
'paid' => $amount,
'_date' => '',
- 'payby' => 'CARD',
+ 'payby' => method2payby{$method},
'payinfo' => $cust_main->payinfo,
'paybatch' => "$processor:". $transaction->authorization,
} );
my $error = $cust_pay->insert;
if ( $error ) {
# gah, even with transactions.
- my $e = 'WARNING: Card debited but database not updated - '.
+ my $e = 'WARNING: Card/ACH debited but database not updated - '.
'error applying payment, invnum #' . $self->invnum.
" ($processor): $error";
warn $e;
"Sender: $invoice_from",
"Reply-To: $invoice_from",
"Date: ". time2str("%a, %d %b %Y %X %z", time),
- "Subject: Your credit card could not be processed",
+ "Subject: Your payment could not be processed",
] );
my $message = new Mail::Internet (
'Header' => $header,
# my $invnum = $self->invnum;
my $cust_main = qsearchs('cust_main', { 'custnum', $self->custnum } );
$cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
- unless $cust_main->payname;
+ unless $cust_main->payname && $cust_main->payby ne 'CHEK';
my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
# my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
}
#new charges
- foreach ( $self->cust_bill_pkg ) {
+ foreach ( ( grep { $_->pkgnum } $self->cust_bill_pkg ), #packages first
+ ( grep { ! $_->pkgnum } $self->cust_bill_pkg ), #then taxes
+ ) {
if ( $_->pkgnum ) {
map { [ " ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels;
}
- } else { #pkgnum Tax
- push @buf,["Tax", $money_char. sprintf("%10.2f",$_->setup) ]
+ } else { #pkgnum tax
+ my $itemdesc = defined $_->dbdef_table->column('itemdesc')
+ ? ( $_->itemdesc || 'Tax' )
+ : 'Tax';
+ push @buf,[$itemdesc, $money_char. sprintf("%10.2f",$_->setup) ]
if $_->setup != 0;
}
}
=head1 VERSION
-$Id: cust_bill.pm,v 1.45 2002-09-17 10:21:47 ivan Exp $
+$Id: cust_bill.pm,v 1.50 2002-10-15 09:54:24 ivan Exp $
=head1 BUGS