X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fsignup.cgi;h=acd7a62db9424873654fb6bca6dc75f9fb3dbb5b;hb=bb22f46481173b008fc9cb98b108ef1da9c1dc4d;hp=7d1679b5c6f5b66b0927768b43d7b38f917b4e99;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index 7d1679b5c..acd7a62db 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -201,13 +201,18 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
my $payinfo = $cgi->param('payinfo');
$payinfo =~ s/\D//g;
- $payinfo =~ /^(\d{13,16})$/
+ $payinfo =~ /^(\d{13,16}|\d{8,9})$/
or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
$payinfo = $1;
validate($payinfo)
or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
cardtype($payinfo) eq $cgi->param('CARD_type')
or $error ||= $init_data->{msgcat}{not_a}. $cgi->param('CARD_type');
+
+ $error ||= 'CVV2 is required'
+ if ! $cgi->param('paycvv')
+ && $init_data->{require_cvv};
+
}
if ($init_data->{emailinvoiceonly} && (length $cgi->param('invoicing_list') < 1)) {
@@ -229,10 +234,11 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
payby payinfo paycvv paydate payname paystate paytype
invoicing_list referral_custnum promo_code reg_code
+ override_ban_warn
pkgpart refnum agentnum
- username sec_phrase _password popnum
+ username sec_phrase _password popnum domsvc
mac_addr
- countrycode phonenum sip_password pin
+ countrycode phonenum sip_password pin prepaid_shortform
),
grep { /^snarf_/ } $cgi->param
),
@@ -246,13 +252,22 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
print_decline();
} elsif ( $error eq '_collect' ) {
map { $cgi->param($_, $rv->{$_}) }
- qw( popup_url reference collectitems amount );
- print_collect();
+ qw( popup_url reference amount );
+ print_collect($rv);
} elsif ( $error ) {
+
#fudge the snarf info
no strict 'refs';
${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param;
+
+ if ( $error =~ /^_duplicate_(card|ach)/ ) {
+ my $what = ($1 eq 'card') ? 'Credit card' : 'Electronic check';
+ $error = "Warning: $what already used to sign up recently";
+ $init_data->{'override_ban_warn'} = 1;
+ }
+
print_form();
+
} else {
print_okay(
'pkgpart' => scalar($cgi->param('pkgpart')),
@@ -277,7 +292,7 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
sub print_form {
- $error = "Error: $error" if $error;
+ $error = "Error: $error" if $error && $error !~ /^Warning:/i;
my $r = {
$cgi->Vars,
@@ -292,6 +307,8 @@ sub print_form {
#$cgi->delete('init_popstate');
$r->{self_url} = $cgi->self_url;
+ $r->{prepaid_shortform} = $cgi->param('prepaid_shortform');
+
print $cgi->header( '-expires' => 'now' ),
$signup_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
HASH => $r
@@ -302,9 +319,11 @@ sub print_collect {
$error = "Error: $error" if $error;
+ my $rv = shift || {};
my $r = {
$cgi->Vars,
%{$init_data},
+ %$rv,
'error' => $error,
};
@@ -314,6 +333,7 @@ sub print_collect {
$r->{self_url} = $cgi->self_url;
print $cgi->header( '-expires' => 'now' ),
+
$collect_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
HASH => $r
);
@@ -442,23 +462,25 @@ sub collect_default { #html to use if there is a collect phase
<<'END';
Pay now
Pay now
-
-
-
-
-
-
+<%=
+#
+#
+#
+#
+#
+#
+%>
You are about to contact our payment processor to pay <%= $amount %> for
<%= $pkg %>.
Your transaction reference number is <%= $reference %>
-