From: ivan Date: Wed, 1 Dec 2004 03:35:05 +0000 (+0000) Subject: creditcard-less promo code signup X-Git-Tag: BEFORE_FINAL_MASONIZE~834 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=45c9760355d17bbec96cc3c040c4540ad35cdbc0 creditcard-less promo code signup --- diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index f2719ce69..9392f4bf4 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -453,9 +453,9 @@ sub svcpart { Returns a list of the acceptable payment types for this package. Eventually this should come out of a database table and be editable, but currently has the -following logic instead; +following logic instead: -If the package has B<0> setup and B<0> recur, the single item B is +If the package is free, the single item B is returned, otherwise, the single item B is returned. (CHEK? LEC? Probably shouldn't accept those by default, prone to abuse) @@ -464,15 +464,35 @@ returned, otherwise, the single item B is returned. sub payby { my $self = shift; - #if ( $self->setup == 0 && $self->recur == 0 ) { - if ( $self->setup =~ /^\s*0+(\.0*)?\s*$/ - && $self->recur =~ /^\s*0+(\.0*)?\s*$/ ) { + if ( $self->is_free ) { ( 'BILL' ); } else { ( 'CARD' ); } } +=item is_free + +Returns true if this package is free. + +=cut + +sub is_free { + my $self = shift; + unless ( $self->plan ) { + $self->setup =~ /^\s*0+(\.0*)?\s*$/ + && $self->recur =~ /^\s*0+(\.0*)?\s*$/; + } elsif ( $self->can('is_free_options') ) { + not grep { $_ !~ /^\s*0*(\.0*)?\s*$/ } + map { $self->option($_) } + $self->is_free_options; + } else { + warn "FS::part_pkg::is_free: FS::part_pkg::". $self->plan. " subclass ". + "provides neither is_free_options nor is_free method; returning false"; + 0; + } +} + =item freq_pretty Returns an english representation of the I field, such as "monthly", diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index a3939ba9e..b62aebd7d 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -33,4 +33,8 @@ sub calc_recur { $self->option('recur_fee'); } +sub is_free_options { + qw( setup_fee recur_fee ); +} + 1; diff --git a/FS/FS/part_pkg/flat_comission.pm b/FS/FS/part_pkg/flat_comission.pm index d39347015..9b288c3a3 100644 --- a/FS/FS/part_pkg/flat_comission.pm +++ b/FS/FS/part_pkg/flat_comission.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Flat rate with recurring commission per (any) active package', @@ -29,11 +29,6 @@ use FS::part_pkg; 'weight' => 62, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg ) = @_; diff --git a/FS/FS/part_pkg/flat_comission_cust.pm b/FS/FS/part_pkg/flat_comission_cust.pm index 5de45c5ef..8aa993ca6 100644 --- a/FS/FS/part_pkg/flat_comission_cust.pm +++ b/FS/FS/part_pkg/flat_comission_cust.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Flat rate with recurring commission per active customer', @@ -29,11 +29,6 @@ use FS::part_pkg; 'weight' => '60', ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg ) = @_; diff --git a/FS/FS/part_pkg/flat_comission_pkg.pm b/FS/FS/part_pkg/flat_comission_pkg.pm index 1e6e69bb7..befa77e23 100644 --- a/FS/FS/part_pkg/flat_comission_pkg.pm +++ b/FS/FS/part_pkg/flat_comission_pkg.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Flat rate with recurring commission per (selected) active package', @@ -37,11 +37,7 @@ use FS::part_pkg; 'weight' => '64', ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - +# XXX this needs to be fixed!!! sub calc_recur { my($self, $cust_pkg ) = @_; $self->option('recur_fee'); diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm index cf4ffef84..f39783fd6 100644 --- a/FS/FS/part_pkg/flat_delayed.pm +++ b/FS/FS/part_pkg/flat_delayed.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Free (or setup fee) for X days, then flat rate'. @@ -37,9 +37,4 @@ sub calc_setup { $self->option('setup_fee'); } -sub calc_recur { - my($self, $cust_pkg ) = @_; - $self->option('recur_fee'); -} - 1; diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm index 37cb37faf..d27adbda7 100644 --- a/FS/FS/part_pkg/prorate.pm +++ b/FS/FS/part_pkg/prorate.pm @@ -6,7 +6,7 @@ use Time::Local qw(timelocal); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)', @@ -25,11 +25,6 @@ use FS::part_pkg; 'weight' => 20, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg, $sdate ) = @_; my $mnow = $$sdate; diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm index 8f6da197e..0367b2b4c 100644 --- a/FS/FS/part_pkg/sesmon_hour.pm +++ b/FS/FS/part_pkg/sesmon_hour.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Base charge plus charge per-hour from the session monitor', @@ -29,11 +29,6 @@ use FS::part_pkg; 'weight' => 80, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg ) = @_; @@ -45,4 +40,8 @@ sub calc_recur { } +sub is_free_options { + qw( setup_fee recur_fee recur_hourly_charge ); +} + 1; diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm index 9ef76d781..7cafbe056 100644 --- a/FS/FS/part_pkg/sesmon_minute.pm +++ b/FS/FS/part_pkg/sesmon_minute.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Base charge plus charge per-minute from the session monitor', @@ -29,10 +29,6 @@ use FS::part_pkg; 'weight' => 80, ); -sub calc_setup { - my( $self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} sub cakc_recur { my( $self, $cust_pkg ) = @); @@ -43,4 +39,8 @@ sub cakc_recur { $self->option('recur_flat') + $min * $self->option('recur_minly_charge'); } +sub is_free_options { + qw( setup_fee recur_fee recur_minly_charge ); +} + 1; diff --git a/FS/FS/part_pkg/sql_external.pm b/FS/FS/part_pkg/sql_external.pm index 688f91887..8da4d3135 100644 --- a/FS/FS/part_pkg/sql_external.pm +++ b/FS/FS/part_pkg/sql_external.pm @@ -6,7 +6,7 @@ use DBI; #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Base charge plus additional fees for external services from a configurable SQL query', @@ -36,11 +36,6 @@ use FS::part_pkg; 'weight' => '72', ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg ) = @_; @@ -65,4 +60,8 @@ sub calc_recur { $price; } +sub is_free { + 0; +} + 1; diff --git a/FS/FS/part_pkg/sql_generic.pm b/FS/FS/part_pkg/sql_generic.pm index 85c341375..b7c7008c1 100644 --- a/FS/FS/part_pkg/sql_generic.pm +++ b/FS/FS/part_pkg/sql_generic.pm @@ -6,7 +6,7 @@ use DBI; #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Base charge plus a per-domain metered rate from a configurable SQL query', @@ -44,11 +44,6 @@ use FS::part_pkg; 'weight' => '70', ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg ) = @_; @@ -76,4 +71,8 @@ sub calc_recur { $self->option('recur_flat') + $units * $self->option('recur_unit_charge'); } +sub is_free_options { + qw( setup_fee recur_flat recur_unit_charge ); +} + 1; diff --git a/FS/FS/part_pkg/sqlradacct_hour.pm b/FS/FS/part_pkg/sqlradacct_hour.pm index f5ad2b1fc..a2550e241 100644 --- a/FS/FS/part_pkg/sqlradacct_hour.pm +++ b/FS/FS/part_pkg/sqlradacct_hour.pm @@ -5,7 +5,7 @@ use vars qw(@ISA %info); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'Base charge plus per-hour (and for data) from an SQL RADIUS radacct table', @@ -51,11 +51,6 @@ use FS::part_pkg; 'weight' => 40, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg, $sdate, $details ) = @_; @@ -112,4 +107,9 @@ sub calc_recur { + $hourscharge + $inputcharge + $outputcharge + $totalcharge; } +sub is_free_options { + qw( setup_fee recur_flat recur_hourly_charge + recur_input_charge recur_output_charge recur_total_charge ); +} + 1; diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm index 4dc9252a7..d057b6b34 100644 --- a/FS/FS/part_pkg/subscription.pm +++ b/FS/FS/part_pkg/subscription.pm @@ -6,7 +6,7 @@ use Time::Local qw(timelocal); #use FS::Record qw(qsearch qsearchs); use FS::part_pkg; -@ISA = qw(FS::part_pkg); +@ISA = qw(FS::part_pkg::flat); %info = ( 'name' => 'First partial month full charge, then flat-rate (1st of month billing)', @@ -25,11 +25,6 @@ use FS::part_pkg; 'weight' => 30, ); -sub calc_setup { - my($self, $cust_pkg ) = @_; - $self->option('setup_fee'); -} - sub calc_recur { my($self, $cust_pkg, $sdate ) = @_; diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm index c22e0fc9a..3989cdba6 100644 --- a/FS/FS/part_pkg/voip_sqlradacct.pm +++ b/FS/FS/part_pkg/voip_sqlradacct.pm @@ -149,5 +149,9 @@ sub calc_recur { } +sub is_free { + 0; +} + 1; diff --git a/fs_signup/FS-SignupClient/cgi/signup-freeoption.html b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html new file mode 100755 index 000000000..40ad03c0b --- /dev/null +++ b/fs_signup/FS-SignupClient/cgi/signup-freeoption.html @@ -0,0 +1,262 @@ +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). '
+

+