From: levinse Date: Fri, 31 Dec 2010 01:23:28 +0000 (+0000) Subject: self-signup with prepaid card without customer info, RT9713 X-Git-Tag: freeside_2_3_0~790 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0bebde603df97eb496150e80a58755b2f792f64a self-signup with prepaid card without customer info, RT9713 --- diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm index 488692f9f..7087b12a2 100644 --- a/FS/FS/ClientAPI/Signup.pm +++ b/FS/FS/ClientAPI/Signup.pm @@ -187,7 +187,7 @@ sub signup_info { 'agent_ship_address' => scalar($conf->exists('agent-ship_address')), 'require_phone' => scalar($conf->exists('cust_main-require_phone')), 'logo' => scalar($conf->config_binary('logo.png')), - + 'prepaid_template_custnum' => $conf->exists('signup_server-prepaid-template-custnum'), }; $cache->set('signup_info_cache', $signup_info_cache); @@ -506,31 +506,64 @@ sub new_customer { #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' => $agentnum, - 'refnum' => $packet->{refnum} - || $conf->config('signup_server-default_refnum'), + my $template_custnum = $conf->config('signup_server-prepaid-template-custnum'); + my $cust_main; + if ( $template_custnum && $packet->{prepaid_shortform} ) { + my $template_cust = qsearchs('cust_main', { 'custnum' => $template_custnum } ); + return { 'error' => 'Configuration error' } unless $template_cust; + $cust_main = new FS::cust_main ( { + 'agentnum' => $agentnum, + 'refnum' => $packet->{refnum} + || $conf->config('signup_server-default_refnum'), + map { $_ => $template_cust->$_ } qw( + last first company address1 address2 + city county state zip country + daytime night fax + + ship_last ship_first ship_company ship_address1 ship_address2 + ship_city ship_county ship_state ship_zip ship_country + ship_daytime ship_night ship_fax + ), + map { $_ => $packet->{$_} } qw( + + ss stateid stateid_state + + payby + payinfo paycvv paydate payname paystate paytype + paystart_month paystart_year payissue + payip + + referral_custnum comments + ) + } ); + } + else { + $cust_main = new FS::cust_main ( { + #'custnum' => '', + 'agentnum' => $agentnum, + 'refnum' => $packet->{refnum} + || $conf->config('signup_server-default_refnum'), - map { $_ => $packet->{$_} } qw( + map { $_ => $packet->{$_} } qw( - last first ss company address1 address2 - city county state zip country - daytime night fax stateid stateid_state + last first ss company address1 address2 + city county state zip country + daytime night fax stateid stateid_state - ship_last ship_first ship_ss ship_company ship_address1 ship_address2 - ship_city ship_county ship_state ship_zip ship_country - ship_daytime ship_night ship_fax + ship_last ship_first ship_ss ship_company ship_address1 ship_address2 + ship_city ship_county ship_state ship_zip ship_country + ship_daytime ship_night ship_fax - payby - payinfo paycvv paydate payname paystate paytype - paystart_month paystart_year payissue - payip + payby + payinfo paycvv paydate payname paystate paytype + paystart_month paystart_year payissue + payip - referral_custnum comments - ) + referral_custnum comments + ) - } ); + } ); + } my $agent = qsearchs('agent', { 'agentnum' => $agentnum } ); if ( $conf->exists('agent_ship_address') && $agent->agent_custnum ) { diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 07d570588..d3cd994be 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -1838,6 +1838,13 @@ and customer address. Include units.', 'svc_pbx' => 'PBX (svc_pbx)', ], }, + + { + 'key' => 'signup_server-prepaid-template-custnum', + 'section' => 'self-service', + 'description' => 'When the signup server is used with prepaid cards and customer info is not required for signup, the contact/address info will be copied from this customer, if specified', + 'type' => 'text', + }, { 'key' => 'selfservice_server-base_url', diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi index 02acf14aa..200161404 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.cgi +++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi @@ -232,7 +232,7 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) { 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 ), @@ -292,6 +292,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 diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html index 7a56a31a1..405444cfa 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.html +++ b/fs_selfservice/FS-SelfService/cgi/signup.html @@ -28,6 +28,7 @@ <%= $error %>
+ @@ -52,30 +53,35 @@ Where did you hear about our service?

+ +<%= unless ( $prepaid_template_custnum && $prepaid_shortform ) { + +my $bgcolor = $box_bgcolor || '#c0c0c0'; +$OUT .= qq! Contact Information - +
- + - + - + - + - - <%= - ($county_html, $state_html, $country_html) = + !; + + my ($county_html, $state_html, $country_html) = regionselector( { selected_county => $county, selected_state => $state, @@ -85,32 +91,30 @@ Contact Information locales => \@cust_main_county, } ); - %> - +$county_out = ($county_html =~ /SELECT/) ? 'County/State' : 'State'; +$OUT .= qq! - + - + - + - + - + -<%= - $OUT = ''; +!; if ( $stateid_enabled ) { my ($county_html, $state_html, $country_html) = regionselector( { @@ -124,8 +128,16 @@ Contact Information $OUT .= qq!'; $OUT .=""; } -%> +$OUT .= qq!
*Contact name
(last, first)		, - , +
Company
*Address
 
*City* - <%= ($county_html =~ /SELECT/) ? 'County/State' : 'State' %>* $county_out - <%= "$county_html $state_html"; %> + $county_html $state_html *Zip
*Country<%= $country_html %>$country_html
Day Phone
Night Phone
Fax
!. $label{stateid_state} .'$county_html $state_html
* required fields
+!; + +} +else { + @payby = ('PREPAY'); +} +%> +
Billing information