diff options
author | ivan <ivan> | 2006-11-14 03:16:26 +0000 |
---|---|---|
committer | ivan <ivan> | 2006-11-14 03:16:26 +0000 |
commit | fed0c6bf093ae154d17a4075e254a69be68f3d22 (patch) | |
tree | 7ab74f945bbfc06f64134de4ac509c46a4fff3f6 /FS/FS/ClientAPI | |
parent | 085d6dcbe3a137d8d8ad0b04b6d9c0af1516ee5e (diff) |
have signup page use card-types config too
Diffstat (limited to 'FS/FS/ClientAPI')
-rw-r--r-- | FS/FS/ClientAPI/MyAccount.pm | 35 | ||||
-rw-r--r-- | FS/FS/ClientAPI/Signup.pm | 3 |
2 files changed, 5 insertions, 33 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index c0fb46b4f..16b207132 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -11,6 +11,7 @@ use FS::CGI qw(small_custview); #doh use FS::Conf; use FS::Record qw(qsearch qsearchs); use FS::Msgcat qw(gettext); +use FS::Misc qw(card_types); use FS::ClientAPI_SessionCache; use FS::svc_acct; use FS::svc_domain; @@ -213,31 +214,6 @@ sub payment_info { 'country' => $conf->config('countrydefault') || 'US' } ); - my %card_types = ( - #displayname #value (Business::CreditCard) - "VISA" => "VISA card", - "MasterCard" => "MasterCard", - "Discover" => "Discover card", - "American Express" => "American Express card", - "Diner's Club/Carte Blanche" => "Diner's Club/Carte Blanche", - "enRoute" => "enRoute", - "JCB" => "JCB", - "BankCard" => "BankCard", - "Switch" => "Switch", - "Solo" => "Solo", - ); - my @conf_card_types = grep { ! /^\s*$/ } $conf->config('card-types'); - if ( @conf_card_types ) { - #perhaps the hash is backwards for this, but this way works better for - #usage in selfservice - %card_types = map { $_ => $card_types{$_} } - grep { - my $d = $_; - grep { $card_types{$d} eq $_ } @conf_card_types - } - keys %card_types; - } - $payment_info = { #list all counties/states/countries @@ -248,14 +224,7 @@ sub payment_info { 'states' => [ sort { $a cmp $b } keys %states ], - 'card_types' => { - 'VISA' => 'VISA card', - 'MasterCard' => 'MasterCard', - 'Discover' => 'Discover card', - 'American Express' => 'American Express card', - 'Switch' => 'Switch', - 'Solo' => 'Solo', - }, + 'card_types' => card_types(), }; diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm index 2af770c75..3daab9d81 100644 --- a/FS/FS/ClientAPI/Signup.pm +++ b/FS/FS/ClientAPI/Signup.pm @@ -5,6 +5,7 @@ use Tie::RefHash; 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; @@ -70,6 +71,8 @@ sub signup_info { 'payby' => [ $conf->config('signup_server-payby') ], + 'card_types' => card_types(), + 'cvv_enabled' => defined dbdef->table('cust_main')->column('paycvv'), 'ship_enabled' => defined dbdef->table('cust_main')->column('ship_last'), |