X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=61e4086be4def8094a1418c1baeefac02f670363;hp=d32702668f8702cf073151ce7fcb3faaff515acc;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78 diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index d32702668..61e4086be 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,4 +1,3 @@ - <% if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { @@ -13,24 +12,31 @@ if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { } my ($query) = $cgi->keywords; -my $action = ''; + my $part_pkg = ''; if ( $cgi->param('error') ) { $part_pkg = new FS::part_pkg ( { map { $_, scalar($cgi->param($_)) } fields('part_pkg') } ); } + +my $action = ''; +my $clone_part_pkg = ''; +my $pkgpart = ''; if ( $cgi->param('clone') ) { - $action='Custom Pricing'; - my $old_part_pkg = - qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); - $part_pkg ||= $old_part_pkg->clone; - $part_pkg->disabled('Y'); + $pkgpart = $cgi->param('clone'); + $action = 'Custom Pricing'; + $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); + $part_pkg ||= $clone_part_pkg->clone; + $part_pkg->disabled('Y'); #isn't sticky on errors } elsif ( $query && $query =~ /^(\d+)$/ ) { $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1}); + $pkgpart = $part_pkg->pkgpart; } else { - $part_pkg ||= new FS::part_pkg {}; - $part_pkg->plan('flat'); + unless ( $part_pkg ) { + $part_pkg = new FS::part_pkg {}; + $part_pkg->plan('flat'); + } } unless ( $part_pkg->plan ) { #backwards-compat $part_pkg->plan('flat'); @@ -42,423 +48,288 @@ my $hashref = $part_pkg->hashref; %> - - -<% - -print header("$action Package Definition", menubar( +<%= include("/elements/header.html","$action Package Definition", menubar( 'Main Menu' => popurl(2), 'View all packages' => popurl(2). 'browse/part_pkg.cgi', -), ' onLoad="visualize()"'); - -print qq!Error: !, $cgi->param('error'), - "" - if $cgi->param('error'); - -#print '
'; -print ''; - -#if ( $cgi->param('clone') ) { -# print qq!!; -#} -#if ( $cgi->param('pkgnum') ) { -# print qq!!; -#} -# -#print qq!!, -print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)"; - -print ntable("#cccccc",2), <Package (customer-visable) -Comment (customer-hidden) -Frequency (months) of recurring fee -Setup fee tax exempt -END - -print '{setuptax} eq "Y"; -print '>'; - -print < -Recurring fee tax exempt -END - -print '{recurtax} eq "Y"; -print '>'; - -print ''; - -print 'Disable new orders'; -print '{disabled} eq "Y"; -print '>'; -print ''; - -my $thead = "\n\n". ntable('#cccccc', 2). <Quan.Service -END - -unless ( $cgi->param('clone') ) { - #print <', $thead; -

Enter the quantity of each service this package includes.

-END -} +)) %> -my @fixups = (); -my $count = 0; -my $columns = 3; -my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } ); -foreach my $part_svc ( @part_svc ) { - my $svcpart = $part_svc->svcpart; - my $pkg_svc = qsearchs( 'pkg_svc', { - 'pkgpart' => $cgi->param('clone') || $part_pkg->pkgpart, - 'svcpart' => $svcpart, - } ) || new FS::pkg_svc ( { - 'pkgpart' => $cgi->param('clone') || $part_pkg->pkgpart, - 'svcpart' => $svcpart, - 'quantity' => 0, - }); - #? #next unless $pkg_svc; - - push @fixups, "pkg_svc$svcpart"; - - unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) { - print ''; # if $count == 0 ; - print qq!quantity || 0, - qq!">!, $part_svc->getfield('svc'), ""; -# print "$thead" if ++$count == int(scalar(@part_svc) / 2); - $count+=1; - foreach ( 1 .. $columns-1 ) { - print "$thead" - if $count == int( $_ * scalar(@part_svc) / $columns ); - } - } else { - print qq!quantity || 0, qq!">\n!; - } -} +<% #), ' onLoad="visualize()"'); %> -unless ( $cgi->param('clone') ) { - print ""; - #print ""; -} +<% if ( $cgi->param('error') ) { %> + Error: <%= $cgi->param('error') %> +<% } %> -# prolly should be in database -use Tie::IxHash; -tie my %plans, 'Tie::IxHash', - 'flat' => { - 'name' => 'Flat rate', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_fee' ], - 'setup' => 'what.setup_fee.value', - 'recur' => 'what.recur_fee.value', - }, + - 'prorate' => { - 'name' => 'First month pro-rated, then flat-rate', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_fee' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'', - }, +<%= itable('',8,1) %> - 'flat_comission_cust' => { - 'name' => 'Flat rate with recurring comission per active customer', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - 'comission_amount' => { 'name' => 'Comission amount per month (per active customer)', - 'default' => 0, - }, - 'comission_depth' => { 'name' => 'Number of layers', - 'default' => 1, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'', - }, +Package information - 'flat_comission' => { - 'name' => 'Flat rate with recurring comission per active package', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - 'comission_amount' => { 'name' => 'Comission amount per month (per active package)', - 'default' => 0, - }, - 'comission_depth' => { 'name' => 'Number of layers', - 'default' => 1, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'', - }, +<%= ntable("#cccccc",2) %> + + Package Definition # + + <%= $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)" %> + + + + Package (customer-visible) + + + + + + Comment (customer-hidden) + + + + + + Promotional code + + + + + + Disable new orders + + {disabled} eq 'Y' ? ' CHECKED' : '' %> + + - 'flat_comission_pkg' => { - 'name' => 'Flat rate with recurring comission per active (selected) package', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - 'comission_amount' => { 'name' => 'Comission amount per month (per uncancelled package)', - 'default' => 0, - }, - 'comission_depth' => { 'name' => 'Number of layers', - 'default' => 1, - }, - 'comission_pkgpart' => { 'name' => 'Applicable packages
(hold ctrl to select multiple packages)', - 'type' => 'select_multiple', - 'select_table' => 'part_pkg', - 'select_hash' => { 'disabled' => '' } , - 'select_key' => 'pkgpart', - 'select_label' => 'pkg', - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \' ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'', - }, + + + +Tax information +<%= ntable("#cccccc", 2) %> + + Setup fee tax exempt + + {setuptax} eq 'Y' ? ' CHECKED' : '' %>> + + + + Recurring fee tax exempt + + {recurtax} eq 'Y' ? ' CHECKED' : '' %>> + + + +<% my $conf = new FS::Conf; %> +<% if ( $conf->exists('enable_taxclasses') ) { %> + + + Tax class + + <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %> + + + +<% } else { %> + + <%= include('/elements/select-taxclass.html', $hashref->{taxclass} ) %> +<% } %> - 'sesmon_hour' => { - 'name' => 'Base charge plus charge per-hour from the session monitor', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_flat' => { 'name' => 'Base monthly charge for this package', - 'default' => 0, - }, - 'recur_included_hours' => { 'name' => 'Hours included', - 'default' => 0, - }, - 'recur_hourly_charge' => { 'name' => 'Additional charge per hour', - 'default' => 0, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'', - }, + - 'sesmon_minute' => { - 'name' => 'Base charge plus charge per-minute from the session monitor', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package', - 'default' => 0, - }, - 'recur_flat' => { 'name' => 'Base monthly charge for this package', - 'default' => 0, - }, - 'recur_included_min' => { 'name' => 'Minutes included', - 'default' => 0, - }, - 'recur_minly_charge' => { 'name' => 'Additional charge per minute', - 'default' => 0, - }, - }, - 'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ], - 'setup' => 'what.setup_fee.value', - 'recur' => '\'my $min = $cust_pkg->seconds_since($cust_bkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'', + - }, +<% -; +my $thead = "\n\n". ntable('#cccccc', 2). + 'Quan.'; +$thead .= 'Primary' + if dbdef->table('pkg_svc')->column('primary_svc'); +$thead .= 'Service'; %> - -
-Price plan +<% - +my @fixups = (); +my $count = 0; +my $columns = 3; +foreach my $part_svc ( @part_svc ) { + my $svcpart = $part_svc->svcpart; + my $pkg_svc = $pkg_svc{$svcpart} + || new FS::pkg_svc ( { + 'pkgpart' => $pkgpart, + 'svcpart' => $svcpart, + 'quantity' => 0, + 'primary_svc' => '', + } ); -<% my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); } - split("\n", $part_pkg->plandata ); - #foreach my $layer ( 'konq_kludge', keys %plans ) { - foreach my $layer ( 'konq_kludge', keys %plans ) { - my $visibility = "hidden"; -%> - - -
- - - - - - - -<% foreach my $f ( @fixups ) { %> - -<% } %> + push @fixups, "pkg_svc$svcpart"; -<% -if ( $cgi->param('clone') ) { - print qq!!; -} -if ( $cgi->param('pkgnum') ) { - print qq!!; -} %> - -<%= ntable("#cccccc",2) %> + + + quantity || 0 %>"> + + + + primary_svc =~ /^Y/i ? ' CHECKED' : '' %>> + + + + <%= $part_svc->svc %> <%= $part_svc->disabled =~ /^Y/i ? ' (DISABLED' : '' %> + + + + <% $count++; + foreach ( 1 .. $columns-1 ) { + if ( $count == int( $_ * scalar(@part_svc) / $columns ) ) { + %> + <%= $thead %> + + <% } + } + %> -<% my $href = $plans{$layer}->{'fields'}; - foreach my $field ( exists($plans{$layer}->{'fieldorder'}) - ? @{$plans{$layer}->{'fieldorder'}} - : keys %{ $href } - ) { -%> - <%= $href->{$field}{'name'} %> - - <% if ( ! exists($href->{$field}{'type'}) ) { %> - - <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %> - - <% } %> - <% } %> - - -

