X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fsignup.cgi;h=02acf14aaf629862929e134006126ab8ac52b239;hp=e07b6ee5ae4b119807e7c2b4ab8a2a1c50ed12b0;hb=90393980e5f2859ee1e186fa461f48f5129e803e;hpb=5e05724a635a22776f1b973f5d7e77989da4e048

diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index e07b6ee5a..02acf14aa 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -8,17 +8,20 @@ use vars qw( @payby $cgi $init_data
              $ieak_file $ieak_template
              $signup_html $signup_template
              $success_html $success_template
+             $collect_html $collect_template
              $decline_html $decline_template
            );
 
 use subs qw( print_form print_okay print_decline
-             success_default decline_default
+             success_default collect_default decline_default
            );
 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
@@ -35,6 +38,9 @@ $signup_html = -e 'signup.html'
 $success_html = -e 'success.html'
                   ? 'success.html'
                   : '/usr/local/freeside/success.html';
+$collect_html = -e 'collect.html'
+                  ? 'collect.html'
+                  : '/usr/local/freeside/collect.html';
 $decline_html = -e 'decline.html'
                   ? 'decline.html'
                   : '/usr/local/freeside/decline.html';
@@ -65,7 +71,7 @@ if ( -e $signup_html ) {
                                         )
     or die $Text::Template::ERROR;
   if ( $signup_txt =~
-         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si
+         /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*\/?\s*>/si
   ) {
     $agentnum = $1;
   }
@@ -97,6 +103,24 @@ if ( -e $success_html ) {
     or die $Text::Template::ERROR;
 }
 
+if ( -e $collect_html ) {
+  my $collect_txt = Text::Template::_load_text($collect_html)
+    or die $Text::Template::ERROR;
+  $collect_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+  $collect_txt = $1;
+  $collect_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => $collect_txt,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+} else {
+  $collect_template = new Text::Template ( TYPE => 'STRING',
+                                           SOURCE => &collect_default,
+                                           DELIMITERS => [ '<%=', '%>' ],
+                                         )
+    or die $Text::Template::ERROR;
+}
+
 if ( -e $decline_html ) {
   my $decline_txt = Text::Template::_load_text($decline_html)
     or die $Text::Template::ERROR;
@@ -117,14 +141,15 @@ 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'))),
                         );
 
-if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
-     || ( defined($cgi->param('action')) && $cgi->param('action') eq 'process_signup' )
-   ) {
+my $magic  = $cgi->param('magic') || '';
+my $action = $cgi->param('action') || '';
+
+if ( $magic eq 'process' || $action eq 'process_signup' ) {
 
     $error = '';
 
@@ -165,6 +190,7 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
       $cgi->param('invoicing_list' => 'POST' );
     }
 
+    #if ( $svc_x eq 'svc_acct' ) {
     if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
       $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
       $cgi->param('_password', '');
@@ -188,8 +214,9 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
 	$error ||= $init_data->{msgcat}{illegal_or_empty_text};
     }
 
