X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=546e0711326a87a6b61684803aba4bdf1c942aaf;hp=fee0b411ea3301f2d7b27bfab6e36588a867d12e;hb=6fe8172b11d0369d0b1274d6825ec0c57afe8001;hpb=60c837e0aaf454dfa0b0c0283dc36928782d1b6c diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index fee0b411e..546e07113 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,5 +1,4 @@ - - + <% if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { @@ -26,11 +25,14 @@ if ( $cgi->param('clone') ) { my $old_part_pkg = qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); $part_pkg ||= $old_part_pkg->clone; + $part_pkg->disabled('Y'); } elsif ( $query && $query =~ /^(\d+)$/ ) { $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1}); } 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,30 +44,22 @@ my $hashref = $part_pkg->hashref; %> - - -<% - -print header("$action Package Definition", menubar( +<%= header("$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'); +<% #), ' onLoad="visualize()"'); %> + +<% if ( $cgi->param('error') ) { %> + Error: <%= $cgi->param('error') %> +<% } %> -#print '
'; -print ''; +<% #print ''; %> + + +<% #if ( $cgi->param('clone') ) { # print qq!!; #} @@ -74,14 +68,49 @@ print ''; #} # #print qq!!, -print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)"; +%> -print itable("#cccccc",2), <Package (customer-visable) -Comment (customer-hidden) -Frequency (months) of recurring fee -Setup fee tax exempt -END +<%= itable('',8,1) %> + +Package information + +<%= ntable("#cccccc",2) %> + + Package Definition # + + <%= $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)" %> + + + + Package (customer-visible) + + + + + + Comment (customer-hidden) + + + + + + + Disable new orders + + {disabled} eq 'Y' ? ' CHECKED' : '' %> + + + + + + + +Tax information +<%= ntable("#cccccc", 2) %> + + Setup fee tax exempt + +<% print '{setuptax} eq "Y"; @@ -96,42 +125,82 @@ print '{recurtax} eq "Y"; print '>'; -print ''; +print ''; + +my $conf = new FS::Conf; +#false laziness w/ view/cust_main.cgi quick order +if ( $conf->exists('enable_taxclasses') ) { + print 'Tax class'; +} else { + print + ''; +} -my $thead = "\n\n". ntable('#cccccc', 2). <Quan.Service -END +%> + + + + + +<% -unless ( $cgi->param('clone') ) { +my $thead = "\n\n". ntable('#cccccc', 2). + 'Quan.'; +$thead .= 'Primary' + if dbdef->table('pkg_svc')->column('primary_svc'); +$thead .= 'Service'; + +#unless ( $cgi->param('clone') ) { +#dunno why... +unless ( 0 ) { #print <', $thead; -

Enter the quantity of each service this package includes.

+ print <', $thead; +

Services included END } my @fixups = (); my $count = 0; my $columns = 3; -my @part_svc = qsearch( 'part_svc', {} ); +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, + my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart; + my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', { + 'pkgpart' => $pkgpart, 'svcpart' => $svcpart, } ) || new FS::pkg_svc ( { - 'pkgpart' => $cgi->param('clone') || $part_pkg->pkgpart, - 'svcpart' => $svcpart, - 'quantity' => 0, + 'pkgpart' => $pkgpart, + 'svcpart' => $svcpart, + 'quantity' => 0, + 'primary_svc' => '', }); #? #next unless $pkg_svc; push @fixups, "pkg_svc$svcpart"; - unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) { + #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) { + #dunno why... + unless ( 0 ) { print ''; # if $count == 0 ; print qq!quantity || 0, - qq!">!; + if ( dbdef->table('pkg_svc')->column('primary_svc') ) { + print qq!primary_svc =~ /^Y/i; + print '>'; + } + print qq!!, $part_svc->getfield('svc'), ""; # print "$thead" if ++$count == int(scalar(@part_svc) / 2); $count+=1; @@ -145,184 +214,121 @@ foreach my $part_svc ( @part_svc ) { } } -unless ( $cgi->param('clone') ) { +#unless ( $cgi->param('clone') ) { +#dunno why... +unless ( 0 ) { print ""; #print ""; } -# prolly should be in database -my %plans = ( - - '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, - }, - }, - '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', - 'default' => 0, - }, - 'recur_fee' => { 'name' => 'Recurring fee for this package', - 'default' => 0, - }, - 'comission_amount' => { 'name' => 'Comission amount', - 'default' => 0, - }, - 'comission_depth' => { 'name' => 'Number of layers', - 'default' => 1, - }, - }, - '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 + \';\'', - }, - -); - -%> - - -
-Price plan +# prolly should be in database +tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; - +tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans; -<% 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 ) { %> - -<% } %> -<% -if ( $cgi->param('clone') ) { - print qq!!; +my @form_radio = (); +if ( dbdef->table('pkg_svc')->column('primary_svc') ) { + push @form_radio, 'pkg_svc_primary'; } -if ( $cgi->param('pkgnum') ) { - print qq!!; + +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; } -%> - -<%= itable("#cccccc",2) %> +my $widget = new HTML::Widgets::SelectLayers( + 'selected_layer' => $part_pkg->plan, + 'options' => \%options, + 'form_name' => 'dummy', + 'form_action' => 'process/part_pkg.cgi', + 'form_text' => [ qw(pkg comment clone pkgnum pkgpart), @fixups ], + 'form_checkbox' => [ qw(setuptax recurtax disabled) ], + 'form_radio' => \@form_radio, + 'form_select' => \@form_select, + 'layer_callback' => sub { + my $layer = shift; + my $html = qq!!. + 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 'select_multiple' ) { + $html .= qq!'; + } -<% my $href = $plans{$layer}->{'fields'}; - foreach my $field ( keys %{ $href } ) { %> -<%= $href->{$field}{'name'} %> - -<% } %> - - - -

-Setup expression

-Recurring espression

- + $html .= ''; + } + $html .= ''; -<% -print qq!
!; -%> + $html .= ''. + '

'; + + $html .= ''; -
+ $html; - + }, +); -<% } %> +%> - +

Price plan <%= $widget->html %>