X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fsignup.cgi;h=5c9d11c0168a9a07e0635a40662ae154ea226f90;hb=a816e075c54631250faed653d4ec7b69f727e93a;hp=fb4a7c55111a0993051e71539be7bad3c6c33248;hpb=81e426fe755eaea508041bc2d7b25ac44c777434;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index fb4a7c551..5c9d11c01 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -17,9 +17,11 @@ use subs qw( print_form print_okay print_decline
            );
 use CGI;
 #use CGI::Carp qw(fatalsToBrowser);
+use Tie::IxHash;
 use Text::Template;
 use Business::CreditCard;
 use HTTP::BrowserDetect;
+use HTML::Widgets::SelectLayers;
 use FS::SelfService qw( signup_info new_customer );
 
 #acceptable payment methods
@@ -139,7 +141,7 @@ if ( -e $decline_html ) {
 
 $cgi = new CGI;
 
-$init_data = signup_info( 'agentnum'   => $agentnum,
+$init_data = signup_info( 'agentnum'   => $agentnum || scalar($cgi->param('agentnum')),
                           'promo_code' => scalar($cgi->param('promo_code')),
                           'reg_code'   => uc(scalar($cgi->param('reg_code'))),
                         );
@@ -227,10 +229,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
                 mac_addr
-                countrycode phonenum sip_password pin
+                countrycode phonenum sip_password pin prepaid_shortform
               ),
             grep { /^snarf_/ } $cgi->param
         ),
@@ -244,13 +247,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')),
@@ -275,7 +287,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,
@@ -290,6 +302,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
@@ -300,9 +314,11 @@ sub print_collect {
 
   $error = "Error: $error" if $error;
 
+  my $rv = shift || {};
   my $r = {
     $cgi->Vars,
     %{$init_data},
+    %$rv,
     'error' => $error,
   };
 
@@ -312,14 +328,21 @@ sub print_collect {
   $r->{self_url} = $cgi->self_url;
 
   print $cgi->header( '-expires' => 'now' ),
+
         $collect_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
                                     HASH    => $r
                                   );
 }
 
 sub print_decline {
+  my $r = {
+    %{$init_data},
+  };
+
   print $cgi->header( '-expires' => 'now' ),
-        $decline_template->fill_in();
+        $decline_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
+                                    HASH    => $r
+                                  );
 }
 
 sub print_okay {
@@ -387,6 +410,8 @@ sub print_okay {
     print $cgi->header( '-expires' => 'now' ),
           $success_template->fill_in( HASH => {
 
+            %{$init_data},
+
             email_name     => $email_name,
             pkg            => $pkg,
             part_pkg       => \$part_pkg,
@@ -432,23 +457,25 @@ sub collect_default { #html to use if there is a collect phase
   <<'END';
 <HTML><HEAD><TITLE>Pay now</TITLE></HEAD>
 <BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Pay now</FONT><BR><BR>
-<SCRIPT TYPE="text/javascript">
-  function popcollect() {
-    overlib( OLiframeContent('<%= $popup_url %>', 336, 550, 'Secure Payment Area', 0, 'auto' ), CAPTION, 'Pay now', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, 'Close' );
-    return false;
-  }
-</SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="overlibmws_crossframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="iframecontentmws.js"></SCRIPT>
+<%=
+#<SCRIPT TYPE="text/javascript">
+#  function popcollect() {
+#    overlib( OLiframeContent('<%= $popup_url %>', 336, 550, 'Secure Payment Area', 0, 'auto' ), CAPTION, 'Pay now', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '#333399', CGCOLOR, '#333399', CLOSETEXT, 'Close' );
+#    return false;
+#  }
+#</SCRIPT>
+#<SCRIPT TYPE="text/javascript" SRC="overlibmws.js"></SCRIPT>
+#<SCRIPT TYPE="text/javascript" SRC="overlibmws_iframe.js"></SCRIPT>
+#<SCRIPT TYPE="text/javascript" SRC="overlibmws_draggable.js"></SCRIPT>
+#<SCRIPT TYPE="text/javascript" SRC="overlibmws_crossframe.js"></SCRIPT>
+#<SCRIPT TYPE="text/javascript" SRC="iframecontentmws.js"></SCRIPT>
+%>
 You are about to contact our payment processor to pay <%= $amount %> for
 <%= $pkg %>.<BR><BR>
 Your transaction reference number is <%= $reference %><BR><BR>
-<FORM NAME="collect_popper" method="post" action="javascript:void(0)" onSubmit="popcollect()">
+<FORM NAME="collect_popper" method="post" action="<%= $popup_url %>">
 <%=
-  my %itemhash = @collectitems;
+  my %itemhash = @collectitems ;
   foreach my $input (keys %itemhash) {
     $OUT .= qq!<INPUT NAME="$input" TYPE="hidden" VALUE="$itemhash{$input}">!;
   }