+    my $rv = '';
     unless ( $error ) {
-      my $rv = new_customer( {
+      $rv = new_customer( {
         ( map { $_ => scalar($cgi->param($_)) }
             qw( last first ss company
                 address1 address2 city county state zip country
@@ -202,8 +229,10 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
 
                 payby payinfo paycvv paydate payname paystate paytype
                 invoicing_list referral_custnum promo_code reg_code
-                pkgpart username sec_phrase _password popnum refnum
-                agentnum
+                pkgpart refnum agentnum
+                username sec_phrase _password popnum
+                mac_addr
+                countrycode phonenum sip_password pin
               ),
             grep { /^snarf_/ } $cgi->param
         ),
@@ -215,6 +244,10 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
     
     if ( $error eq '_decline' ) {
       print_decline();
+    } elsif ( $error eq '_collect' ) {
+      map { $cgi->param($_, $rv->{$_}) }
+        qw( popup_url reference amount );
+      print_collect($rv);
     } elsif ( $error ) {
       #fudge the snarf info
       no strict 'refs';
@@ -223,9 +256,20 @@ if (    ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
     } else {
       print_okay(
         'pkgpart' => scalar($cgi->param('pkgpart')),
+        %$rv,
       );
     }
 
+} elsif ( $magic eq 'success' || $action eq 'success' ) {
+
+  $cgi->param('username', 'username');  #hmmm temp kludge
+  $cgi->param('_password', 'password');
+  print_okay( map { /^([\w ]+)$/ ? ( $_ => $1 ) : () } $cgi->param ); #hmmm
+
+} elsif ( $magic eq 'decline' || $action eq 'decline' ) {
+
+  print_decline();
+
 } else {
   $error = '';
   print_form;
@@ -254,21 +298,69 @@ sub print_form {
                                  );
 }
 
+sub print_collect {
+
+  $error = "Error: $error" if $error;
+
+  my $rv = shift || {};
+  my $r = {
+    $cgi->Vars,
+    %{$init_data},
+    %$rv,
+    'error' => $error,
+  };
+
+  $r->{pkgpart} ||= $r->{default_pkgpart};
+
+  $r->{referral_custnum} = $r->{'ref'};
+  $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 {
   my %param = @_;
   my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
 
-  $cgi->param('username') =~ /^(.+)$/
-    or die "fatal: invalid username got past FS::SelfService::new_customer";
-  my $username = $1;
-  $cgi->param('_password') =~ /^(.+)$/
-    or die "fatal: invalid password got past FS::SelfService::new_customer";
-  my $password = $1;
+  my( $username, $password ) = ( '', '' );
+  my( $countrycode, $phonenum, $sip_password, $pin ) = ( '', '', '', '' );
+
+  my $svc_x = $param{signup_service} || 'svc_acct'; #just in case
+  if ( $svc_x eq 'svc_acct' ) {
+
+    $cgi->param('username') =~ /^(.+)$/
+      or die "fatal: invalid username got past FS::SelfService::new_customer";
+    $username = $1;
+    $cgi->param('_password') =~ /^(.+)$/
+      or die "fatal: invalid password got past FS::SelfService::new_customer";
+    $password = $1;
+
+  } elsif ( $svc_x eq 'svc_phone' ) {
+
+    $countrycode  = $param{countrycode};
+    $phonenum     = $param{phonenum};
+    $sip_password = $param{sip_password};
+    $pin          = $param{pin};
+
+  } else {
+    die "unknown signup service $svc_x";
+  }
+
   ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
     or die "fatal: invalid email_name got past FS::SelfService::new_customer";
   my $email_name = $1; #global for template
@@ -296,23 +388,41 @@ sub print_okay {
   my $pkg =  $part_pkg->{'pkg'};
 
   if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
+
     #send an IEAK config
     print $cgi->header('application/x-Internet-signup'),
           $ieak_template->fill_in();
+
   } else { #send a simple confirmation
+
     print $cgi->header( '-expires' => 'now' ),
           $success_template->fill_in( HASH => {
-            username   => $username,
-            password   => $password,
-            _password  => $password,
-            email_name => $email_name,
-            ac         => $ac,
-            exch       => $exch,
-            loc        => $loc,
-            pkg        => $pkg,
-            part_pkg   => \$part_pkg,
+
+            %{$init_data},
+
+            email_name     => $email_name,
+            pkg            => $pkg,
+            part_pkg       => \$part_pkg,
+
+            signup_service => $svc_x,
+
+            #for svc_acct
+            username       => $username,
+            password       => $password,
+            _password      => $password,
+            ac             => $ac,   #for dialup POP
+            exch           => $exch, #
+            loc            => $loc,  #
+
+            #for svc_phone
+            countrycode    => $countrycode,
+            phonenum       => $phonenum,
+            sip_password   => $sip_password,
+            pin            => $pin,
+
           });
   }
+
 }
 
 sub success_default { #html to use if you don't specify a success file
@@ -331,6 +441,39 @@ Package: <%= $pkg %><BR>
 END
 }
 
+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>
+%>
+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="<%= $popup_url %>">
+<%=
+  my %itemhash = @collectitems ;
+  foreach my $input (keys %itemhash) {
+    $OUT .= qq!<INPUT NAME="$input" TYPE="hidden" VALUE="$itemhash{$input}">!;
+  }
+%>
+<INPUT NAME="submit" type="submit" value="Pay now">
+</FORM>
+</BODY></HTML>
+END
+}
+
 sub decline_default { #html to use if there is a decline
   <<'END';
 <HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
@@ -345,5 +488,5 @@ END
 
 package FS::SelfService::_signupcgi;
 use HTML::Entities;
-use FS::SelfService qw(regionselector expselect popselector);
+use FS::SelfService qw(regionselector expselect popselector didselector);