projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ba67ee
)
set resellser-specific advertising sources in signup
author
ivan
<ivan>
Fri, 2 Feb 2007 04:39:59 +0000
(
04:39
+0000)
committer
ivan
<ivan>
Fri, 2 Feb 2007 04:39:59 +0000
(
04:39
+0000)
FS/FS/ClientAPI/Signup.pm
patch
|
blob
|
history
diff --git
a/FS/FS/ClientAPI/Signup.pm
b/FS/FS/ClientAPI/Signup.pm
index
1f06a49
..
4519dc0
100644
(file)
--- a/
FS/FS/ClientAPI/Signup.pm
+++ b/
FS/FS/ClientAPI/Signup.pm
@@
-23,28
+23,21
@@
sub signup_info {
my $conf = new FS::Conf;
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 }
'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 }
],
'part_referral' =>
[
map { $_->hashref }
- qsearch('part_referral',
- dbdef->table('part_referral')->column('disabled')
- ? { 'disabled' => '' }
- : {}
- )
+ qsearch('part_referral', { 'disabled' => '' })
],
'agentnum2part_pkg' =>
],
'agentnum2part_pkg' =>
@@
-61,10
+54,7
@@
sub signup_info {
grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
qsearch( 'part_pkg', { 'disabled' => '' } )
];
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',{} ) ],
},
'svc_acct_pop' => [ map { $_->hashref } qsearch('svc_acct_pop',{} ) ],
@@
-77,9
+67,9
@@
sub signup_info {
'card_types' => card_types(),
'card_types' => card_types(),
- 'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'),
+ 'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'),
# 1,
- 'ship_enabled' => defined dbdef->table('cust_main')->column('ship_last'),
+ '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
'msgcat' => { map { $_=>gettext($_) } qw(
passwords_dont_match invalid_card unknown_card_type not_a empty_password illegal_or_empty_text
@@
-95,6
+85,8
@@
sub signup_info {
};
};
+ my $signup_info = { %$signup_info_cache };
+
my @addl = qw( signup_server-classnum2 signup_server-classnum3 );
if ( grep { $conf->exists($_) } @addl ) {
my @addl = qw( signup_server-classnum2 signup_server-classnum3 );
if ( grep { $conf->exists($_) } @addl ) {
@@
-120,6
+112,8
@@
sub signup_info {
my $agentnum = $packet->{'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'} ) {
my $session = '';
if ( exists $packet->{'session_id'} ) {
@@
-189,6
+183,19
@@
sub signup_info {
if ( $agentnum && ! @{ $signup_info->{'part_pkg'} } ) {
$signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum};
if ( $agentnum && ! @{ $signup_info->{'part_pkg'} } ) {
$signup_info->{'part_pkg'} = $signup_info->{'agentnum2part_pkg'}{$agentnum};
+
+ $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'};
}
# else {
# delete $signup_info->{'part_pkg'};