[freeside-commits] freeside/FS/FS/ClientAPI MyAccount.pm,1.42,1.43

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/ClientAPI
In directory wavetail:/tmp/cvs-serv14044/FS/FS/ClientAPI

Modified Files:
	MyAccount.pm 
Log Message:
add card-types configuration value for self-service

Index: MyAccount.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/ClientAPI/MyAccount.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- MyAccount.pm	5 Nov 2006 18:03:19 -0000	1.42
+++ MyAccount.pm	14 Nov 2006 02:54:07 -0000	1.43
@@ -204,33 +204,62 @@
   #generic
   ##
 
-  my $conf = new FS::Conf;
-  my %states = map { $_->state => 1 }
-                 qsearch('cust_main_county', {
-                   'country' => $conf->config('countrydefault') || 'US'
-                 } );
-
   use vars qw($payment_info); #cache for performance
-  $payment_info ||= {
+  unless ( $payment_info ) {
 
-    #list all counties/states/countries
-    'cust_main_county' => 
-      [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+    my $conf = new FS::Conf;
+    my %states = map { $_->state => 1 }
+                   qsearch('cust_main_county', {
+                     'country' => $conf->config('countrydefault') || 'US'
+                   } );
 
-    #shortcut for one-country folks
-    'states' =>
-      [ sort { $a cmp $b } keys %states ],
+    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;
+    }
 
-    'card_types' => {
-      'VISA' => 'VISA card',
-      'MasterCard' => 'MasterCard',
-      'Discover' => 'Discover card',
-      'American Express' => 'American Express card',
-      'Switch' => 'Switch',
-      'Solo' => 'Solo',
-    },
+    $payment_info = {
 
-  };
+      #list all counties/states/countries
+      'cust_main_county' => 
+        [ map { $_->hashref } qsearch('cust_main_county', {}) ],
+
+      #shortcut for one-country folks
+      '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',
+      },
+
+    };
+
+  }
 
   ##
   #customer-specific