From: ivan Date: Sat, 12 Mar 2005 14:35:12 +0000 (+0000) Subject: - bring prepaid support into this century (close: Bug#1124) X-Git-Tag: BEFORE_FINAL_MASONIZE~651 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=a6cbda0b7e6779b89abc1d466af9c3a880d8e030;ds=sidebyside - bring prepaid support into this century (close: Bug#1124) - finally get rid of fs_signup (everything is in fs_selfservice now) (Bug#413) - organize main menu sysadmin section so it is slightly less confusing --- diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi index afae1f167..d2ad0d64b 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.cgi +++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi @@ -1,7 +1,7 @@ #!/usr/bin/perl -T #!/usr/bin/perl -Tw # -# $Id: signup.cgi,v 1.1 2005-03-12 14:31:50 ivan Exp $ +# $Id: signup.cgi,v 1.2 2005-03-12 14:35:12 ivan Exp $ use strict; use vars qw( @payby $cgi $init_data @@ -12,24 +12,7 @@ use vars qw( @payby $cgi $init_data $success_html $success_template $decline_html $decline_template ); - #$locales $packages - #$pops %pop %popnum2pop - #$last $first $ss $company $address1 - #$address2 $city $state $county - #$country $zip $daytime $night $fax - - #$ship_last $ship_first $ship_ss $ship_company $ship_address1 - #$ship_address2 $ship_city $ship_state $ship_county - #$ship_country $ship_zip $ship_daytime $ship_night $ship_fax - - #$invoicing_list $payby $payinfo - #$paycvv $paydate $payname $referral_custnum $init_popstate - #$pkgpart $username $_password $_password2 $sec_phrase $popnum - #$refnum - - #$ac $exch $loc - #$email_name $pkg use subs qw( print_form print_okay print_decline success_default decline_default ); @@ -140,49 +123,11 @@ $init_data = signup_info( 'agentnum' => $agentnum, 'promo_code' => scalar($cgi->param('promo_code')), 'reg_code' => uc(scalar($cgi->param('reg_code'))), ); -#$error = $init_data->{'error'}; -#$locales = $init_data->{'cust_main_county'}; -#$packages = $init_data->{'part_pkg'}; -#$pops = $init_data->{'svc_acct_pop'}; -#@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}}; -#$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum; if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' ) || ( defined($cgi->param('action')) && $cgi->param('action') eq 'process_signup' ) ) { -# if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) { -# $state = $1; -# $county = $3 || ''; -# $country = $4; -# } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) { -# $state = $1; -# $cgi->param('county') =~ /^([\w ]*)$/ -# or die "illegal county: ". $cgi->param('county'); -# $county = $1; -# $cgi->param('country') =~ /^(\w+)$/ -# or die "illegal country: ". $cgi->param('country'); -# $country = $1; -# } else { -# die "illegal state: ". $cgi->param('state'); -# } -# if ( $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) { -# $ship_state = $1; -# $ship_county = $3 || ''; -# $ship_country = $4; -# } elsif ( $cgi->param('ship_state') =~ /^(\w*)$/ ) { -# $ship_state = $1; -# $cgi->param('ship_county') =~ /^([\w ]*)$/ -# or die "illegal county: ". $cgi->param('ship_county'); -# $ship_county = $1; -# #$cgi->param('ship_country') =~ /^(\w+)$/ -# $cgi->param('ship_country') =~ /^(\w*)$/ -# or die "illegal ship_country: ". $cgi->param('ship_country'); -# $ship_country = $1; -# #} else { -# # die "illegal ship_state: ". $cgi->param('ship_state'); -# } - $error = ''; $cgi->param('agentnum', $agentnum) if $agentnum; @@ -271,47 +216,6 @@ if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' ) } else { $error = ''; -# $last = ''; -# $first = ''; -# $ss = ''; -# $company = ''; -# $address1 = ''; -# $address2 = ''; -# $city = ''; -# $state = $init_data->{statedefault}; -# $county = ''; -# $country = $init_data->{countrydefault}; -# $zip = ''; -# $daytime = ''; -# $night = ''; -# $fax = ''; -# $ship_last = ''; -# $ship_first = ''; -# $ship_company = ''; -# $ship_address1 = ''; -# $ship_address2 = ''; -# $ship_city = ''; -# $ship_state = $init_data->{statedefault}; -# $ship_county = ''; -# $ship_country = $init_data->{countrydefault}; -# $ship_zip = ''; -# $ship_daytime = ''; -# $ship_night = ''; -# $ship_fax = ''; -# $invoicing_list = ''; -# $payby = ''; -# $payinfo = ''; -# $paydate = ''; -# $payname = ''; -# $pkgpart = ''; -# $username = ''; -# $_password = ''; -# $_password2 = ''; -# $sec_phrase = ''; -# $popnum = ''; -# $referral_custnum = $cgi->param('ref') || ''; -# $init_popstate = $cgi->param('init_popstate') || ''; -# $refnum = $init_data->{'refnum'}; print_form; } diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html index 3532527a2..2ab07b37e 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.html +++ b/fs_selfservice/FS-SelfService/cgi/signup.html @@ -14,10 +14,10 @@ //--> <%= $agent || 'ISP' %> Signup form

<%= $error %> -
+ - + Where did you hear about our service? + -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fs_selfservice/FS-SelfService/cgi/success.html b/fs_selfservice/FS-SelfService/cgi/success.html new file mode 100644 index 000000000..397cc6c30 --- /dev/null +++ b/fs_selfservice/FS-SelfService/cgi/success.html @@ -0,0 +1,11 @@ +Signup successful +Signup successful

+Thanks for signing up! +

+Signup information for <%= $email_name %>: +

+Username: <%= $username %>
+Password: <%= $password %>
+Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %>
+Package: <%= $pkg %>
+ diff --git a/fs_signup/FS-SignupClient/Changes b/fs_signup/FS-SignupClient/Changes deleted file mode 100644 index e750a82bc..000000000 --- a/fs_signup/FS-SignupClient/Changes +++ /dev/null @@ -1,5 +0,0 @@ -Revision history for Perl extension FS::SignupClient. - -0.01 Mon Aug 23 01:12:46 1999 - - original version; created by h2xs 1.19 - diff --git a/fs_signup/FS-SignupClient/MANIFEST b/fs_signup/FS-SignupClient/MANIFEST deleted file mode 100644 index 365ae660b..000000000 --- a/fs_signup/FS-SignupClient/MANIFEST +++ /dev/null @@ -1,7 +0,0 @@ -Changes -MANIFEST -MANIFEST.SKIP -Makefile.PL -SignupClient.pm -test.pl -cgi/signup.cgi diff --git a/fs_signup/FS-SignupClient/MANIFEST.SKIP b/fs_signup/FS-SignupClient/MANIFEST.SKIP deleted file mode 100644 index ae335e78a..000000000 --- a/fs_signup/FS-SignupClient/MANIFEST.SKIP +++ /dev/null @@ -1 +0,0 @@ -CVS/ diff --git a/fs_signup/FS-SignupClient/Makefile.PL b/fs_signup/FS-SignupClient/Makefile.PL deleted file mode 100644 index 9850c870d..000000000 --- a/fs_signup/FS-SignupClient/Makefile.PL +++ /dev/null @@ -1,17 +0,0 @@ -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. -WriteMakefile( - 'NAME' => 'FS::SignupClient', - 'VERSION_FROM' => 'SignupClient.pm', # finds $VERSION -# 'EXE_FILES' => [ 'fs_signupd' ], -# 'INSTALLSCRIPT' => '/usr/local/sbin', -# 'INSTALLSITEBIN' => '/usr/local/sbin', - 'PERM_RWX' => '750', - 'PREREQ_PM' => { - 'Business::CreditCard' => 0, - 'HTTP::BrowserDetect' => 0, - 'Text::Template' => 0, - 'FS::SelfService' => 0, - }, -); diff --git a/fs_signup/FS-SignupClient/SignupClient.pm b/fs_signup/FS-SignupClient/SignupClient.pm deleted file mode 100644 index d6730301c..000000000 --- a/fs_signup/FS-SignupClient/SignupClient.pm +++ /dev/null @@ -1,209 +0,0 @@ -package FS::SignupClient; - -use strict; -use vars qw($VERSION @ISA @EXPORT_OK $init_data); # $fs_signupd_socket); -use Exporter; -#use Socket; -#use FileHandle; -#use IO::Handle; -#use Storable qw(nstore_fd fd_retrieve); -use FS::SelfService; # qw( new_customer signup_info ); - -$VERSION = '0.04'; - -@ISA = qw( Exporter ); -@EXPORT_OK = qw( signup_info new_customer regionselector expselect popselector); - -=head1 NAME - -FS::SignupClient - Freeside signup client API - -=head1 SYNOPSIS - - use FS::SignupClient qw( signup_info new_customer ); - - #this is the backwards-compatibility bit - ( $locales, $packages, $pops, $real_signup_info ) = signup_info; - - #this is compatible with FS::SelfService::new_customer - $error = new_customer ( { - 'first' => $first, - 'last' => $last, - 'ss' => $ss, - 'comapny' => $company, - 'address1' => $address1, - 'address2' => $address2, - 'city' => $city, - 'county' => $county, - 'state' => $state, - 'zip' => $zip, - 'country' => $country, - 'daytime' => $daytime, - 'night' => $night, - 'fax' => $fax, - 'payby' => $payby, - 'payinfo' => $payinfo, - 'paycvv' => $paycvv, - 'paydate' => $paydate, - 'payname' => $payname, - 'invoicing_list' => $invoicing_list, - 'referral_custnum' => $referral_custnum, - 'comments' => $comments, - 'pkgpart' => $pkgpart, - 'username' => $username, - '_password' => $password, - 'sec_phrase' => $sec_phrase, - 'popnum' => $popnum, - 'agentnum' => $agentnum, #optional - } ); - -=head1 DESCRIPTION - -This module provides an API for a remote signup server. - -It needs to be run as the freeside user. Because of this, the program which -calls these subroutines should be written very carefully. - -=head1 SUBROUTINES - -=over 4 - -=item signup_info - -Returns three array references of hash references. - -The first set of hash references is of allowable locales. Each hash reference -has the following keys: - taxnum - state - county - country - -The second set of hash references is of allowable packages. Each hash -reference has the following keys: - pkgpart - pkg - -The third set of hash references is of allowable POPs (Points Of Presence). -Each hash reference has the following keys: - popnum - city - state - ac - exch - -(Future expansion: fourth argument is the $init_data hash reference) - -=cut - -#compatibility bit -sub signup_info { - - $init_data = FS::SelfService::signup_info(); - - (map { $init_data->{$_} } qw( cust_main_county part_pkg svc_acct_pop ) ), - $init_data; - -} - -=item new_customer HASHREF - -Adds a customer to the remote Freeside system. Requires a hash reference as -a paramater with the following keys: - first - last - ss - comapny - address1 - address2 - city - county - state - zip - country - daytime - night - fax - payby - payinfo - paycvv - paydate - payname - invoicing_list - referral_custnum - comments - pkgpart - username - _password - sec_phrase - popnum - -Returns a scalar error message, or the empty string for success. - -=cut - -#compatibility bit -sub new_customer { - my $hash = FS::SelfService::new_customer(@_); - $hash->{'error'}; -} - -=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE - -=cut - -sub regionselector { - my ( $selected_county, $selected_state, $selected_country, - $prefix, $onchange ) = @_; - signup_info() unless $init_data; - FS::SelfService::regionselector({ - selected_county => $selected_county, - selected_state => $selected_state, - selected_country => $selected_country, - prefix => $prefix, - onchange => $onchange, - default_country => $init_data->{countrydefault}, - locales => $init_data->{cust_main_county}, - }); - #default_state => $init_data->{statedefault}, -} - -=item expselect PREFIX, DATE - -=cut - -sub expselect { - FS::SelfService::expselect(@_); -} - -=item popselector - -=cut - -sub popselector { - my( $popnum ) = @_; - signup_info() unless $init_data; - FS::SelfService::popselector({ - popnum => $popnum, - pops => $init_data->{svc_acct_pop}, - }); - #popac => - #acstate => -} - -=back - -=head1 BUGS - -This is just a wrapper around FS::SelfService functions for backwards -compatibility. It is only necessary if you're using a signup.cgi from before -1.5.0pre7. - -=head1 SEE ALSO - -L, L - -=cut - -1; - diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.html b/fs_signup/FS-SignupClient/cgi/cvv2.html deleted file mode 100644 index b178c8513..000000000 --- a/fs_signup/FS-SignupClient/cgi/cvv2.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - CVV2 information - - - - The CVV2 number (also called CVC2 or CID) is a three- or four-digit - security code used to reduce credit card fraud.

- - - - - - - - -
Visa / MasterCard / DiscoverAmerican Express
- Visa/MasterCard/Discover - - American Express -
-
(close window)
- - diff --git a/fs_signup/FS-SignupClient/cgi/cvv2.png b/fs_signup/FS-SignupClient/cgi/cvv2.png deleted file mode 100644 index 4610dcbe6..000000000 Binary files a/fs_signup/FS-SignupClient/cgi/cvv2.png and /dev/null differ diff --git a/fs_signup/FS-SignupClient/cgi/cvv2_amex.png b/fs_signup/FS-SignupClient/cgi/cvv2_amex.png deleted file mode 100644 index 21c36a0ab..000000000 Binary files a/fs_signup/FS-SignupClient/cgi/cvv2_amex.png and /dev/null differ diff --git a/fs_signup/FS-SignupClient/cgi/decline.html b/fs_signup/FS-SignupClient/cgi/decline.html deleted file mode 100644 index a37ba3ab6..000000000 --- a/fs_signup/FS-SignupClient/cgi/decline.html +++ /dev/null @@ -1,5 +0,0 @@ -Processing error -Processing error

-There has been an error processing your account. Please contact customer -support. - diff --git a/fs_signup/FS-SignupClient/cgi/map.gif b/fs_signup/FS-SignupClient/cgi/map.gif deleted file mode 100644 index ef884d8f9..000000000 Binary files a/fs_signup/FS-SignupClient/cgi/map.gif and /dev/null differ diff --git a/fs_signup/FS-SignupClient/cgi/promocode.html b/fs_signup/FS-SignupClient/cgi/promocode.html deleted file mode 100644 index f8ee7f6eb..000000000 --- a/fs_signup/FS-SignupClient/cgi/promocode.html +++ /dev/null @@ -1,14 +0,0 @@ -ISP Signup -ISP Signup - promotional code

- -
-Enter promotional code - - -
- - diff --git a/fs_signup/FS-SignupClient/cgi/regcode.html b/fs_signup/FS-SignupClient/cgi/regcode.html deleted file mode 100644 index e639b9b53..000000000 --- a/fs_signup/FS-SignupClient/cgi/regcode.html +++ /dev/null @@ -1,14 +0,0 @@ -ISP Signup -ISP Signup - registration code

- -
-Enter registration code - - -
- - diff --git a/fs_signup/FS-SignupClient/cgi/signup-agentselect.html b/fs_signup/FS-SignupClient/cgi/signup-agentselect.html deleted file mode 100755 index 7851c5601..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup-agentselect.html +++ /dev/null @@ -1,195 +0,0 @@ -ISP Signup form -ISP Signup form

-<%= $error %> -
- - - -Agent

-Contact Information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($county_html, $state_html, $country_html) = - regionselector( $county, $state, $country ); - - "$county_html $state_html"; - %> - *Zip
*Country<%= $country_html %>
Day Phone
Night Phone
Fax
* required fields
-
Billing information - - -<%= scalar(@payby) > 1 ? '' : '' %> -
- - <%= - $OUT .= ' - - Postal mail invoice -
Email invoice -
Billing type
- - - - <%= - - my $cardselect = ''; - - my %payby = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD"). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", "12-2037"). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), - 'PREPAY' => qq!Prepaid card
*!, - ); - - my( $account, $aba ) = split('@', $payinfo); - my %paybychecked = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD", $paydate). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", $paydate). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), - 'PREPAY' => qq!Prepaid card
*!, - ); - - for (@payby) { - if ( scalar(@payby) == 1) { - $OUT .= '"; - } else { - $OUT .= qq!!; - } else { - $OUT .= qq!> $payby{$_}!; - } - - } - } - %> - -
'. - qq!!. - "$paybychecked{$_} $paybychecked{$_}
* required fields for each billing type -

First package - - - - - - - - - - - - - - - - -<%= - if ( $init_data->{'security_phrase'} ) { - $OUT .= < - - - -ENDOUT - } else { - $OUT .= ''; - } -%> -<%= - if ( scalar(@$pops) ) { - $OUT .= ''; - } else { - $OUT .= popselector($popnum); - } -%> -
Username
Password
Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
-

-
diff --git a/fs_signup/FS-SignupClient/cgi/signup-alternate.html b/fs_signup/FS-SignupClient/cgi/signup-alternate.html deleted file mode 100755 index 490cefa5e..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup-alternate.html +++ /dev/null @@ -1,218 +0,0 @@ -ISP Signup form -ISP Signup form

-<%= $error %> -
- - - - -Contact Information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country*Zip
Day Phone
Night Phone
Fax
* required fields
- -

- - - - - - - - - - - - - - -<%= if ( $init_data->{'security_phrase'} ) { - < - - - -ENDOUT - } else { - ''; - } -%> - -<%= if ( scalar(@$pops) ) { - ''; - } else { - popselector($popnum); - } -%> - -
*Username
*Password
*Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
* required fields - -

First package - - <%= use Tie::IxHash; - my %pkgpart2payby = map { $_->{pkgpart} => $_->{payby}[0] } @{$packages}; - tie my %options, 'Tie::IxHash', - '' => '(none)', - map { $_->{pkgpart} => $_->{pkg} } - sort { $a->{recur} <=> $b->{recur} } - @{$packages} - ; - - use HTML::Widgets::SelectLayers 0.02; - my @form_text = qw( magic ref ss agentnum - last first company address1 address2 - city zip daytime night fax - username _password _password2 sec_phrase ); - my @form_select = qw( state ); #county country - if ( scalar(@$pops) == 0 or scalar(@$pops) == 1 ) { - push @form_text, 'popnum', - } else { - push @form_select, 'popnum', - } - my $widget = new HTML::Widgets::SelectLayers( - options => \%options, - selected_layer => $pkgpart, - form_name => 'dummy', - form_action => $self_url, - form_text => \@form_text, - form_select => \@form_select, - layer_callback => sub { - my $layer = shift; - my $html = qq( ); - - if ( $pkgpart2payby{$layer} eq 'BILL' ) { - $html .= < - - - - - -

-ENDOUT - } elsif ( $pkgpart2payby{$layer} eq 'CARD' ) { - my $postal_checked = ''; - my @invoicing_list = split(', ', $invoicing_list ); - $postal_checked = 'CHECKED' - if ! @invoicing_list || grep { $_ eq 'POST' } @invoicing_list; - - $invoicing_list= join(', ', grep { $_ ne 'POST' } @invoicing_list ); - - my $expselect = expselect("CARD", $paydate); - - my $cardselect = ''; - - $html .= < -

Billing information - - - - - - - - - - - - - - - - - - - - - - -
Email statement to
*Credit card type$cardselect
*Card number
**Exp$expselect
*Name on card
-* required fields -

-ENDOUT - } else { - $html = <Please select a package.
-ENDOUT - - } - - $html; - - }, - ); - - $widget->html; - - - %> - diff --git a/fs_signup/FS-SignupClient/cgi/signup-billaddress.html b/fs_signup/FS-SignupClient/cgi/signup-billaddress.html deleted file mode 100755 index 3cf9d2505..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup-billaddress.html +++ /dev/null @@ -1,307 +0,0 @@ -ISP Signup form - - -ISP Signup form

