[freeside-commits] freeside/fs_selfservice/FS-SelfService/cgi login.html, 1.7, 1.7.2.1 selfservice.cgi, 1.43, 1.43.2.1 signup.html, 1.18.2.1, 1.18.2.2 decline.html, 1.1, 1.1.8.1 success.html, 1.3, 1.3.2.1 signup.cgi, 1.13.2.1, 1.13.2.2

Ivan,,, ivan at wavetail.420.am
Fri Oct 23 19:04:47 PDT 2009


Update of /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi
In directory wavetail.420.am:/tmp/cvs-serv31170/fs_selfservice/FS-SelfService/cgi

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	login.html selfservice.cgi signup.html decline.html 
	success.html signup.cgi 
Log Message:
remove an inadvertant debugging call left in, allow an agentnum to be specfied for non-logged in situations, RT#6166

Index: selfservice.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/selfservice.cgi,v
retrieving revision 1.43
retrieving revision 1.43.2.1
diff -u -d -r1.43 -r1.43.2.1
--- selfservice.cgi	4 Oct 2009 23:36:06 -0000	1.43
+++ selfservice.cgi	24 Oct 2009 02:04:45 -0000	1.43.2.1
@@ -29,7 +29,7 @@
 $cgi = new CGI;
 
 unless ( defined $cgi->param('session') ) {
-  my $login_info = login_info();
+  my $login_info = login_info( 'agentnum' => scalar($cgi->param('agentnum')) );
 
   do_template('login', $login_info );
   exit;
@@ -55,7 +55,7 @@
     'password' => $password,
   );
   if ( $rv->{error} ) {
-    my $login_info = login_info();
+    my $login_info = login_info( 'agentnum' => $cgi->param('agentnum') );
     do_template('login', {
       'error'    => $rv->{error},
       'username' => $username,

Index: decline.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/decline.html,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- decline.html	12 Mar 2005 14:31:49 -0000	1.1
+++ decline.html	24 Oct 2009 02:04:45 -0000	1.1.8.1
@@ -1,5 +1,14 @@
-<HTML><HEAD><TITLE>Processing error</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR>
+<HTML>
+  <HEAD>
+    <TITLE>Processing error</TITLE>
+    <%= $head %>
+  </HEAD>
+  <BODY BGCOLOR="<%= $body_bgcolor || '#eeeeee' %>">
+  <%= $body_header %>
+
+
+<FONT SIZE=7>Processing error</FONT><BR><BR>
 There has been an error processing your account.  Please contact customer
 support.
-</BODY></HTML>
+
+<%= $body_footer %>

Index: signup.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/signup.html,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- signup.html	12 Oct 2009 09:10:21 -0000	1.18.2.1
+++ signup.html	24 Oct 2009 02:04:45 -0000	1.18.2.2
@@ -30,6 +30,7 @@
 <FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true">
 <INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>">
 <INPUT TYPE="hidden" NAME="action" VALUE="process_signup">
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
 <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $referral_custnum %>">
 <INPUT TYPE="hidden" NAME="ss" VALUE="">
 <input type="hidden" name="payby">

Index: login.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/login.html,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- login.html	10 Aug 2009 11:50:04 -0000	1.7
+++ login.html	24 Oct 2009 02:04:45 -0000	1.7.2.1
@@ -11,6 +11,7 @@
 
 <FORM ACTION="<%= $self_url %>" METHOD=POST>
 <INPUT TYPE="hidden" NAME="session" VALUE="login">
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>">
 
 <TABLE BGCOLOR="<%= $box_bgcolor || '#c0c0c0' %>" BORDER=0 CELLSPACING=2 CELLPADDING=0>
 

Index: success.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/success.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- success.html	10 Sep 2009 17:55:10 -0000	1.3
+++ success.html	24 Oct 2009 02:04:45 -0000	1.3.2.1
@@ -1,10 +1,10 @@
 <HTML>
-
-<HEAD>
-  <TITLE>Signup successful</TITLE>
-</HEAD>
-
-<BODY BGCOLOR="#e8e8e8">
+  <HEAD>
+    <TITLE>Signup successful</TITLE>
+    <%= $head %>
+  </HEAD>
+  <BODY BGCOLOR="<%= $body_bgcolor || '#eeeeee' %>">
+  <%= $body_header %>
 
 <FONT SIZE=7>Signup successful</FONT><BR><BR>
 
@@ -37,5 +37,4 @@
 
   Package: <%= $pkg %><BR>
 
-</BODY>
-</HTML>
+<%= $body_footer %>

Index: signup.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/fs_selfservice/FS-SelfService/cgi/signup.cgi,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- signup.cgi	12 Oct 2009 09:10:20 -0000	1.13.2.1
+++ signup.cgi	24 Oct 2009 02:04:45 -0000	1.13.2.2
@@ -141,7 +141,7 @@
 
 $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'))),
                         );
@@ -320,8 +320,14 @@
 }
 
 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 {
@@ -389,6 +395,8 @@
     print $cgi->header( '-expires' => 'now' ),
           $success_template->fill_in( HASH => {
 
+            %{$init_data},
+
             email_name     => $email_name,
             pkg            => $pkg,
             part_pkg       => \$part_pkg,



More information about the freeside-commits mailing list