+ + +<% foreach my $f ( qw( clone pkgnum ) ) { %> + +<% } %> + <% -print qq!!; -%> -

don't edit this unless you know what you're doing <%= ntable("#cccccc",2) %> -Setup expression

-Recurring espression
 - - +# prolly should be in database +tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; -
+my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); } + split("\n", ($clone_part_pkg||$part_pkg)->plandata ); +#warn join("\n", map { "$_: $plandata{$_}" } keys %plandata ). "\n"; - -<% } %> +my @form_radio = (); +if ( dbdef->table('pkg_svc')->column('primary_svc') ) { + push @form_radio, 'pkg_svc_primary'; +} + +tie my %freq, 'Tie::IxHash', %FS::part_pkg::freq; +if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) { + delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq; +} -!. + ntable("#cccccc",2); + $html .= ' + + Recurring fee frequency + '; + + my $href = $plans{$layer}->{'fields'}; + foreach my $field ( exists($plans{$layer}->{'fieldorder'}) + ? @{$plans{$layer}->{'fieldorder'}} + : keys %{ $href } + ) { + + $html .= ''. $href->{$field}{'name'}. ''; + + if ( ! exists($href->{$field}{'type'}) ) { + $html .= qq!!; + } elsif ( $href->{$field}{'type'} eq 'checkbox' ) { + $html .= qq!'; + } elsif ( $href->{$field}{'type'} =~ /^select/ ) { + $html .= '{$field}{'type'} eq 'select_multiple'; + $html .= qq! NAME="$field" onChange="fchanged(this)">!; + foreach my $record ( + qsearch( $href->{$field}{'select_table'}, + $href->{$field}{'select_hash'} ) + ) { + my $value = $record->getfield($href->{$field}{'select_key'}); + $html .= qq!