-<%= $error %> - - - - -Where did you hear about our service?

-Billing Address (where credit card statement is sent) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Exact name on card
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($county_html, $state_html, $country_html) = - regionselector( $county, $state, $country, '', 'changed(this)' ); - - "$county_html $state_html"; - %> - *Zip
*Country<%= $country_html %>
Day Phone
Night Phone
Fax
- - - -

-Service Address -(>same as billing address)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($ship_county_html, $ship_state_html, $ship_country_html) = - regionselector( $ship_county, - $ship_state, - $ship_country, - 'ship_', - 'changed(this)', - ); - - "$ship_county_html $ship_state_html"; - %> - *Zip
*Country<%= $ship_country_html %>
Day Phone
Night Phone
Fax
- -* required fields
- -
Billing information - - -<%= scalar(@payby) > 1 ? '' : '' %> -
- - <%= - $OUT .= ' - - Postal mail invoice -
Email invoice -
Billing type
- - - - <%= - - my $cardselect = ''; - - my %payby = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"), #. qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD"), #. qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", "12-2037"). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $payby{$payby} .= qq!
CVV2 (help) !; - } - } - - my( $account, $aba ) = split('@', $payinfo); - my %paybychecked = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate), #. qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD", $paydate), #. qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", $paydate). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $paybychecked{$payby} .= qq!
CVV2 (help) !; - } - } - - for (@payby) { - if ( scalar(@payby) == 1) { - $OUT .= '"; - } else { - $OUT .= qq!!; - } else { - $OUT .= qq!> $payby{$_}!; - } - - } - } - %> - -
'. - qq!!. - "$paybychecked{$_} $paybychecked{$_}
* required fields for each billing type -

First package - - - - - - - - - - - - - - - - - -<%= - if ( $init_data->{'security_phrase'} ) { - $OUT .= < - - - -ENDOUT - } else { - $OUT .= ''; - } -%> -<%= - if ( scalar(@$pops) ) { - $OUT .= ''; - } else { - $OUT .= popselector($popnum); - } -%> -
Username
Password
Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
-

- diff --git a/fs_signup/FS-SignupClient/cgi/signup-freeoption.html b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html deleted file mode 100755 index 40ad03c0b..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup-freeoption.html +++ /dev/null @@ -1,262 +0,0 @@ -ISP Signup form - - -ISP Signup form

-<%= $error %> -
- - - -Where did you hear about our service?

-Contact Information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($county_html, $state_html, $country_html) = - regionselector( $county, $state, $country ); - - "$county_html $state_html"; - %> - *Zip
*Country<%= $country_html %>
Day Phone
Night Phone
Fax
* required fields
-
-<%= - my $first_payby = $packages->[0]{'payby'}[0]; - unless ( grep { scalar( @{$_->{'payby'}} ) > 1 - || $_->{'payby'}->[0] ne $first_payby - } @$packages - ) { - @payby = ( $first_payby ); - } - - unless ( scalar(@payby) == 1 && $payby[0] eq 'BILL' ) { - - $OUT .= ' Billing information - - '; - - $OUT .= '' - if scalar(@payby) > 1; - - $OUT .= '
-
Billing type
'; - - } else { - $OUT .= ' - '; - } - -%> - - - - - <%= - - my $cardselect = ''; - - my %payby = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD"). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => <<'END', - - - - -END - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $payby{$payby} .= qq!
CVV2 (help) !; - } - } - - my( $account, $aba ) = split('@', $payinfo); - my %paybychecked = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD", $paydate). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => <<'END', - - - - -END - - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $paybychecked{$payby} .= qq!
CVV2 (help) !; - } - } - - for (@payby) { - if ( scalar(@payby) == 1) { - $OUT .= '"; - } else { - $OUT .= qq!!; - } else { - $OUT .= qq!> $payby{$_}!; - } - - } - } - %> - -
'. - qq!!. - "$paybychecked{$_} $paybychecked{$_}
-<%= unless ( scalar(@payby) == 1 && $payby[0] eq 'BILL' ) { - $OUT .= '* required fields for each billing type'; - } - ''; -%> -

First package - - - - - - - - - - - - - - - - -<%= - if ( $init_data->{'security_phrase'} ) { - $OUT .= < - - - -ENDOUT - } else { - $OUT .= ''; - } -%> -<%= - if ( scalar(@$pops) ) { - $OUT .= ''; - } else { - $OUT .= popselector($popnum); - } -%> -
Username
Password
Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
-

-
diff --git a/fs_signup/FS-SignupClient/cgi/signup-snarf.html b/fs_signup/FS-SignupClient/cgi/signup-snarf.html deleted file mode 100755 index d167efbf9..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup-snarf.html +++ /dev/null @@ -1,228 +0,0 @@ -ISP Signup form - - -ISP Signup form

-<%= $error %> -
- - - -Contact Information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($county_html, $state_html, $country_html) = - regionselector( $county, $state, $country ); - - "$county_html $state_html"; - %> - *Zip
*Country<%= $country_html %>
Day Phone
Night Phone
Fax
* required fields
-
Billing information - - -<%= scalar(@payby) > 1 ? '' : '' %> -
- - <%= - $OUT .= ' - - Postal mail invoice -
Email invoice -
Billing type
- - - - <%= - - my $cardselect = ''; - - my %payby = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD"). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", "12-2037"). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $payby{$payby} .= qq!
CVV2 (help) !; - } - } - - my( $account, $aba ) = split('@', $payinfo); - my %paybychecked = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD", $paydate). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", $paydate). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $paybychecked{$payby} .= qq!
CVV2 (help) !; - } - } - - for (@payby) { - if ( scalar(@payby) == 1) { - $OUT .= '"; - } else { - $OUT .= qq!!; - } else { - $OUT .= qq!> $payby{$_}!; - } - - } - } - %> - -
'. - qq!!. - "$paybychecked{$_} $paybychecked{$_}
* required fields for each billing type -

First package - - - - - - - - - - - - - - - - -<%= - if ( $init_data->{'security_phrase'} ) { - $OUT .= < - - - -ENDOUT - } else { - $OUT .= ''; - } -%> -<%= - if ( scalar(@$pops) ) { - $OUT .= ''; - } else { - $OUT .= popselector($popnum); - } -%> -
Username
Password
Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
-

Enter up to ten external accounts from which to retrieve email - - - - - - -<%= - for my $num ( 1..10 ) { - no strict 'vars'; - $OUT .= qq!!. - qq!!. - qq!!. - qq!!. - qq!!; - } -%> -
Mail serverUsernamePassword
- -

-
diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi deleted file mode 100755 index aae3fb84a..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup.cgi +++ /dev/null @@ -1,505 +0,0 @@ -#!/usr/bin/perl -T -#!/usr/bin/perl -Tw -# -# $Id: signup.cgi,v 1.55 2005-01-29 12:34:11 ivan Exp $ - -use strict; -use vars qw( @payby $cgi $locales $packages - $pops %pop %popnum2pop - $init_data $error - - $last $first $ss $company $address1 - $address2 $city $state $county - $country $zip $daytime $night $fax - - $ship_last $ship_first $ship_ss $ship_company $ship_address1 - $ship_address2 $ship_city $ship_state $ship_county - $ship_country $ship_zip $ship_daytime $ship_night $ship_fax - - $invoicing_list $payby $payinfo - $paycvv $paydate $payname $referral_custnum $init_popstate - $pkgpart $username $password $password2 $sec_phrase $popnum - $agentnum $refnum - $ieak_file $ieak_template - $signup_html $signup_template - $success_html $success_template - $decline_html $decline_template - $ac $exch $loc - $email_name $pkg - $self_url - ); -use subs qw( print_form print_okay print_decline - success_default decline_default - ); -use CGI; -#use CGI::Carp qw(fatalsToBrowser); -use Text::Template; -use Business::CreditCard; -use HTTP::BrowserDetect; -use FS::SelfService qw( signup_info new_customer expselect ); - -#acceptable payment methods -# -#@payby = qw( CARD BILL COMP ); -#@payby = qw( CARD BILL ); -#@payby = qw( CARD ); -@payby = qw( CARD PREPAY ); - -$ieak_file = '/usr/local/freeside/ieak.template'; -$signup_html = -e 'signup.html' - ? 'signup.html' - : '/usr/local/freeside/signup.html'; -$success_html = -e 'success.html' - ? 'success.html' - : '/usr/local/freeside/success.html'; -$decline_html = -e 'decline.html' - ? 'decline.html' - : '/usr/local/freeside/decline.html'; - - -if ( -e $ieak_file ) { - my $ieak_txt = Text::Template::_load_text($ieak_file) - or die $Text::Template::ERROR; - $ieak_txt =~ /^(.*)$/s; #untaint the template source - it's trusted - $ieak_txt = $1; - $ieak_txt =~ s/\r//g; # don't double \r on old templates - $ieak_txt =~ s/\n/\r\n/g; - $ieak_template = new Text::Template ( TYPE => 'STRING', SOURCE => $ieak_txt ) - or die $Text::Template::ERROR; -} else { - $ieak_template = ''; -} - -$agentnum = ''; -if ( -e $signup_html ) { - my $signup_txt = Text::Template::_load_text($signup_html) - or die $Text::Template::ERROR; - $signup_txt =~ /^(.*)$/s; #untaint the template source - it's trusted - $signup_txt = $1; - $signup_template = new Text::Template ( TYPE => 'STRING', - SOURCE => $signup_txt, - DELIMITERS => [ '<%=', '%>' ] - ) - or die $Text::Template::ERROR; - if ( $signup_txt =~ - /<\s*INPUT TYPE="?hidden"?\s+NAME="?agentnum"?\s+VALUE="?(\d+)"?\s*>/si - ) { - $agentnum = $1; - } -} else { - #too much maintenance hassle to keep in this file - die "can't find ./signup.html or /usr/local/freeside/signup.html"; - #$signup_template = new Text::Template ( TYPE => 'STRING', - # SOURCE => &signup_default, - # DELIMITERS => [ '<%=', '%>' ] - # ) - # or die $Text::Template::ERROR; -} - -if ( -e $success_html ) { - my $success_txt = Text::Template::_load_text($success_html) - or die $Text::Template::ERROR; - $success_txt =~ /^(.*)$/s; #untaint the template source - it's trusted - $success_txt = $1; - $success_template = new Text::Template ( TYPE => 'STRING', - SOURCE => $success_txt, - DELIMITERS => [ '<%=', '%>' ], - ) - or die $Text::Template::ERROR; -} else { - $success_template = new Text::Template ( TYPE => 'STRING', - SOURCE => &success_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; - $decline_txt =~ /^(.*)$/s; #untaint the template source - it's trusted - $decline_txt = $1; - $decline_template = new Text::Template ( TYPE => 'STRING', - SOURCE => $decline_txt, - DELIMITERS => [ '<%=', '%>' ], - ) - or die $Text::Template::ERROR; -} else { - $decline_template = new Text::Template ( TYPE => 'STRING', - SOURCE => &decline_default, - DELIMITERS => [ '<%=', '%>' ], - ) - or die $Text::Template::ERROR; -} - -$cgi = new CGI; - -$init_data = signup_info( 'agentnum' => $agentnum, - 'promo_code' => scalar($cgi->param('promo_code')), - 'reg_code' => uc(scalar($cgi->param('reg_code'))), - ); -$error = $init_data->{'error'}; -$locales = $init_data->{'cust_main_county'}; -$packages = $init_data->{'part_pkg'}; -$pops = $init_data->{'svc_acct_pop'}; -@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}}; -$packages = $init_data->{agentnum2part_pkg}{$agentnum} if $agentnum; -%pop = (); -%popnum2pop = (); -foreach (@$pops) { - push @{ $pop{ $_->{state} }->{ $_->{ac} } }, $_; - $popnum2pop{$_->{popnum}} = $_; -} - -if ( defined $cgi->param('magic') ) { - if ( $cgi->param('magic') eq 'process' ) { - - if ( $cgi->param('state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) { - $state = $1; - $county = $3 || ''; - $country = $4; - } elsif ( $cgi->param('state') =~ /^(\w*)$/ ) { - $state = $1; - $cgi->param('county') =~ /^([\w ]*)$/ - or die "illegal county: ". $cgi->param('county'); - $county = $1; - $cgi->param('country') =~ /^(\w+)$/ - or die "illegal country: ". $cgi->param('country'); - $country = $1; - } else { - die "illegal state: ". $cgi->param('state'); - } - if ( $cgi->param('ship_state') =~ /^(\w*)( \(([\w ]+)\))? ?\/ ?(\w+)$/ ) { - $ship_state = $1; - $ship_county = $3 || ''; - $ship_country = $4; - } elsif ( $cgi->param('ship_state') =~ /^(\w*)$/ ) { - $ship_state = $1; - $cgi->param('ship_county') =~ /^([\w ]*)$/ - or die "illegal county: ". $cgi->param('ship_county'); - $ship_county = $1; - #$cgi->param('ship_country') =~ /^(\w+)$/ - $cgi->param('ship_country') =~ /^(\w*)$/ - or die "illegal ship_country: ". $cgi->param('ship_country'); - $ship_country = $1; - #} else { - # die "illegal ship_state: ". $cgi->param('ship_state'); - } - - $payby = $cgi->param('payby'); - if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) { - #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) ); - $payinfo = $cgi->param($payby. '_payinfo1'). '@'. - $cgi->param($payby. '_payinfo2'); - } else { - $payinfo = $cgi->param( $payby. '_payinfo' ); - } - $paydate = - $cgi->param( $payby. '_month' ). '-'. $cgi->param( $payby. '_year' ); - $payname = $cgi->param( $payby. '_payname' ); - $paycvv = defined $cgi->param( $payby. '_paycvv' ) - ? $cgi->param( $payby. '_paycvv' ) - : ''; - - if ( $invoicing_list = $cgi->param('invoicing_list') ) { - $invoicing_list .= ', POST' if $cgi->param('invoicing_list_POST'); - } else { - $invoicing_list = 'POST'; - } - - $error = ''; - - $last = $cgi->param('last'); - $first = $cgi->param('first'); - $ss = $cgi->param('ss'); - $company = $cgi->param('company'); - $address1 = $cgi->param('address1'); - $address2 = $cgi->param('address2'); - $city = $cgi->param('city'); - #$county, - #$state, - $zip = $cgi->param('zip'); - #$country, - $daytime = $cgi->param('daytime'); - $night = $cgi->param('night'); - $fax = $cgi->param('fax'); - - $ship_last = $cgi->param('ship_last'); - $ship_first = $cgi->param('ship_first'); - $ship_ss = $cgi->param('ship_ss'); - $ship_company = $cgi->param('ship_company'); - $ship_address1 = $cgi->param('ship_address1'); - $ship_address2 = $cgi->param('ship_address2'); - $ship_city = $cgi->param('ship_city'); - #$ship_county, - #$ship_state, - $ship_zip = $cgi->param('ship_zip'); - #$ship_country, - $ship_daytime = $cgi->param('ship_daytime'); - $ship_night = $cgi->param('ship_night'); - $ship_fax = $cgi->param('ship_fax'); - - #$payby, - #$payinfo, - #$paydate, - #$payname, - #$invoicing_list, - $referral_custnum = $cgi->param('ref'); - $pkgpart = $cgi->param('pkgpart'); - $username = $cgi->param('username'); - $sec_phrase = $cgi->param('sec_phrase'); - $password = $cgi->param('_password'); - $popnum = $cgi->param('popnum'); - #$agentnum, # = $cgi->param('agentnum'), - $agentnum ||= $cgi->param('agentnum'); - $init_popstate = $cgi->param('init_popstate'); - $refnum = $cgi->param('refnum'); - - if ( $cgi->param('_password') ne $cgi->param('_password2') ) { - $error = $init_data->{msgcat}{passwords_dont_match}; #msgcat - $password = ''; - $password2 = ''; - } else { - $password2 = $cgi->param('_password2'); - - if ( $payby =~ /^(CARD|DCRD)$/ && $cgi->param('CARD_type') ) { - $payinfo =~ s/\D//g; - - $payinfo =~ /^(\d{13,16})$/ - 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'); - } - - unless ( $error ) { - - my $r = new_customer ( { - 'last' => $last, - 'first' => $first, - 'ss' => $ss, - 'company' => $company, - 'address1' => $address1, - 'address2' => $address2, - 'city' => $city, - 'county' => $county, - 'state' => $state, - 'zip' => $zip, - 'country' => $country, - 'daytime' => $daytime, - 'night' => $night, - 'fax' => $fax, - 'ship_last' => $ship_last, - 'ship_first' => $ship_first, - 'ship_company' => $ship_company, - 'ship_address1' => $ship_address1, - 'ship_address2' => $ship_address2, - 'ship_city' => $ship_city, - 'ship_county' => $ship_county, - 'ship_state' => $ship_state, - 'ship_zip' => $ship_zip, - 'ship_country' => $ship_country, - 'ship_daytime' => $ship_daytime, - 'ship_night' => $ship_night, - 'ship_fax' => $ship_fax, - 'payby' => $payby, - 'payinfo' => $payinfo, - 'paycvv' => $paycvv, - 'paydate' => $paydate, - 'payname' => $payname, - 'invoicing_list' => $invoicing_list, - 'referral_custnum' => $referral_custnum, - 'promo_code' => scalar($cgi->param('promo_code')), - 'reg_code' => uc(scalar($cgi->param('reg_code'))), - 'pkgpart' => $pkgpart, - 'username' => $username, - 'sec_phrase' => $sec_phrase, - '_password' => $password, - 'popnum' => $popnum, - 'agentnum' => $agentnum, - 'refnum' => $refnum, - map { $_ => $cgi->param($_) } grep { /^snarf_/ } $cgi->param - } ); - $error ||= $r->{'error'}; - - } - - } - - if ( $error eq '_decline' ) { - print_decline(); - } elsif ( $error ) { - #fudge the snarf info - no strict 'refs'; - ${$_} = $cgi->param($_) foreach grep { /^snarf_/ } $cgi->param; - print_form(); - } else { - print_okay(); - } - - } else { - die "unrecognized magic: ". $cgi->param('magic'); - } -} else { - #$error = ''; - $last = ''; - $first = ''; - $ss = ''; - $company = ''; - $address1 = ''; - $address2 = ''; - $city = ''; - $state = $init_data->{statedefault}; - $county = ''; - $country = $init_data->{countrydefault}; - $zip = ''; - $daytime = ''; - $night = ''; - $fax = ''; - $ship_last = ''; - $ship_first = ''; - $ship_company = ''; - $ship_address1 = ''; - $ship_address2 = ''; - $ship_city = ''; - $ship_state = $init_data->{statedefault}; - $ship_county = ''; - $ship_country = $init_data->{countrydefault}; - $ship_zip = ''; - $ship_daytime = ''; - $ship_night = ''; - $ship_fax = ''; - $invoicing_list = ''; - $payby = ''; - $payinfo = ''; - $paydate = ''; - $payname = ''; - $pkgpart = ''; - $username = ''; - $password = ''; - $password2 = ''; - $sec_phrase = ''; - $popnum = ''; - $referral_custnum = $cgi->param('ref') || ''; - $init_popstate = $cgi->param('init_popstate') || ''; - $refnum = $init_data->{'refnum'}; - print_form; -} - -sub print_form { - - $cgi->delete('ref'); - $cgi->delete('init_popstate'); - $self_url = $cgi->self_url; - - $error = "Error: $error" if $error; - - print $cgi->header( '-expires' => 'now' ), - $signup_template->fill_in(); - -} - -sub print_decline { - print $cgi->header( '-expires' => 'now' ), - $decline_template->fill_in(); -} - -sub print_okay { - 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; - ( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/ - or die "fatal: invalid email_name got past FS::SelfService::new_customer"; - $email_name = $1; #global for template - - my $pop = $popnum2pop{$cgi->param('popnum')}; - #or die "fatal: invalid popnum got past FS::SelfService::new_customer"; - if ( $pop ) { - ( $ac, $exch, $loc ) = ( $pop->{'ac'}, $pop->{'exch'}, $pop->{'loc'} ); - } else { - ( $ac, $exch, $loc ) = ( '', '', ''); #presumably you're not using them. - } - - #global for template - $pkg = ( grep { $_->{'pkgpart'} eq $pkgpart } @$packages )[0]->{'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(); - } -} - -sub success_default { #html to use if you don't specify a success file - <<'END'; -Signup successful -Signup successful

-Thanks for signing up! -

-Signup information for <%= $email_name %>: -

-Username: <%= $username %>
-Password: <%= $password %>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %>
-Package: <%= $pkg %>
- -END -} - -sub decline_default { #html to use if there is a decline - <<'END'; -Processing error -Processing error

-There has been an error processing your account. Please contact customer -support. - -END -} - -# subs for the templates... - -=item regionselector SELECTED_COUNTY, SELECTED_STATE, SELECTED_COUNTRY, PREFIX, ONCHANGE - -=cut - -sub regionselector { - my ( $selected_county, $selected_state, $selected_country, - $prefix, $onchange ) = @_; - signup_info() unless $init_data; - FS::SelfService::regionselector({ - selected_county => $selected_county, - selected_state => $selected_state, - selected_country => $selected_country, - prefix => $prefix, - onchange => $onchange, - default_country => $init_data->{countrydefault}, - locales => $init_data->{cust_main_county}, - }); - #default_state => $init_data->{statedefault}, -} - -=item popselector - -=cut - -sub popselector { - my( $popnum ) = @_; - signup_info() unless $init_data; - FS::SelfService::popselector({ - popnum => $popnum, - pops => $init_data->{svc_acct_pop}, - }); - #popac => - #acstate => -} - diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html deleted file mode 100755 index da522f4f4..000000000 --- a/fs_signup/FS-SignupClient/cgi/signup.html +++ /dev/null @@ -1,224 +0,0 @@ -ISP Signup form - - -ISP Signup form

-<%= $error %> -
- - - -Where did you hear about our service?

-Contact Information - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*Contact name
(last, first)		, -
Company
*Address
 
*City*State/Country - <%= - ($county_html, $state_html, $country_html) = - regionselector( $county, $state, $country ); - - "$county_html $state_html"; - %> - *Zip
*Country<%= $country_html %>
Day Phone
Night Phone
Fax
* required fields
-
Billing information - - -<%= scalar(@payby) > 1 ? '' : '' %> -
- - <%= - $OUT .= ' - - Postal mail invoice -
Email invoice -
Billing type
- - - - <%= - - my $cardselect = ''; - - my %payby = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD"). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", "12-2037"). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP"), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $payby{$payby} .= qq!
CVV2 (help) !; - } - } - - my( $account, $aba ) = split('@', $payinfo); - my %paybychecked = ( - 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, - 'DCRD' => qq!Credit card
*$cardselect
*Exp !. expselect("DCRD", $paydate). qq!
*Name on card
!, - 'CHEK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'DCHK' => qq!Electronic check
${r}Account number
${r}ABA/Routing code
${r}Bank name !, - 'LECB' => qq!Phone bill billing
${r}Phone number !, - 'BILL' => qq!Billing
P.O.
*Exp !. expselect("BILL", $paydate). qq!
*Attention
!, - 'COMP' => qq!Complimentary
*Approved by
*Exp !. expselect("COMP", $paydate), - 'PREPAY' => qq!Prepaid card
*!, - ); - - if ( $init_data->{'cvv_enabled'} ) { - foreach my $payby ( grep { exists $payby{$_} } qw(CARD DCRD) ) { #1.4/1.5 - $paybychecked{$payby} .= qq!
CVV2 (help) !; - } - } - - for (@payby) { - if ( scalar(@payby) == 1) { - $OUT .= '"; - } else { - $OUT .= qq!!; - } else { - $OUT .= qq!> $payby{$_}!; - } - - } - } - %> - -
'. - qq!!. - "$paybychecked{$_} $paybychecked{$_}
* required fields for each billing type -

First package - - - - - - - - - - - - - - - - - - -<%= - if ( $init_data->{'security_phrase'} ) { - $OUT .= < - - - -ENDOUT - } else { - $OUT .= ''; - } -%> -<%= - if ( scalar(@$pops) ) { - $OUT .= ''; - } else { - $OUT .= popselector($popnum); - } -%> -
Username
Password
Re-enter Password
Security Phrase -
Access number'. - popselector($popnum). '
-

-
diff --git a/fs_signup/FS-SignupClient/cgi/stateselect.html b/fs_signup/FS-SignupClient/cgi/stateselect.html deleted file mode 100644 index ba55bff74..000000000 --- a/fs_signup/FS-SignupClient/cgi/stateselect.html +++ /dev/null @@ -1,134 +0,0 @@ -ISP Signup -ISP Signup - state selection

- -
-Select your state from the map or dropdown: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - diff --git a/fs_signup/FS-SignupClient/cgi/success.html b/fs_signup/FS-SignupClient/cgi/success.html deleted file mode 100644 index 397cc6c30..000000000 --- a/fs_signup/FS-SignupClient/cgi/success.html +++ /dev/null @@ -1,11 +0,0 @@ -Signup successful -Signup successful

-Thanks for signing up! -

-Signup information for <%= $email_name %>: -

-Username: <%= $username %>
-Password: <%= $password %>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %>
-Package: <%= $pkg %>
- diff --git a/fs_signup/FS-SignupClient/test.pl b/fs_signup/FS-SignupClient/test.pl deleted file mode 100644 index b6136954d..000000000 --- a/fs_signup/FS-SignupClient/test.pl +++ /dev/null @@ -1,20 +0,0 @@ -# Before `make install' is performed this script should be runnable with -# `make test'. After `make install' it should work as `perl test.pl' - -######################### We start with some black magic to print on failure. - -# Change 1..1 below to 1..last_test_to_print . -# (It may become useful if the test is moved to ./t subdirectory.) - -BEGIN { $| = 1; print "1..1\n"; } -END {print "not ok 1\n" unless $loaded;} -#blah#use FS::SignupClient; -$loaded = 1; -print "ok 1\n"; - -######################### End of black magic. - -# Insert your test code below (better if it prints "ok 13" -# (correspondingly "not ok 13") depending on the success of chunk 13 -# of the test code): - diff --git a/fs_signup/cck.template b/fs_signup/cck.template deleted file mode 100644 index f1db554b1..000000000 --- a/fs_signup/cck.template +++ /dev/null @@ -1,14 +0,0 @@ -SITE_FILE 8chrfile -SITE_NAME YourISP -LOGIN { $username } -PASSWORD { $password } -PHONE_NUM +1({ $ac }){ $exch }-{ $loc } -DNS_ADDR 10.0.0.1 -DNS_ADDR2 10.0.0.2 -NNTP_HOST news.yourisp.com -SMTP_HOST mail.yourisp.com -DOMAIN_NAME yourisp.com -POP_SERVER { $username }@mail.yourisp.com -POP_PASSWORD { $password } -HOME_URL http://www.yourisp.com -EMAIL_ADDR { $username }@yourisp.com diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server deleted file mode 100755 index d6eb4a8d5..000000000 --- a/fs_signup/fs_signup_server +++ /dev/null @@ -1,289 +0,0 @@ -#!/usr/bin/perl -Tw -# -# fs_signup_server -# - -use strict; -use vars qw($pid); -use IO::Handle; -use Storable qw(nstore_fd fd_retrieve); -use Tie::RefHash; -use Net::SSH qw(sshopen2); -use FS::UID qw(adminsuidsetup); -use FS::Conf; -use FS::Record qw( qsearch qsearchs ); -use FS::cust_main_county; -use FS::cust_main; -use FS::cust_bill; -use FS::cust_pkg; -use FS::Msgcat qw(gettext); - -use vars qw( $opt $Debug ); - -$Debug = 2; - -my $user = shift or die &usage; -&adminsuidsetup( $user ); - -my $conf = new FS::Conf; - -if ($conf->exists('signup_server-quiet')) { - $FS::cust_bill::quiet = 1; - $FS::cust_pkg::quiet = 1; -} - -#my @payby = qw(CARD PREPAY); -my @payby = $conf->config('signup_server-payby'); -my $smtpmachine = $conf->config('smtpmachine'); - -my $machine = shift or die &usage; - -my $agentnum = shift or die &usage; -my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage; -my $pkgpart_href = $agent->pkgpart_hashref; - -my $refnum = shift or die &usage; - -#causing trouble for some folks -#$SIG{CHLD} = sub { wait() }; - -$SIG{HUP} = \&killssh; -$SIG{INT} = \&killssh; -$SIG{QUIT} = \&killssh; -$SIG{TERM} = \&killssh; -$SIG{PIPE} = \&killssh; -sub killssh { kill 'TERM', $pid if $pid; exit; }; - -my($fs_signupd)="/usr/local/sbin/fs_signupd"; - -while (1) { - my($reader,$writer)=(new IO::Handle, new IO::Handle); - #seems to be broken - calling ->flush explicitly# $writer->autoflush(1); - warn "[fs_signup_server] Connecting to $machine...\n" if $Debug; - $pid = sshopen2($machine,$reader,$writer,$fs_signupd); - - my @pops = qsearch('svc_acct_pop',{} ); - my $init_data = { - - #'_protocol' => 'signup', - #'_version' => '0.1', - #'_packet' => 'init' - - 'cust_main_county' => - [ map { $_->hashref } qsearch('cust_main_county', {}) ], - - 'part_pkg' => - [ - #map { $_->hashref } - map { { 'payby' => [ $_->payby ], %{$_->hashref} } } - grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } } - qsearch( 'part_pkg', { 'disabled' => '' } ) - ], - - 'agentnum2part_pkg' => - { - map { - my $href = $_->pkgpart_hashref; - $_->agentnum => - [ - map { { 'payby' => [ $_->payby ], %{$_->hashref} } } - grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } } - qsearch( 'part_pkg', { 'disabled' => '' } ) - ]; - } qsearch('agent', {} ) - }, - - 'svc_acct_pop' => [ map { $_->hashref } @pops ], - - 'security_phrase' => $conf->exists('security_phrase'), - - 'payby' => [ $conf->config('signup_server-payby') ], - - 'msgcat' => { map { $_=>gettext($_) } qw( - passwords_dont_match invalid_card unknown_card_type not_a - ) }, - - 'statedefault' => $conf->config('statedefault') || 'CA', - - 'countrydefault' => $conf->config('countrydefault') || 'US', - - }; - - warn "[fs_signup_server] Sending init data...\n" if $Debug; - nstore_fd($init_data, $writer) or die "can't send init data: $!"; - $writer->flush; - - warn "[fs_signup_server] Entering main loop...\n" if $Debug; - while (1) { - warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug; - my $signup_data = fd_retrieve($reader); - - if ( $Debug > 1 ) { - warn join('', - map { " $_ => ". $signup_data->{$_}. "\n" } keys %$signup_data ); - } - - warn "[fs_signup_server] Processing signup...\n" if $Debug; - - my $error = ''; - - #things that aren't necessary in base class, but are for signup server - #return "Passwords don't match" - # if $hashref->{'_password'} ne $hashref->{'_password2'} - $error ||= gettext('empty_password') unless $signup_data->{'_password'}; - $error ||= gettext('no_access_number_selected') - unless $signup_data->{'popnum'} || !scalar(@pops); - - #shares some stuff with htdocs/edit/process/cust_main.cgi... take any - # common that are still here and library them. - my $cust_main = new FS::cust_main ( { - #'custnum' => '', - 'agentnum' => $signup_data->{agentnum} || $agentnum, - 'refnum' => $refnum, - - map { $_ => $signup_data->{$_} } qw( - last first ss company address1 address2 city county state zip country - daytime night fax payby payinfo paydate payname referral_custnum comments - ), - - } ); - - $error ||= "Illegal payment type" - unless grep { $_ eq $signup_data->{'payby'} } @payby; - - $cust_main->payinfo($cust_main->daytime) - if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo; - - my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} ); - - $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/; - my $pkgpart = $1; - - my $part_pkg = - qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } ) - or $error ||= "WARNING: unknown pkgpart: $pkgpart"; - my $svcpart = $part_pkg->svcpart('svc_acct') unless $error; - - my $cust_pkg = new FS::cust_pkg ( { - #later#'custnum' => $custnum, - 'pkgpart' => $signup_data->{'pkgpart'}, - } ); - $error ||= $cust_pkg->check; - - my $svc_acct = new FS::svc_acct ( { - 'svcpart' => $svcpart, - map { $_ => $signup_data->{$_} } - qw( username _password sec_phrase popnum ), - } ); - - my $y = $svc_acct->setdefault; # arguably should be in new method - $error ||= $y unless ref($y); - - $error ||= $svc_acct->check; - - use Tie::RefHash; - tie my %hash, 'Tie::RefHash'; - %hash = ( $cust_pkg => [ $svc_acct ] ); - $error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat - - if ( ! $error && $conf->exists('signup_server-realtime') ) { - - warn "[fs_signup_server] Billing customer...\n" if $Debug; - - my $bill_error = $cust_main->bill; - warn "[fs_signup_server] error billing new customer: $bill_error" - if $bill_error; - - $cust_main->apply_payments; - $cust_main->apply_credits; - - $bill_error = $cust_main->collect; - warn "[fs_signup_server] error collecting from new customer: $bill_error" - if $bill_error; - - if ( $cust_main->balance > 0 ) { - - #this makes sense. credit is "un-doing" the invoice - $cust_main->credit( $cust_main->balance, 'signup server decline' ); - $cust_main->apply_credits; - - #should check list for errors... - #$cust_main->suspend; - $cust_main->cancel; - - $error = '_decline'; - } - } - - warn "[fs_signup_server] Sending results...\n" if $Debug; - print $writer $error, "\n"; - - next if $error; - - if ( $conf->config('signup_server-email') ) { - warn "[fs_signup_server] Sending email...\n" if $Debug; - - #false laziness w/FS::cust_bill::send & FS::cust_pay::delete - use Mail::Header; - use Mail::Internet 1.44; - use Date::Format; - my $from = $conf->config('invoice_from'); #??? as good as any - $ENV{MAILADDRESS} = $from; - my $header = new Mail::Header ( [ - "From: $from", - "To: ". $conf->config('signup_server-email'), - "Sender: $from", - "Reply-To: $from", - "Date: ". time2str("%a, %d %b %Y %X %z", time), - "Subject: FREESIDE NOTIFICATION: Signup Server", - ] ); - my $body = [ - "This is an automatic message from your Freeside installation\n", - "informing you a customer has signed up via the signup server:\n", - "\n", - 'custnum : '. $cust_main->custnum. "\n", - 'Name : '. $cust_main->last. ", ". $cust_main->first. "\n", - 'Agent : '. $cust_main->agent->agent. "\n", - 'Package : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n", - 'Signup Date : '. time2str('%C', time). "\n", - 'Username : '. $svc_acct->username. "\n", - #'Password : '. # config file to turn this on if noment insists - 'Day phone : '. $cust_main->daytime. "\n", - 'Night phone : '. $cust_main->night. "\n", - 'Address : '. $cust_main->address1. "\n", - ( $cust_main->address2 - ? ' '. $cust_main->address2. "\n" - : '' ), - ' '. $cust_main->city. ', '. $cust_main->state. ' '. - $cust_main->zip. "\n", - ( $cust_main->country eq 'US' - ? '' - : ' '. $cust_main->country. "\n" ), - "\n", - ]; - #if ( $cust_main->balance > 0 ) { - # push @$body, - # "This customer has an outstanding balance and has been suspended.\n"; - #} - my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body ); - $!=0; - $message->smtpsend( Host => $smtpmachine ) - or $message->smtpsend( Host => $smtpmachine, Debug => 1 ) - or warn "[fs_signup_server] can't send email to ". - $conf->config('signup_server-email'). - " via server $smtpmachine with SMTP: $!"; - #end-of-send mail - } - - } - close $writer; - close $reader; - warn "connection to $machine lost! waiting 60 seconds...\n"; - sleep 60; - warn "reconnecting...\n"; -} - -sub usage { - die "Usage:\n\n fs_signup_server user machine agentnum refnum\n"; -} - diff --git a/fs_signup/ieak.template b/fs_signup/ieak.template deleted file mode 100755 index 52edaa951..000000000 --- a/fs_signup/ieak.template +++ /dev/null @@ -1,40 +0,0 @@ -[Entry] -Entry_Name = The Internet -[Phone] -Dial_As_Is=no -Phone_Number = { $exch. $loc } -Area_Code = { $ac } -Country_Code = 1 -Country_Id = 1 -[Server] -Type = PPP -SW_Compress = Yes -PW_Encrypt = Yes -Negotiate_TCP/IP = Yes -Disable_LCP = No -[TCP/IP] -Specify_IP_Address = No -Specity_Server_Address = No -IP_Header_Compress = Yes -Gateway_On_Remote = Yes -[User] -Name = { $username } -Password = { $password } -Display_Password = Yes -[Internet_Mail] -Email_Name = { $email_name } -Email_Address = { $username }\@domain.tld -POP_Server = mail.domain.tld -POP_Server_Port_Number = 110 -POP_Login_Name = { $username } -POP_Login_Password = { $password } -SMTP_Server = mail.domain.tld -SMTP_Server_Port_Number = 25 -Install_Mail = 1 -[Internet_News] -NNTP_Server = news.domain.tld -NNTP_Server_Port_Number = 119 -Logon_Required = No -Install_News = 1 -[Branding] -Window_Title = The Internet diff --git a/htetc/global.asa b/htetc/global.asa index ed26057ea..3781f947d 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -10,6 +10,7 @@ use CGI 2.47; use Date::Format; use Date::Parse; use Time::Local; +use Time::Duration; use Tie::IxHash; use HTML::Entities; use IO::Handle; diff --git a/htetc/handler.pl b/htetc/handler.pl index f41db36ec..c144eca1a 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -93,6 +93,7 @@ sub handler use Date::Format; use Date::Parse; use Time::Local; + use Time::Duration; use Tie::IxHash; use HTML::Entities; use IO::Handle;