use FS::Conf;
use FS::Record qw(qsearch qsearchs dbdef);
use FS::Msgcat qw(gettext);
+use FS::Misc qw(card_types);
use FS::ClientAPI_SessionCache;
use FS::agent;
use FS::cust_main_county;
my $conf = new FS::Conf;
- use vars qw($signup_info); #cache for performance;
- $signup_info ||= {
+ use vars qw($signup_info_cache); #cache for performance;
+ $signup_info_cache ||= {
'cust_main_county' =>
[ map { $_->hashref } qsearch('cust_main_county', {}) ],
'agent' =>
[
map { $_->hashref }
- qsearch('agent', dbdef->table('agent')->column('disabled')
- ? { 'disabled' => '' }
- : {}
- )
+ qsearch('agent', { 'disabled' => '' } )
],
'part_referral' =>
[
map { $_->hashref }
- qsearch('part_referral',
- dbdef->table('part_referral')->column('disabled')
- ? { 'disabled' => '' }
- : {}
- )
+ qsearch('part_referral', { 'disabled' => '' })
],
'agentnum2part_pkg' =>
my $href = $_->pkgpart_hashref;
$_->agentnum =>
[
- map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+ map { { 'payby' => [ $_->payby ],
+ 'freq_pretty' => $_->freq_pretty,
+ 'options' => { $_->options },
+ %{$_->hashref}
+ } }
grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
qsearch( 'part_pkg', { 'disabled' => '' } )
];
- } qsearch('agent', dbdef->table('agent')->column('disabled')
- ? { 'disabled' => '' }
- : {}
- )
+ } qsearch('agent', { 'disabled' => '' })
},
'svc_acct_pop' => [ map { $_->hashref } qsearch('svc_acct_pop',{} ) ],
'payby' => [ $conf->config('signup_server-payby') ],
- 'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'),
+ 'card_types' => card_types(),
+
+ 'paytypes' => [ @FS::cust_main::paytypes ],
- 'ship_enabled' => defined dbdef->table('cust_main')->column('ship_last'),
+ 'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'), # 1,
+
+ 'stateid_enabled' => $conf->exists('show_stateid'),
+
+ 'paystate_enabled' => $conf->exists('show_bankstate'),
+
+ 'ship_enabled' => defined dbdef->table('cust_main')->column('ship_last'),#1,
'msgcat' => { map { $_=>gettext($_) } qw(
passwords_dont_match invalid_card unknown_card_type not_a empty_password illegal_or_empty_text
) },
+ 'label' => { map { $_ => FS::Msgcat::_gettext($_) } qw(
+ stateid stateid_state
+ ) },
+
'statedefault' => $conf->config('statedefault') || 'CA',
'countrydefault' => $conf->config('countrydefault') || 'US',
'refnum' => $conf->config('signup_server-default_refnum'),
+ 'default_pkgpart' => $conf->config('signup_server-default_pkgpart'),
+
};
+ my $signup_info = { %$signup_info_cache };
+
my @addl = qw( signup_server-classnum2 signup_server-classnum3 );
if ( grep { $conf->exists($_) } @addl ) {
foreach my $addl ( @addl ) {
my $classnum = $conf->config($addl) or next;
- my @pkgs = map { $_->hashref }
+
+ my @pkgs = map { {
+ 'freq_pretty' => $_->freq_pretty,
+ 'options' => { $_->options },
+ %{ $_->hashref }
+ };
+ }
qsearch( 'part_pkg', { classnum => $classnum } );
+
push @{$signup_info->{optional_packages}}, \@pkgs;
+
}
}
- my $agentnum = $conf->config('signup_server-default_agentnum');
+ my $agentnum = $packet->{'agentnum'}
+ || $conf->config('signup_server-default_agentnum');
+ $agentnum =~ /^(\d*)$/ or die "illegal agentnum";
+ $agentnum = $1;
my $session = '';
if ( exists $packet->{'session_id'} ) {
} else {
return { 'error' => "Can't resume session" }; #better error message
}
+ }elsif( exists $packet->{'customer_session_id'} ) {
+ my $cache = new FS::ClientAPI_SessionCache( {
+ 'namespace' => 'FS::ClientAPI::MyAccount',
+ } );
+ $session = $cache->get($packet->{'customer_session_id'});
+ if ( $session ) {
+ my $custnum = $session->{'custnum'};
+ my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum });
+ return { 'error' => "Can't find your customer record" } unless $cust_main;
+ $agentnum = $cust_main->agentnum;
+ } else {
+ return { 'error' => "Can't resume session" }; #better error message
+ }
}
$signup_info->{'part_pkg'} = [];
if ( $packet->{'reg_code'} ) {
$signup_info->{'part_pkg'} =
- [ map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+ [ map { { 'payby' => [ $_->payby ],
+ 'freq_pretty' => $_->freq_pretty,
+ 'options' => { $_->options },
+ %{$_->hashref}
+ };
+ }
grep { $_->svcpart('svc_acct') }
map { $_->part_pkg }
qsearchs( 'reg_code', { 'code' => $packet->{'reg_code'},
} elsif ( $packet->{'promo_code'} ) {
$signup_info->{'part_pkg'} =
- [ map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+ [ map { { 'payby' => [ $_->payby ],
+ 'freq_pretty' => $_->freq_pretty,
+ 'options' => { $_->options },
+ %{$_->hashref}
+ } }
grep { $_->svcpart('svc_acct') }
qsearch( 'part_pkg', { 'promo_code' => {
op=>'ILIKE',
unless @{ $signup_info->{'part_pkg'} };
}
- if ( $agentnum && ! @{ $signup_info->{'part_pkg'} } ) {
- $signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum};
+ if ( $agentnum ) {
+ $signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum}
+ unless @{ $signup_info->{'part_pkg'} };
+
+ $signup_info->{'part_referral'} =
+ [
+ map { $_->hashref }
+ qsearch( {
+ 'table' => 'part_referral',
+ 'hashref' => { 'disabled' => '' },
+ 'extra_sql' => "AND ( agentnum = $agentnum ".
+ " OR agentnum IS NULL ) ",
+ },
+ )
+ ];
+
}
# else {
# delete $signup_info->{'part_pkg'};
#}
- if ( $session ) {
+ $signup_info->{'part_pkg'} = [ sort { $a->{pkg} cmp $b->{pkg} } # case?
+ @{ $signup_info->{'part_pkg'} }
+ ];
+
+ if ( exists $packet->{'session_id'} ) {
my $agent_signup_info = { %$signup_info };
delete $agent_signup_info->{agentnum2part_pkg};
$agent_signup_info->{'agent'} = $session->{'agent'};
last first ss company address1 address2
city county state zip country
- daytime night fax
+ daytime night fax stateid stateid_state
ship_last ship_first ship_ss ship_company ship_address1 ship_address2
ship_city ship_county ship_state ship_zip ship_country
ship_daytime ship_night ship_fax
payby
- payinfo paycvv paydate payname
+ payinfo paycvv paydate payname paystate paytype
paystart_month paystart_year payissue
payip
$cust_main->payinfo($cust_main->daytime)
if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
- my @invoicing_list = split( /\s*\,\s*/, $packet->{'invoicing_list'} );
+ my @invoicing_list = $packet->{'invoicing_list'}
+ ? split( /\s*\,\s*/, $packet->{'invoicing_list'} )
+ : ();
$packet->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
my $pkgpart = $1;
#warn "[fs_signup_server] error billing new customer: $bill_error"
# if $bill_error;
- $cust_main->apply_payments;
- $cust_main->apply_credits;
+ $cust_main->apply_payments_and_credits;
$bill_error = $cust_main->collect('realtime' => 1);
#warn "[fs_signup_server] error collecting from new customer: $bill_error"
projects / freeside.git / blobdiff