X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=59ec41b81ad8217a655b26d62447d97da4b85d49;hb=959663cd4d4885295f44de43ac005e55d054102f;hp=25b6b9f46b8ebba64df89c2576e01100b8b09ab4;hpb=6cd87c0d3b5280446301c647fa5f1ec5a593fa3f;p=freeside.git diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 25b6b9f46..59ec41b81 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -6,7 +6,7 @@ package FS::cust_main; use strict; use vars qw( @ISA $conf $lpr $processor $xaction $E_NoErr $invoice_from - $smtpmachine ); + $smtpmachine $Debug ); use Safe; use Carp; use Time::Local; @@ -27,9 +27,13 @@ use FS::part_referral; use FS::cust_main_county; use FS::agent; use FS::cust_main_invoice; +use FS::prepay_credit; @ISA = qw( FS::Record ); +$Debug = 0; +#$Debug = 1; + #ask FS::UID to run this stuff for us later $FS::UID::callback{'FS::cust_main'} = sub { $conf = new FS::Conf; @@ -145,9 +149,9 @@ FS::Record. The following fields are currently supported: =item fax - phone (optional) -=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free) +=item payby - `CARD' (credit cards), `BILL' (billing), `COMP' (free), or `PREPAY' (special billing type: applies a credit - see L and sets billing type to BILL) -=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username) +=item payinfo - card number, P.O., comp issuer (4-8 lowercase alphanumerics; think username) or prepayment identifier (see L) =item paydate - expiration date, mm/yyyy, m/yyyy, mm/yy or m/yy @@ -179,6 +183,52 @@ sub table { 'cust_main'; } Adds this customer to the database. If there is an error, returns the error, otherwise returns false. +=cut + +sub insert { + my $self = shift; + + my $flag = 0; + if ( $self->payby eq 'PREPAY' ) { + $self->payby('BILL'); + $flag = 1; + } + + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $error = $self->SUPER::insert; + return $error if $error; + + if ( $flag ) { + my $prepay_credit = + qsearchs('prepay_credit', { 'identifier' => $self->payinfo } ); + warn "WARNING: can't find pre-found prepay_credit: ". $self->payinfo + unless $prepay_credit; + my $amount = $prepay_credit->amount; + my $error = $prepay_credit->delete; + if ( $error ) { + warn "WARNING: can't delete prepay_credit: ". $self->payinfo; + } else { + my $cust_credit = new FS::cust_credit { + 'custnum' => $self->custnum, + 'amount' => $amount, + }; + my $error = $cust_credit->insert; + warn "WARNING: error inserting cust_credit for prepay_credit: $error" + if $error; + } + + } + + ''; + +} + =item delete NEW_CUSTNUM This deletes the customer. If there is an error, returns the error, otherwise @@ -311,7 +361,7 @@ sub check { or return "Illegal zip: ". $self->zip; $self->zip($1); - $self->payby =~ /^(CARD|BILL|COMP)$/ + $self->payby =~ /^(CARD|BILL|COMP|PREPAY)$/ or return "Illegal payby: ". $self->payby; $self->payby($1); @@ -337,10 +387,21 @@ sub check { $error = $self->ut_textn('payinfo'); return "Illegal comp account issuer: ". $self->payinfo if $error; + } elsif ( $self->payby eq 'PREPAY' ) { + + my $payinfo = $self->payinfo; + $payinfo =~ s/\W//g; #anything else would just confuse things + $self->payinfo($payinfo); + $error = $self->ut_alpha('payinfo'); + return "Illegal prepayment identifier: ". $self->payinfo if $error; + return "Unknown prepayment identifier" + unless qsearchs('prepay_credit', { 'identifier' => $self->payinfo } ); + } if ( $self->paydate eq '' ) { - return "Expriation date required" unless $self->payby eq 'BILL'; + return "Expriation date required" + unless $self->payby eq 'BILL' || $self->payby eq 'PREPAY'; $self->paydate(''); } else { $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ @@ -392,7 +453,12 @@ sub ncancelled_pkgs { qsearch( 'cust_pkg', { 'custnum' => $self->custnum, 'cancel' => '', - }); + }), + qsearch( 'cust_pkg', { + 'custnum' => $self->custnum, + 'cancel' => 0, + }), + ; } =item bill OPTIONS @@ -602,6 +668,7 @@ sub collect { my $invoice_time = $options{'invoice_time'} || time; my $total_owed = $self->balance; + warn "collect: total owed $total_owed " if $Debug; return '' unless $total_owed > 0; #redundant????? #put below somehow? @@ -627,7 +694,7 @@ sub collect { next if qsearchs( 'cust_pay_batch', { 'invnum' => $cust_bill->invnum } ); - #warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)"; + warn "invnum ". $cust_bill->invnum. " (owed ". $cust_bill->owed. ", amount $amount, total_owed $total_owed)" if $Debug; next unless $amount > 0; @@ -790,10 +857,6 @@ sub collect { return "Unknown payment type ". $self->payby; } - - - - } ''; @@ -930,7 +993,7 @@ sub check_invoicing_list { =head1 VERSION -$Id: cust_main.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $ +$Id: cust_main.pm,v 1.3 2000-01-31 05:22:23 ivan Exp $ =head1 BUGS