use vars qw( @cust_main_editable_fields );
@cust_main_editable_fields = qw(
first last company address1 address2 city
- county state zip country daytime night fax
+ county state zip country
+ daytime night fax mobile
ship_first ship_last ship_company ship_address1 ship_address2 ship_city
- ship_state ship_zip ship_country ship_daytime ship_night ship_fax
+ ship_state ship_zip ship_country
+ ship_daytime ship_night ship_fax ship_mobile
+ locale
payby payinfo payname paystart_month paystart_year payissue payip
ss paytype paystate stateid stateid_state
);
+BEGIN { #preload to reduce time customer_info takes
+ if ( $FS::TicketSystem::system ) {
+ warn "$me: initializing ticket system\n" if $DEBUG;
+ FS::TicketSystem->init();
+ }
+}
+
sub _cache {
$cache ||= new FS::ClientAPI_SessionCache( {
'namespace' => 'FS::ClientAPI::MyAccount',
( $session->{'pkgnum'} ? 1 : 0 ), #nobalance
);
- $return{name} = $cust_main->first. ' '. $cust_main->get('last');
+ $return{name} = $cust_main->name;
+ $return{ship_name} = $cust_main->ship_name;
for (@cust_main_editable_fields) {
$return{$_} = $cust_main->get($_);
}
+sub customer_info_short {
+ my $p = shift;
+
+ my($context, $session, $custnum) = _custoragent_session_custnum($p);
+ return { 'error' => $session } if $context eq 'error';
+
+ my %return;
+
+ my $conf = new FS::Conf;
+
+ if ( $custnum ) { #customer record
+
+ my $search = { 'custnum' => $custnum };
+ $search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+ my $cust_main = qsearchs('cust_main', $search )
+ or return { 'error' => "unknown custnum $custnum" };
+
+ $return{small_custview} =
+ small_custview( $cust_main,
+ scalar($conf->config('countrydefault')),
+ 1, ##nobalance
+ );
+
+ $return{name} = $cust_main->name;
+ $return{ship_name} = $cust_main->ship_name;
+
+ $return{payby} = $cust_main->payby;
+
+ #none of these are terribly expensive if we want 'em...
+ for (@cust_main_editable_fields) {
+ $return{$_} = $cust_main->get($_);
+ }
+
+ if ( $cust_main->payby =~ /^(CARD|DCRD)$/ ) {
+ $return{payinfo} = $cust_main->paymask;
+ @return{'month', 'year'} = $cust_main->paydate_monthyear;
+ }
+
+ $return{'invoicing_list'} =
+ join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list );
+ #$return{'postal_invoicing'} =
+ # 0 < ( grep { $_ eq 'POST' } $cust_main->invoicing_list );
+
+ if ( $session->{'svcnum'} ) {
+ my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $session->{'svcnum'} });
+ $return{'svc_label'} = ($cust_svc->label)[1] if $cust_svc;
+ }
+
+ } elsif ( $session->{'svcnum'} ) { #no customer record
+
+ #uuh, not supproted yet... die?
+ return { 'error' => 'customer_info_short not yet supported as agent' };
+
+ } else {
+
+ return { 'error' => 'Expired session' }; #XXX redirect to login w/this err!
+
+ }
+
+ return { 'error' => '',
+ 'custnum' => $custnum,
+ %return,
+ };
+}
+
sub edit_info {
my $p = shift;
my $session = _cache->get($p->{'session_id'})
$p->{'payinfo1'} =~ /^([\dx]+)$/
or return { 'error' => "illegal account number ". $p->{'payinfo1'} };
my $payinfo1 = $1;
- $p->{'payinfo2'} =~ /^([\dx]+)$/
+ $p->{'payinfo2'} =~ /^([\dx\.]+)$/ # . turned on by -require-bank-branch?
or return { 'error' => "illegal ABA/routing number ". $p->{'payinfo2'} };
my $payinfo2 = $1;
$payinfo = $payinfo1. '@'. $payinfo2;
%return,
};
-};
+}
#some false laziness with httemplate/process/payment.cgi - look there for
#ACH and CVV support stuff
-sub process_payment {
+sub validate_payment {
my $p = shift;
my $session = _cache->get($p->{'session_id'})
or return { 'error' => "Can't resume session" }; #better error message
- my %return;
-
my $custnum = $session->{'custnum'};
my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
#false laziness w/process/payment.cgi
my $payinfo;
my $paycvv = '';
- my $paynum = '';
if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
$p->{'payinfo1'} =~ /^([\dx]+)$/
'CHEK' => [ qw( ss paytype paystate stateid stateid_state payip ) ],
);
+ my $card_type = '';
+ $card_type = cardtype($payinfo) if $payby eq 'CARD';
+
+ {
+ 'cust_main' => $cust_main, #XXX or just custnum??
+ 'amount' => $amount,
+ 'payby' => $payby,
+ 'payinfo' => $payinfo,
+ 'paymask' => $cust_main->mask_payinfo( $payby, $payinfo ),
+ 'card_type' => $card_type,
+ 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01',
+ 'paydate_pretty' => $p->{'month'}. ' / '. $p->{'year'},
+ 'payname' => $payname,
+ 'paybatch' => $paybatch, #this doesn't actually do anything
+ 'paycvv' => $paycvv,
+ 'payname' => $payname,
+ 'discount_term' => $discount_term,
+ 'pkgnum' => $session->{'pkgnum'},
+ map { $_ => $p->{$_} } ( @{ $payby2fields{$payby} },
+ qw( save auto ),
+ )
+ };
+
+}
+
+sub store_payment {
+ my $p = shift;
+
+ my $validate = validate_payment($p);
+ return $validate if $validate->{'error'};
+
+ my $conf = new FS::Conf;
+ my $timeout = $conf->config('selfservice-session_timeout') || '1 hour'; #?
+ _cache->set( 'payment_'.$p->{'session_id'}, $validate, $timeout );
+
+ +{ map { $_=>$validate->{$_} }
+ qw( card_type paymask payname paydate_pretty amount )
+ };
+
+}
+
+sub process_stored_payment {
+ my $p = shift;
+
+ my $session_id = $p->{'session_id'};
+
+ my $payment_info = _cache->get( "payment_$session_id" )
+ or return { 'error' => "Can't resume session" }; #better error message
+
+ do_process_payment($payment_info);
+
+}
+
+sub process_payment {
+ my $p = shift;
+
+ my $payment_info = validate_payment($p);
+ return $payment_info if $payment_info->{'error'};
+
+ do_process_payment($payment_info);
+
+}
+
+sub do_process_payment {
+ my $validate = shift;
+
+ my $cust_main = $validate->{'cust_main'};
+
+ my $amount = delete $validate->{'amount'};
+ my $paynum = '';
+
+ my $payby = delete $validate->{'payby'};
+
my $error = $cust_main->realtime_bop( $FS::payby::payby2bop{$payby}, $amount,
- 'quiet' => 1,
- 'payinfo' => $payinfo,
- 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01',
- 'payname' => $payname,
- 'paybatch' => $paybatch, #this doesn't actually do anything
- 'paycvv' => $paycvv,
- 'paynum_ref' => \$paynum,
- 'pkgnum' => $session->{'pkgnum'},
- 'discount_term' => $discount_term,
+ 'quiet' => 1,
'selfservice' => 1,
- map { $_ => $p->{$_} } @{ $payby2fields{$payby} }
+ 'paynum_ref' => \$paynum,
+ %$validate,
);
return { 'error' => $error } if $error;
$cust_main->apply_payments;
- if ( $p->{'save'} ) {
+ if ( $validate->{'save'} ) {
my $new = new FS::cust_main { $cust_main->hash };
- if ($payby eq 'CARD' || $payby eq 'DCRD') {
- $new->set( $_ => $p->{$_} )
+ if ($validate->{'payby'} eq 'CARD' || $validate->{'payby'} eq 'DCRD') {
+ $new->set( $_ => $validate->{$_} )
foreach qw( payname paystart_month paystart_year payissue payip
address1 address2 city state zip country );
- $new->set( 'payby' => $p->{'auto'} ? 'CARD' : 'DCRD' );
+ $new->set( 'payby' => $validate->{'auto'} ? 'CARD' : 'DCRD' );
} elsif ($payby eq 'CHEK' || $payby eq 'DCHK') {
- $new->set( $_ => $p->{$_} )
+ $new->set( $_ => $validate->{$_} )
foreach qw( payname payip paytype paystate
stateid stateid_state );
- $new->set( 'payby' => $p->{'auto'} ? 'CHEK' : 'DCHK' );
+ $new->set( 'payby' => $validate->{'auto'} ? 'CHEK' : 'DCHK' );
}
- $new->set( 'payinfo' => $cust_main->card_token || $payinfo );
- $new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
+ $new->set( 'payinfo' => $cust_main->card_token || $validate->{'payinfo'} );
+ $new->set( 'paydate' => $validate->{'paydate'} );
my $error = $new->replace($cust_main);
if ( $error ) {
#no, this causes customers to process their payments again
#XXX just warn verosely for now so i can figure out how these happen in
# the first place, eventually should redirect them to the "change
#address" page but indicate the payment did process??
- delete($p->{'payinfo'}); #don't want to log this!
+ delete($validate->{'payinfo'}); #don't want to log this!
warn "WARNING: error changing customer info when processing payment (not returning to customer as a processing error): $error\n".
"NEW: ". Dumper($new)."\n".
"OLD: ". Dumper($cust_main)."\n".
- "PACKET: ". Dumper($p)."\n";
+ "PACKET: ". Dumper($validate)."\n";
#} else {
#not needed...
#$cust_main = $new;
}
}
+ my $cust_pay = '';
my $receipt_html = '';
- if($paynum) {
+ if ($paynum) {
# currently supported for realtime CC only; send receipt data to SS
- my $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
+ $cust_pay = qsearchs('cust_pay', { 'paynum' => $paynum } );
if($cust_pay) {
$receipt_html = qq!
<TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=2>
<TR>
<TD ALIGN="right">Amount</TD>
- <TD BGCOLOR="#FFFFFF"><B>! . $cust_pay->paid . qq!</B></TD>
+ <TD BGCOLOR="#FFFFFF"><B>! . sprintf('%.2f', $cust_pay->paid) . qq!</B></TD>
</TR>
}
}
- return { 'error' => '', 'receipt_html' => $receipt_html, };
+ if ( $cust_pay ) {
+
+ my($gw, $auth, $order) = split(':', $cust_pay->paybatch);
+
+ return {
+ 'error' => '',
+ 'amount' => sprintf('%.2f', $cust_pay->paid),
+ 'date' => $cust_pay->_date,
+ 'date_pretty' => time2str('%Y-%m-%d', $cust_pay->_date),
+ 'time_pretty' => time2str('%T', $cust_pay->_date),
+ 'auth_num' => $auth,
+ 'order_num' => $order,
+ 'receipt_html' => $receipt_html,
+ };
+
+ } else {
+
+ return {
+ 'error' => '',
+ 'receipt_html' => '',
+ };
+
+ }
}
my $balance = 0;
return { 'error' => '',
+ 'balance' => $cust_main->balance,
'invoices' => [
map {
my $owed = $_->owed;
projects / freeside.git / blobdiff