From: ivan Date: Sun, 7 Apr 2002 00:00:41 +0000 (+0000) Subject: - config option for signup server payment types X-Git-Tag: freeside_1_4_0_pre12~102 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fca110eff969104793774ed717985e91c53f5318 - config option for signup server payment types - credit card type pulldown on signup server (closes: Bug#383) --- diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 74e28d8b1..b39c8217d 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -134,7 +134,7 @@ sub set { my $dir = $self->dir; $value =~ /^(.*)$/s; $value = $1; - unless ( $self->config($file) eq $value ) { + unless ( join("\n", @{[ $self->config($file) ]}) eq $value ) { warn "[FS::Conf] SET $file\n" if $DEBUG; # warn "$dir" if is_tainted($dir); # warn "$dir" if is_tainted($file); @@ -865,6 +865,15 @@ httemplate/docs/config.html 'select_enum' => [ qw(en_US) ], }, + { + 'key' => 'signup_server-payby', + 'section' => '', + 'description' => 'Acceptable payment types for the signup server', + 'type' => 'selectmultiple', + 'select_enum' => [ qw(CARD PREPAY BILL COMP) ], + }, + + ); 1; diff --git a/fs_signup/FS-SignupClient/cgi/signup.cgi b/fs_signup/FS-SignupClient/cgi/signup.cgi index 0b2370aa6..7cf4230e6 100755 --- a/fs_signup/FS-SignupClient/cgi/signup.cgi +++ b/fs_signup/FS-SignupClient/cgi/signup.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: signup.cgi,v 1.17 2002-04-06 21:39:22 ivan Exp $ +# $Id: signup.cgi,v 1.18 2002-04-07 00:00:40 ivan Exp $ use strict; use vars qw( @payby $cgi $locales $packages $pops $init_data $error @@ -16,9 +16,10 @@ use vars qw( @payby $cgi $locales $packages $pops $init_data $error use subs qw( print_form print_okay expselect signup_default success_default ); use CGI; use CGI::Carp qw(fatalsToBrowser); +use Text::Template; +use Business::CreditCard; use HTTP::Headers::UserAgent 2.00; use FS::SignupClient 0.03 qw( signup_info new_customer ); -use Text::Template; #acceptable payment methods # @@ -91,6 +92,7 @@ if ( -e $success_html ) { } ( $locales, $packages, $pops, $init_data ) = signup_info(); +@payby = @{$init_data->{'payby'}} if @{$init_data->{'payby'}}; $cgi = new CGI; @@ -118,13 +120,18 @@ if ( defined $cgi->param('magic') ) { $error = ''; if ( $cgi->param('_password') ne $cgi->param('_password2') ) { - $error = "Passwords don't match"; + $error = "Passwords don't match"; #msgcat $password = ''; $password2 = ''; } else { $password2 = $cgi->param('_password2'); - $error = new_customer ( { + if ( $payby eq 'CARD' && $cgi->param('CARD_type') + && cardtype($payinfo) ne $cgi->param('CARD_type') ) { + $error = 'Not an '. $cgi->param('CARD_type'). '| - is: |'. cardtype($payinfo). '|'; #msgcat + } + + $error ||= new_customer ( { 'last' => $last = $cgi->param('last'), 'first' => $first = $cgi->param('first'), 'ss' => $ss = $cgi->param('ss'), @@ -428,31 +435,53 @@ Contact Information Email invoice -Billing type +<%= scalar(@payby) > 1 ? 'Billing type' : '' %> + <%= + + my $cardselect = ''; + my %payby = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD"). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, '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 %paybychecked = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, '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) { - $OUT .= qq!!; + if ( scalar(@payby) == 1) { + $OUT .= '"; } else { - $OUT .= qq!> $payby{$_}!; + $OUT .= qq!!; + } else { + $OUT .= qq!> $payby{$_}!; + } + } } %> diff --git a/fs_signup/FS-SignupClient/cgi/signup.html b/fs_signup/FS-SignupClient/cgi/signup.html index b97511e97..5d2f2d9c9 100755 --- a/fs_signup/FS-SignupClient/cgi/signup.html +++ b/fs_signup/FS-SignupClient/cgi/signup.html @@ -75,31 +75,53 @@ Contact Information -
$paybychecked{$_}'. + qq!!. + "$paybychecked{$_} $paybychecked{$_}
Email invoice
Billing type
+<%= scalar(@payby) > 1 ? 'Billing type' : '' %> + <%= + + my $cardselect = ''; + my %payby = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD"). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD"). qq!
*Name on card
!, '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 %paybychecked = ( - 'CARD' => qq!Credit card
*
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, + 'CARD' => qq!Credit card
*$cardselect
*Exp !. expselect("CARD", $paydate). qq!
*Name on card
!, '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) { - $OUT .= qq!!; + if ( scalar(@payby) == 1) { + $OUT .= '"; } else { - $OUT .= qq!> $payby{$_}!; + $OUT .= qq!!; + } else { + $OUT .= qq!> $payby{$_}!; + } + } } %> @@ -126,7 +148,7 @@ Contact Information - diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server index 4c06946c6..b902d9ff4 100755 --- a/fs_signup/fs_signup_server +++ b/fs_signup/fs_signup_server @@ -18,13 +18,14 @@ use vars qw( $opt $Debug ); $Debug = 2; -my @payby = qw(CARD PREPAY); - my $user = shift or die &usage; &adminsuidsetup( $user ); my $conf = new FS::Conf; +#my @payby = qw(CARD PREPAY); +my @payby = $conf->config('signup_server-payby'); + my $machine = shift or die &usage; my $agentnum = shift or die &usage; @@ -64,6 +65,8 @@ while (1) { 'security_phrase' => $conf->exists('security_phrase'), + 'payby' => [ $conf->config('signup_server-payby') ], + }; warn "[fs_signup_server] Sending init data...\n" if $Debug; diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi index 38d9af0db..259713260 100644 --- a/httemplate/config/config-process.cgi +++ b/httemplate/config/config-process.cgi @@ -34,7 +34,7 @@ } } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' ) { if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) { - $conf->set($i->key, join("\n", $cgi->param($i->key. $n) )); + $conf->set($i->key, join("\n", @{[ $cgi->param($i->key. $n) ]} )); } else { $conf->delete($i->key); } diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index d40c4dc10..f0ae2b2fd 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -37,7 +37,9 @@ my $n = 0; %> <% if ( $type eq '' ) { %> - <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %> + <% } elsif ( $type eq 'textarea' + || $type eq 'editlist' + || $type eq 'selectmultiple' ) { %> <% } elsif ( $type eq 'text' || $type eq 'select' ) { %> - + <% } else { %>
$paybychecked{$_}'. + qq!!. + "$paybychecked{$_} $paybychecked{$_}
Password + (blank to generate)
no type
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
@@ -46,7 +48,7 @@
           <% } elsif ( $type eq 'checkbox' ) { %>
YES' : 'ff0000">NO' %>
<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
unknown type <%= $type %> diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi index 4f19ee961..2817e5f84 100644 --- a/httemplate/config/config.cgi +++ b/httemplate/config/config.cgi @@ -62,12 +62,12 @@ function SafeOnsubmit() { exists($i->key) ? ' CHECKED' : '' %>> <% } elsif ( $type eq 'text' ) { %> - <% } elsif ( $type eq 'select' ) { %> - > <% my %saw; foreach my $value ( "", @{$i->select_enum} ) { local($^W)=0; next if $saw{$value}++; %> -