X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=61e4086be4def8094a1418c1baeefac02f670363;hp=b7707f3e8cbc3bcfe5ff75e3297ef320e183ddfb;hb=c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9;hpb=5820f3d7ca493e3e6318efe6e8e677b71b01c1ad diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index b7707f3e8..61e4086be 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,23 +1,5 @@ - - -<% my $plan = 'flat'; %> - - - <% -$cgi = new CGI; - -&cgisuidsetup($cgi); - if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { $cgi->param('clone', $1); } else { @@ -30,253 +12,324 @@ 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; + $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 {}; + unless ( $part_pkg ) { + $part_pkg = new FS::part_pkg {}; + $part_pkg->plan('flat'); + } +} +unless ( $part_pkg->plan ) { #backwards-compat + $part_pkg->plan('flat'); + $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n". + "recur_fee=". $part_pkg->recur. "\n"); } $action ||= $part_pkg->pkgpart ? 'Edit' : 'Add'; 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', -)); - -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 < -Package (customer-visable) -Comment (customer-hidden) - -Frequency (months) of recurring fee - - - -END - -unless ( $cgi->param('clone') ) { - print <
- - -END -} +)) %> -my $count = 0; -my @fixups = (); -foreach my $part_svc ( ( qsearch( '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; +<% #), ' onLoad="visualize()"'); %> - push @fixups, "pkg_svc$svcpart"; +<% if ( $cgi->param('error') ) { %> + Error: <%= $cgi->param('error') %> +<% } %> - unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) { - print '' if $count == 0 ; - print qq!"; - $count++; - if ($count == 2) - { - print ''; - $count = 0; - } - } else { - print qq!quantity || 0, qq!">\n!; - } -} + + +<%= itable('',8,1) %> + + + + + + + + + + + + + + + + + + + + +
Quan.ServiceQuan.Service
quantity || 0, - qq!">!, $part_svc->getfield('svc'), "
+ +Package information + +<%= 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' : '' %> +
+ + + +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} ) %> -unless ( $cgi->param('clone') ) { - print qq!! if ($count != 0) ; - print ""; -} +<% } %> -# prolly should be in database -my %plans = ( - - 'flat' => { - 'name' => 'Flat rate', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package' }, - 'recur_fee' => { 'name' => 'Recurring fee for this package' }, - }, - 'setup' => 'what.setup_fee.value', - 'recur' => 'what.recur_fee.value', - }, + - 'flat_comission' => { - 'name' => 'Flat rate with recurring referral comission as credit', - 'fields' => { - 'setup_fee' => { 'name' => 'Setup fee for this package' }, - 'recur_fee' => { 'name' => 'Recurring fee for this package' }, - 'comission_amount' => { 'name' => 'Comission amount' }, - 'comission_depth' => { 'name' => 'Number of layers' }, - }, - 'setup' => 'what.setup_fee.value', - 'recur' => '\'$cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ) ; \' + what.recur_fee.value + \';\'', - }, + -); +<% + +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' => '', + } ); -<% #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!!; -} -print qq!!, %> -<% my $href = $plans{$layer}->{'fields'}; - foreach my $field ( keys %{ $href } ) { %> -<%= $href->{$field}{'name'} %>: -
+ + + 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 %> + + <% } + } + %> + <% } %> - -Setup expression
-Recurring espression
- + + +<% foreach my $f ( qw( clone pkgnum ) ) { %> + +<% } %> + <% -print qq!
!; -%> -
+# 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!