X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=206f1b0bf82c979c60018b6b7ee9ab3a2285fe11;hb=b664241d5e97c8bd2c2d44a961d08aa8c1f0feb5;hp=f6b6862afcab5526996e1ad642c165d0d8ef07be;hpb=571291dda91dd92db80660aa3d67333b0c88fc34;p=freeside.git diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index f6b6862af..206f1b0bf 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -11,7 +11,7 @@ use base qw( FS::cust_main::Packages FS::cust_main::Credit_Limit FS::cust_main::Merge FS::cust_main::API - FS::otaker_Mixin FS::payinfo_Mixin FS::cust_main_Mixin + FS::otaker_Mixin FS::cust_main_Mixin FS::geocode_Mixin FS::Quotable_Mixin FS::Sales_Mixin FS::o2m_Common FS::Record @@ -31,7 +31,7 @@ use Business::CreditCard 0.28; use FS::UID qw( dbh driver_name ); use FS::Record qw( qsearchs qsearch dbdef regexp_sql ); use FS::Cursor; -use FS::Misc qw( generate_ps do_print money_pretty ); +use FS::Misc qw( generate_ps do_print money_pretty card_types ); use FS::Msgcat qw(gettext); use FS::CurrentUser; use FS::TicketSystem; @@ -468,7 +468,8 @@ sub insert { $self->auto_agent_custid() if $conf->config('cust_main-auto_agent_custid') && ! $self->agent_custid; - my $error = $self->SUPER::insert; + my $error = $self->check_payinfo_cardtype + || $self->SUPER::insert; if ( $error ) { $dbh->rollback if $oldAutoCommit; #return "inserting cust_main record (transaction rolled back): $error"; @@ -1354,6 +1355,14 @@ sub replace { || $old->payby =~ /^(CHEK|DCHK)$/ && $self->payby =~ /^(CHEK|DCHK)$/ ) && ( $old->payinfo eq $self->payinfo || $old->paymask eq $self->paymask ); + if ( $self->payby =~ /^(CARD|DCRD)$/ + && $old->payinfo ne $self->payinfo + && $old->paymask ne $self->paymask ) + { + my $error = $self->check_payinfo_cardtype; + return $error if $error; + } + return "Invoicing locale is required" if $old->locale && ! $self->locale @@ -1842,238 +1851,6 @@ sub check { } - ### start of stuff moved to cust_payby - # then mostly kept here to support upgrades (can remove in 5.x) - # but modified to allow everything to be empty - - if ( $self->payby ) { - FS::payby->can_payby($self->table, $self->payby) - or return "Illegal payby: ". $self->payby; - } else { - $self->payby(''); - } - - $error = $self->ut_numbern('paystart_month') - || $self->ut_numbern('paystart_year') - || $self->ut_numbern('payissue') - || $self->ut_textn('paytype') - ; - return $error if $error; - - if ( $self->payip eq '' ) { - $self->payip(''); - } else { - $error = $self->ut_ip('payip'); - return $error if $error; - } - - # If it is encrypted and the private key is not availaible then we can't - # check the credit card. - my $check_payinfo = ! $self->is_encrypted($self->payinfo); - - # Need some kind of global flag to accept invalid cards, for testing - # on scrubbed data. - if ( !$import && !$ignore_invalid_card && $check_payinfo && - $self->payby =~ /^(CARD|DCRD)$/ ) { - - my $payinfo = $self->payinfo; - $payinfo =~ s/\D//g; - $payinfo =~ /^(\d{13,16}|\d{8,9})$/ - or return gettext('invalid_card'); # . ": ". $self->payinfo; - $payinfo = $1; - $self->payinfo($payinfo); - validate($payinfo) - or return gettext('invalid_card'); # . ": ". $self->payinfo; - - return gettext('unknown_card_type') - if $self->payinfo !~ /^99\d{14}$/ #token - && cardtype($self->payinfo) eq "Unknown"; - - unless ( $ignore_banned_card ) { - my $ban = FS::banned_pay->ban_search( %{ $self->_banned_pay_hashref } ); - if ( $ban ) { - if ( $ban->bantype eq 'warn' ) { - #or others depending on value of $ban->reason ? - return '_duplicate_card'. - ': disabled from'. time2str('%a %h %o at %r', $ban->_date). - ' until '. time2str('%a %h %o at %r', $ban->_end_date). - ' (ban# '. $ban->bannum. ')' - unless $self->override_ban_warn; - } else { - return 'Banned credit card: banned on '. - time2str('%a %h %o at %r', $ban->_date). - ' by '. $ban->otaker. - ' (ban# '. $ban->bannum. ')'; - } - } - } - - if (length($self->paycvv) && !$self->is_encrypted($self->paycvv)) { - if ( cardtype($self->payinfo) eq 'American Express card' ) { - $self->paycvv =~ /^(\d{4})$/ - or return "CVV2 (CID) for American Express cards is four digits."; - $self->paycvv($1); - } else { - $self->paycvv =~ /^(\d{3})$/ - or return "CVV2 (CVC2/CID) is three digits."; - $self->paycvv($1); - } - } else { - $self->paycvv(''); - } - - my $cardtype = cardtype($payinfo); - if ( $cardtype =~ /^(Switch|Solo)$/i ) { - - return "Start date or issue number is required for $cardtype cards" - unless $self->paystart_month && $self->paystart_year or $self->payissue; - - return "Start month must be between 1 and 12" - if $self->paystart_month - and $self->paystart_month < 1 || $self->paystart_month > 12; - - return "Start year must be 1990 or later" - if $self->paystart_year - and $self->paystart_year < 1990; - - return "Issue number must be beween 1 and 99" - if $self->payissue - and $self->payissue < 1 || $self->payissue > 99; - - } else { - $self->paystart_month(''); - $self->paystart_year(''); - $self->payissue(''); - } - - } elsif ( !$ignore_invalid_card && $check_payinfo && - $self->payby =~ /^(CHEK|DCHK)$/ ) { - - my $payinfo = $self->payinfo; - $payinfo =~ s/[^\d\@\.]//g; - if ( $conf->config('echeck-country') eq 'CA' ) { - $payinfo =~ /^(\d+)\@(\d{5})\.(\d{3})$/ - or return 'invalid echeck account@branch.bank'; - $payinfo = "$1\@$2.$3"; - } elsif ( $conf->config('echeck-country') eq 'US' ) { - $payinfo =~ /^(\d+)\@(\d{9})$/ or return 'invalid echeck account@aba'; - $payinfo = "$1\@$2"; - } else { - $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account@routing'; - $payinfo = "$1\@$2"; - } - $self->payinfo($payinfo); - $self->paycvv(''); - - unless ( $ignore_banned_card ) { - my $ban = FS::banned_pay->ban_search( %{ $self->_banned_pay_hashref } ); - if ( $ban ) { - if ( $ban->bantype eq 'warn' ) { - #or others depending on value of $ban->reason ? - return '_duplicate_ach' unless $self->override_ban_warn; - } else { - return 'Banned ACH account: banned on '. - time2str('%a %h %o at %r', $ban->_date). - ' by '. $ban->otaker. - ' (ban# '. $ban->bannum. ')'; - } - } - } - - } elsif ( $self->payby eq 'LECB' ) { - - my $payinfo = $self->payinfo; - $payinfo =~ s/\D//g; - $payinfo =~ /^1?(\d{10})$/ or return 'invalid btn billing telephone number'; - $payinfo = $1; - $self->payinfo($payinfo); - $self->paycvv(''); - - } elsif ( $self->payby eq 'BILL' ) { - - $error = $self->ut_textn('payinfo'); - return "Illegal P.O. number: ". $self->payinfo if $error; - $self->paycvv(''); - - } elsif ( $self->payby eq 'COMP' ) { - - my $curuser = $FS::CurrentUser::CurrentUser; - if ( ! $self->custnum - && ! $curuser->access_right('Complimentary customer') - ) - { - return "You are not permitted to create complimentary accounts." - } - - $error = $self->ut_textn('payinfo'); - return "Illegal comp account issuer: ". $self->payinfo if $error; - $self->paycvv(''); - - } 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 } ); - $self->paycvv(''); - - } - - return "You are not permitted to create complimentary accounts." - if ! $self->custnum - && $self->complimentary eq 'Y' - && ! $FS::CurrentUser::CurrentUser->access_right('Complimentary customer'); - - if ( $self->paydate eq '' || $self->paydate eq '-' ) { - return "Expiration date required" - # shouldn't payinfo_check do this? - unless ! $self->payby - || $self->payby =~ /^(BILL|PREPAY|CHEK|DCHK|LECB|CASH|WEST|MCRD|PPAL)$/; - $self->paydate(''); - } else { - my( $m, $y ); - if ( $self->paydate =~ /^(\d{1,2})[\/\-](\d{2}(\d{2})?)$/ ) { - ( $m, $y ) = ( $1, length($2) == 4 ? $2 : "20$2" ); - } elsif ( $self->paydate =~ /^19(\d{2})[\/\-](\d{1,2})[\/\-]\d+$/ ) { - ( $m, $y ) = ( $2, "19$1" ); - } elsif ( $self->paydate =~ /^(20)?(\d{2})[\/\-](\d{1,2})[\/\-]\d+$/ ) { - ( $m, $y ) = ( $3, "20$2" ); - } else { - return "Illegal expiration date: ". $self->paydate; - } - $m = sprintf('%02d',$m); - $self->paydate("$y-$m-01"); - my($nowm,$nowy)=(localtime(time))[4,5]; $nowm++; $nowy+=1900; - return gettext('expired_card') - if !$import - && !$ignore_expired_card - && ( $y<$nowy || ( $y==$nowy && $1<$nowm ) ); - } - - if ( $self->payname eq '' && $self->payby !~ /^(CHEK|DCHK)$/ && - ( ! $conf->exists('require_cardname') - || $self->payby !~ /^(CARD|DCRD)$/ ) - ) { - $self->payname( $self->first. " ". $self->getfield('last') ); - } else { - - if ( $self->payby =~ /^(CHEK|DCHK)$/ ) { - $self->payname =~ /^([\w \,\.\-\']*)$/ - or return gettext('illegal_name'). " payname: ". $self->payname; - $self->payname($1); - } else { - $self->payname =~ /^([\w \,\.\-\'\&]*)$/ - or return gettext('illegal_name'). " payname: ". $self->payname; - $self->payname($1); - } - - } - - ### end of stuff moved to cust_payby - return "Please select an invoicing locale" if ! $self->locale && ! $self->custnum @@ -2092,6 +1869,25 @@ sub check { $self->SUPER::check; } +sub check_payinfo_cardtype { + my $self = shift; + + return '' unless $self->payby =~ /^(CARD|DCRD)$/; + + my $payinfo = $self->payinfo; + $payinfo =~ s/\D//g; + + return '' if $payinfo =~ /^99\d{14}$/; #token + + my %bop_card_types = map { $_=>1 } values %{ card_types() }; + my $cardtype = cardtype($payinfo); + + return "$cardtype not accepted" unless $bop_card_types{$cardtype}; + + ''; + +} + =item replace_check Additional checks for replace only. @@ -2169,21 +1965,35 @@ sub cust_contact { qsearch('cust_contact', { 'custnum' => $self->custnum } ); } -=item cust_payby +=item cust_payby PAYBY Returns all payment methods (see L) for this customer. +If one or more PAYBY are specified, returns only payment methods for specified PAYBY. +Does not validate PAYBY. + =cut sub cust_payby { my $self = shift; - qsearch({ + my @payby = @_; + my $search = { 'table' => 'cust_payby', 'hashref' => { 'custnum' => $self->custnum }, 'order_by' => "ORDER BY payby IN ('CARD','CHEK') DESC, weight ASC", - }); + }; + $search->{'extra_sql'} = ' AND payby IN ( ' . join(',', map { dbh->quote($_) } @payby) . ' ) ' + if @payby; + + qsearch($search); } +=item has_cust_payby_auto + +Returns true if customer has an automatic payment method ('CARD' or 'CHEK') + +=cut + sub has_cust_payby_auto { my $self = shift; scalar( qsearch({ @@ -2368,6 +2178,8 @@ sub cancel { } sub _banned_pay_hashref { + die 'cust_main->_banned_pay_hashref deprecated'; + my $self = shift; my %payby2ban = ( @@ -2518,6 +2330,7 @@ If there is an error, returns the error, otherwise returns false. =cut sub remove_cvv { + die 'cust_main->remove_cvv deprecated'; my $self = shift; my $sth = dbh->prepare("UPDATE cust_main SET paycvv = '' WHERE custnum = ?") or return dbh->errstr; @@ -2844,6 +2657,7 @@ For electronic check transactions: =cut +#XXX i need to be updated for 4.x+ sub payment_info { my $self = shift; @@ -2885,24 +2699,6 @@ sub payment_info { } -=item paydate_monthyear - -Returns a two-element list consisting of the month and year of this customer's -paydate (credit card expiration date for CARD customers) - -=cut - -sub paydate_monthyear { - my $self = shift; - if ( $self->paydate =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #Pg date format - ( $2, $1 ); - } elsif ( $self->paydate =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) { - ( $1, $3 ); - } else { - ('', ''); - } -} - =item paydate_epoch Returns the exact time in seconds corresponding to the payment method @@ -2912,6 +2708,7 @@ Returns 0 if the paydate is empty or set to the far future. =cut +#XXX i need to be updated for 4.x+ sub paydate_epoch { my $self = shift; my ($month, $year) = $self->paydate_monthyear; @@ -2936,6 +2733,7 @@ as a number of seconds. =cut +# XXX i need to be updated for 4.x+ # Special expiration date behavior for non-CARD/DCRD customers has been # carefully preserved. Do we really use that? sub paydate_epoch_sql { @@ -4406,6 +4204,286 @@ sub payment_history { return @out; } +=item save_cust_payby + +Saves a new cust_payby for this customer, replacing an existing entry only +in select circumstances. Does not validate input. + +If auto is specified, marks this as the customer's primary method, or the +specified weight. Existing payment methods have their weight incremented as +appropriate. + +If bill_location is specified with auto, also sets location in cust_main. + +Will not insert complete duplicates of existing records, or records in which the +only difference from an existing record is to turn off automatic payment (will +return without error.) Will replace existing records in which the only difference +is to add a value to a previously empty preserved field and/or turn on automatic payment. +Fields marked as preserved are optional, and existing values will not be overwritten with +blanks when replacing. + +Accepts the following named parameters: + +=over 4 + +=item payment_payby + +either CARD or CHEK + +=item auto + +save as an automatic payment type (CARD/CHEK if true, DCRD/DCHK if false) + +=item weight + +optional, set higher than 1 for secondary, etc. + +=item payinfo + +required + +=item paymask + +optional, but should be specified for anything that might be tokenized, will be preserved when replacing + +=item payname + +required + +=item payip + +optional, will be preserved when replacing + +=item paydate + +CARD only, required + +=item bill_location + +CARD only, required, FS::cust_location object + +=item paystart_month + +CARD only, optional, will be preserved when replacing + +=item paystart_year + +CARD only, optional, will be preserved when replacing + +=item payissue + +CARD only, optional, will be preserved when replacing + +=item paycvv + +CARD only, only used if conf cvv-save is set appropriately + +=item paytype + +CHEK only + +=item paystate + +CHEK only + +=back + +=cut + +#The code for this option is in place, but it's not currently used +# +# =item replace +# +# existing cust_payby object to be replaced (must match custnum) + +# stateid/stateid_state/ss are not currently supported in cust_payby, +# might not even work properly in 4.x, but will need to work here if ever added + +sub save_cust_payby { + my $self = shift; + my %opt = @_; + + my $old = $opt{'replace'}; + my $new = new FS::cust_payby { $old ? $old->hash : () }; + return "Customer number does not match" if $new->custnum and $new->custnum != $self->custnum; + $new->set( 'custnum' => $self->custnum ); + + my $payby = $opt{'payment_payby'}; + return "Bad payby" unless grep(/^$payby$/,('CARD','CHEK')); + + # don't allow turning off auto when replacing + $opt{'auto'} ||= 1 if $old and $old->payby !~ /^D/; + + my @check_existing; # payby relevant to this payment_payby + + # set payby based on auto + if ( $payby eq 'CARD' ) { + $new->set( 'payby' => ( $opt{'auto'} ? 'CARD' : 'DCRD' ) ); + @check_existing = qw( CARD DCRD ); + } elsif ( $payby eq 'CHEK' ) { + $new->set( 'payby' => ( $opt{'auto'} ? 'CHEK' : 'DCHK' ) ); + @check_existing = qw( CHEK DCHK ); + } + + $new->set( 'weight' => $opt{'auto'} ? $opt{'weight'} : '' ); + + # basic fields + $new->payinfo($opt{'payinfo'}); # sets default paymask, but not if it's already tokenized + $new->paymask($opt{'paymask'}) if $opt{'paymask'}; # in case it's been tokenized, override with loaded paymask + $new->set( 'payname' => $opt{'payname'} ); + $new->set( 'payip' => $opt{'payip'} ); # will be preserved below + + my $conf = new FS::Conf; + + # compare to FS::cust_main::realtime_bop - check both to make sure working correctly + if ( $payby eq 'CARD' && + grep { $_ eq cardtype($opt{'payinfo'}) } $conf->config('cvv-save') ) { + $new->set( 'paycvv' => $opt{'paycvv'} ); + } else { + $new->set( 'paycvv' => ''); + } + + 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 $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + # set fields specific to payment_payby + if ( $payby eq 'CARD' ) { + if ($opt{'bill_location'}) { + $opt{'bill_location'}->set('custnum' => $self->custnum); + my $error = $opt{'bill_location'}->find_or_insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + $new->set( 'locationnum' => $opt{'bill_location'}->locationnum ); + } + foreach my $field ( qw( paydate paystart_month paystart_year payissue ) ) { + $new->set( $field => $opt{$field} ); + } + } else { + foreach my $field ( qw(paytype paystate) ) { + $new->set( $field => $opt{$field} ); + } + } + + # other cust_payby to compare this to + my @existing = $self->cust_payby(@check_existing); + + # fields that can overwrite blanks with values, but not values with blanks + my @preserve = qw( paymask locationnum paystart_month paystart_year payissue payip ); + + my $skip_cust_payby = 0; # true if we don't need to save or reweight cust_payby + unless ($old) { + # generally, we don't want to overwrite existing cust_payby with this, + # but we can replace if we're only marking it auto or adding a preserved field + # and we can avoid saving a total duplicate or merely turning off auto +PAYBYLOOP: + foreach my $cust_payby (@existing) { + # check fields that absolutely should not change + foreach my $field ($new->fields) { + next if grep(/^$field$/, qw( custpaybynum payby weight ) ); + next if grep(/^$field$/, @preserve ); + next PAYBYLOOP unless $new->get($field) eq $cust_payby->get($field); + } + # now check fields that can replace if one value is blank + my $replace = 0; + foreach my $field (@preserve) { + if ( + ( $new->get($field) and !$cust_payby->get($field) ) or + ( $cust_payby->get($field) and !$new->get($field) ) + ) { + # prevention of overwriting values with blanks happens farther below + $replace = 1; + } elsif ( $new->get($field) ne $cust_payby->get($field) ) { + next PAYBYLOOP; + } + } + unless ( $replace ) { + # nearly identical, now check weight + if ($new->get('weight') eq $cust_payby->get('weight') or !$new->get('weight')) { + # ignore identical cust_payby, and ignore attempts to turn off auto + # no need to save or re-weight cust_payby (but still need to update/commit $self) + $skip_cust_payby = 1; + last PAYBYLOOP; + } + # otherwise, only change is to mark this as primary + } + # if we got this far, we're definitely replacing + $old = $cust_payby; + last PAYBYLOOP; + } #PAYBYLOOP + } + + if ($old) { + $new->set( 'custpaybynum' => $old->custpaybynum ); + # don't turn off automatic payment (but allow it to be turned on) + if ($new->payby =~ /^D/ and $new->payby ne $old->payby) { + $opt{'auto'} = 1; + $new->set( 'payby' => $old->payby ); + $new->set( 'weight' => 1 ); + } + # make sure we're not overwriting values with blanks + foreach my $field (@preserve) { + if ( $old->get($field) and !$new->get($field) ) { + $new->set( $field => $old->get($field) ); + } + } + } + + # only overwrite cust_main bill_location if auto + if ($opt{'auto'} && $opt{'bill_location'}) { + $self->set('bill_location' => $opt{'bill_location'}); + my $error = $self->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + # done with everything except reweighting and saving cust_payby + # still need to commit changes to cust_main and cust_location + if ($skip_cust_payby) { + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + return ''; + } + + # re-weight existing primary cust_pay for this payby + if ($opt{'auto'}) { + foreach my $cust_payby (@existing) { + # relies on cust_payby return order + last unless $cust_payby->payby !~ /^D/; + last if $cust_payby->weight > 1; + next if $new->custpaybynum eq $cust_payby->custpaybynum; + next if $cust_payby->weight < ($opt{'weight'} || 1); + $cust_payby->weight( $cust_payby->weight + 1 ); + my $error = $cust_payby->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return "Error reweighting cust_payby: $error"; + } + } + } + + # finally, save cust_payby + my $error = $old ? $new->replace($old) : $new->insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + ''; + +} + =back =head1 CLASS METHODS @@ -4711,103 +4789,6 @@ sub search { =over 4 -#=item notify CUSTOMER_OBJECT TEMPLATE_NAME OPTIONS - -#Deprecated. Use event notification and message templates -#(L) instead. - -#Sends a templated email notification to the customer (see L). - -#OPTIONS is a hash and may include - -#I - the email sender (default is invoice_from) - -#I - comma-separated scalar or arrayref of recipients -# (default is invoicing_list) - -#I - The subject line of the sent email notification -# (default is "Notice from company_name") - -#I - a hashref of name/value pairs which will be substituted -# into the template - -#The following variables are vavailable in the template. - -#I<$first> - the customer first name -#I<$last> - the customer last name -#I<$company> - the customer company -#I<$payby> - a description of the method of payment for the customer -# # would be nice to use FS::payby::shortname -#I<$payinfo> - the account information used to collect for this customer -#I<$expdate> - the expiration of the customer payment in seconds from epoch - -#=cut - -#sub notify { -# my ($self, $template, %options) = @_; - -# return unless $conf->exists($template); - -# my $from = $conf->invoice_from_full($self->agentnum) -# if $conf->exists('invoice_from', $self->agentnum); -# $from = $options{from} if exists($options{from}); - -# my $to = join(',', $self->invoicing_list_emailonly); -# $to = $options{to} if exists($options{to}); -# -# my $subject = "Notice from " . $conf->config('company_name', $self->agentnum) -# if $conf->exists('company_name', $self->agentnum); -# $subject = $options{subject} if exists($options{subject}); - -# my $notify_template = new Text::Template (TYPE => 'ARRAY', -# SOURCE => [ map "$_\n", -# $conf->config($template)] -# ) -# or die "can't create new Text::Template object: Text::Template::ERROR"; -# $notify_template->compile() -# or die "can't compile template: Text::Template::ERROR"; - -# $FS::notify_template::_template::company_name = -# $conf->config('company_name', $self->agentnum); -# $FS::notify_template::_template::company_address = -# join("\n", $conf->config('company_address', $self->agentnum) ). "\n"; - -# my $paydate = $self->paydate || '2037-12-31'; -# $FS::notify_template::_template::first = $self->first; -# $FS::notify_template::_template::last = $self->last; -# $FS::notify_template::_template::company = $self->company; -# $FS::notify_template::_template::payinfo = $self->mask_payinfo; -# my $payby = $self->payby; -# my ($payyear,$paymonth,$payday) = split (/-/,$paydate); -# my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear); - -# #credit cards expire at the end of the month/year of their exp date -# if ($payby eq 'CARD' || $payby eq 'DCRD') { -# $FS::notify_template::_template::payby = 'credit card'; -# ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++); -# $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear); -# $expire_time--; -# }elsif ($payby eq 'COMP') { -# $FS::notify_template::_template::payby = 'complimentary account'; -# }else{ -# $FS::notify_template::_template::payby = 'current method'; -# } -# $FS::notify_template::_template::expdate = $expire_time; - -# for (keys %{$options{extra_fields}}){ -# no strict "refs"; -# ${"FS::notify_template::_template::$_"} = $options{extra_fields}->{$_}; -# } - -# send_email(from => $from, -# to => $to, -# subject => $subject, -# body => $notify_template->fill_in( PACKAGE => -# 'FS::notify_template::_template' ), -# ); - -#} - =item generate_letter CUSTOMER_OBJECT TEMPLATE_NAME OPTIONS Generates a templated notification to the customer (see L). @@ -4823,10 +4804,6 @@ I - if present, ignores TEMPLATE_NAME and uses the provided text The following variables are available in the template instead of or in addition to the fields of the customer record. -I<$payby> - a description of the method of payment for the customer - # would be nice to use FS::payby::shortname -I<$payinfo> - the masked account information used to collect for this customer -I<$expdate> - the expiration of the customer payment method in seconds from epoch I<$returnaddress> - the return address defaults to invoice_latexreturnaddress or company_address =cut @@ -4853,27 +4830,6 @@ sub generate_letter { or die "can't compile template: Text::Template::ERROR"; my %letter_data = map { $_ => $self->$_ } $self->fields; - $letter_data{payinfo} = $self->mask_payinfo; - - #my $paydate = $self->paydate || '2037-12-31'; - my $paydate = $self->paydate =~ /^\S+$/ ? $self->paydate : '2037-12-31'; - - my $payby = $self->payby; - my ($payyear,$paymonth,$payday) = split (/-/,$paydate); - my $expire_time = timelocal(0,0,0,$payday,--$paymonth,$payyear); - - #credit cards expire at the end of the month/year of their exp date - if ($payby eq 'CARD' || $payby eq 'DCRD') { - $letter_data{payby} = 'credit card'; - ($paymonth < 11) ? $paymonth++ : ($paymonth=0, $payyear++); - $expire_time = timelocal(0,0,0,$payday,$paymonth,$payyear); - $expire_time--; - }elsif ($payby eq 'COMP') { - $letter_data{payby} = 'complimentary account'; - }else{ - $letter_data{payby} = 'current method'; - } - $letter_data{expdate} = $expire_time; for (keys %{$options{extra_fields}}){ $letter_data{$_} = $options{extra_fields}->{$_}; @@ -5145,9 +5101,7 @@ sub process_bill_and_collect { sub _upgrade_data { #class method my ($class, %opts) = @_; - my @statements = ( - 'UPDATE h_cust_main SET paycvv = NULL WHERE paycvv IS NOT NULL', - ); + my @statements = (); #this seems to be the only expensive one.. why does it take so long? unless ( FS::upgrade_journal->is_done('cust_main__signupdate') ) { @@ -5156,29 +5110,6 @@ sub _upgrade_data { #class method FS::upgrade_journal->set_done('cust_main__signupdate'); } - unless ( FS::upgrade_journal->is_done('cust_main__paydate') ) { - - # fix yyyy-m-dd formatted paydates - if ( driver_name =~ /^mysql/i ) { - push @statements, - "UPDATE cust_main SET paydate = CONCAT( SUBSTRING(paydate FROM 1 FOR 5), '0', SUBSTRING(paydate FROM 6) ) WHERE SUBSTRING(paydate FROM 7 FOR 1) = '-'"; - } else { # the SQL standard - push @statements, - "UPDATE cust_main SET paydate = SUBSTRING(paydate FROM 1 FOR 5) || '0' || SUBSTRING(paydate FROM 6) WHERE SUBSTRING(paydate FROM 7 FOR 1) = '-'"; - } - FS::upgrade_journal->set_done('cust_main__paydate'); - } - - unless ( FS::upgrade_journal->is_done('cust_main__payinfo') ) { - - push @statements, #fix the weird BILL with a cc# in payinfo problem - #DCRD to be safe - "UPDATE cust_main SET payby = 'DCRD' WHERE payby = 'BILL' and length(payinfo) = 16 and payinfo ". regexp_sql. q( '^[0-9]*$' ); - - FS::upgrade_journal->set_done('cust_main__payinfo'); - - } - my $t = time; foreach my $sql ( @statements ) { my $sth = dbh->prepare($sql) or die dbh->errstr; @@ -5213,57 +5144,6 @@ sub _upgrade_data { #class method } - unless ( FS::upgrade_journal->is_done('cust_main__cust_payby') ) { - - #we don't want to decrypt them, just stuff them as-is into cust_payby - local(@encrypted_fields) = (); - - local($FS::cust_payby::ignore_expired_card) = 1; - local($FS::cust_payby::ignore_banned_card) = 1; - - my @payfields = qw( payby payinfo paycvv paymask - paydate paystart_month paystart_year payissue - payname paystate paytype payip - ); - - my $search = new FS::Cursor { - 'table' => 'cust_main', - 'extra_sql' => " WHERE ( payby IS NOT NULL AND payby != '' ) ", - }; - - while (my $cust_main = $search->fetch) { - - unless ( $cust_main->payby =~ /^(BILL|COMP)$/ ) { - - my $cust_payby = new FS::cust_payby { - 'custnum' => $cust_main->custnum, - 'weight' => 1, - map { $_ => $cust_main->$_(); } @payfields - }; - - my $error = $cust_payby->insert; - die $error if $error; - - } - - $cust_main->complimentary('Y') if $cust_main->payby eq 'COMP'; - - $cust_main->invoice_attn( $cust_main->payname ) - if $cust_main->payby eq 'BILL' && $cust_main->payname; - $cust_main->po_number( $cust_main->payinfo ) - if $cust_main->payby eq 'BILL' && $cust_main->payinfo; - - $cust_main->setfield($_, '') foreach @payfields; - my $error = $cust_main->replace; - die "Error upgradging payment information for custnum ". - $cust_main->custnum. ": $error" - if $error; - - }; - - FS::upgrade_journal->set_done('cust_main__cust_payby'); - } - $class->_upgrade_otaker(%opts); } @@ -5285,13 +5165,8 @@ card types. No multiple currency support (probably a larger project than just this module). -payinfo_masked false laziness with cust_pay.pm and cust_refund.pm - Birthdates rely on negative epoch values. -The payby for card/check batches is broken. With mixed batching, bad -things will happen. - B I should be renamed I