prepaid download/upload tracking

[freeside.git] / fs_selfservice / FS-SelfService / cgi / signup.html

diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index a52ddae..c2c5d70 100755 (executable)
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -120,15 +120,9 @@ Contact Information
   <%=
 
     my $cardselect = '<SELECT NAME="CARD_type"><OPTION></OPTION>';
-    my %types = (
-                  'VISA' => 'VISA card',
-                  'MasterCard' => 'MasterCard',
-                  'Discover' => 'Discover card',
-                  'American Express' => 'American Express card',
-                );
-    foreach ( keys %types ) {
-      $selected = $CARD_type eq $types{$_} ? 'SELECTED' : '';
-      $cardselect .= qq!<OPTION $selected VALUE="$types{$_}">$_</OPTION>!;
+    foreach ( keys %card_types ) {
+      $selected = $CARD_type eq $card_types{$_} ? 'SELECTED' : '';
+      $cardselect .= qq!<OPTION $selected VALUE="$card_types{$_}">$_</OPTION>!;
     }
     $cardselect .= '</SELECT>';
   
@@ -207,7 +201,8 @@ HTML::Widgets::SelectLayers->new(
   <TD COLSPAN=2><SELECT NAME="pkgpart">
 
   <%=
-    $OUT .= '<OPTION VALUE="">(none)' unless scalar(@part_pkg ) ==1;
+    $OUT .= '<OPTION VALUE="">(none)'
+      unless scalar(@part_pkg) == 1 or $default_pkgpart;
     foreach my $part_pkg ( @part_pkg ) {
       $OUT .= '<OPTION VALUE="'. $part_pkg->{'pkgpart'}. '"';
       $OUT .= ' SELECTED' if $pkgpart && $part_pkg->{'pkgpart'} == $pkgpart;