X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=7e794487156030feed247922c67a26dbe8b0c223;hb=12f5c0d0824f8eefaa107ed3ea5e6503950968a6;hp=c70ef74fa9f6ff217f1a18c6562dbb8e5d413271;hpb=25c113d3edad9809e3834a298f79987fa65e6d7c;p=freeside.git diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index c70ef74fa..7e7944871 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,64 +1,9 @@ -% -% -%if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { -% $cgi->param('clone', $1); -%} else { -% $cgi->param('clone', ''); -%} -%if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { -% $cgi->param('pkgnum', $1); -%} else { -% $cgi->param('pkgnum', ''); -%} -% -%my ($query) = $cgi->keywords; -% -%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') ) { -% $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 { -% 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; -% -% - - -<% include("/elements/header.html","$action Package Definition", menubar( - 'Main Menu' => popurl(2), +<% include('/elements/header.html', "$action Package Definition", menubar( 'View all packages' => popurl(2). 'browse/part_pkg.cgi', )) %> % #), ' onLoad="visualize()"'); -% if ( $cgi->param('error') ) { - - Error: <% $cgi->param('error') %> -% } +<% include('/elements/error.html') %>
@@ -85,7 +30,10 @@ Package information - <% include( '/elements/tr-select-pkg_class.html', $part_pkg->classnum ) %> + <% include( '/elements/tr-select-pkg_class.html', + 'curr_value' => $part_pkg->classnum, + ) + %> Promotional code @@ -117,9 +65,8 @@ Tax information {recurtax} eq 'Y' ? ' CHECKED' : '' %>> -% my $conf = new FS::Conf; -% if ( $conf->exists('enable_taxclasses') ) { +% if ( $conf->exists('enable_taxclasses') ) { Tax class @@ -127,26 +74,70 @@ Tax information <% include('/elements/select-taxclass.html', $hashref->{taxclass} ) %> -% } else { +% } else { <% include('/elements/select-taxclass.html', $hashref->{taxclass} ) %> + % } + +
+Line-item revenue recognition +<% ntable("#cccccc", 2) %> +% tie my %weight, 'Tie::IxHash', +% 'pay_weight' => 'Payment', +% 'credit_weight' => 'Credit' +% ; +% foreach my $weight (keys %weight) { + + <% $weight{$weight} %> weight + + {$weight} || 0 %>> + + +% } + + +% if ( $cgi->param('clone') ) { + + + +% } elsif ( scalar(@all_agent_types) == 1) { + + + +% } else { + + Reseller information + <% ntable("#cccccc", 2) %> + + <% 'Agent Types' %> + + <% include( '/elements/select-table.html', + 'element_name' => 'agent_type', + 'table' => 'agent_type', + 'name_col' => 'atype', + 'value' => \@agent_type, + 'multiple' => '1', + 'element_etc' => 'size="10"', + ) + %> + + + + +% } + -% -% -%my $thead = "\n\n". ntable('#cccccc', 2). -% 'Quan.'; -%$thead .= 'Primary' -% if dbdef->table('pkg_svc')->column('primary_svc'); -%$thead .= 'Service'; -% -% +%my $thead = "\n\n". ntable('#cccccc', 2). +% 'Quan.'. +% 'Primary'. +% 'Service';

Services included <% itable('', 4, 1) %> @@ -176,15 +167,28 @@ Tax information % 'quantity' => 0, % 'primary_svc' => '', % } ); +% if ( $cgi->param('error') ) { +% my $primary_svc = ( $pkg_svc->primary_svc =~ /^Y/i ); +% my $pkg_svc_primary = scalar($cgi->param('pkg_svc_primary')); +% $pkg_svc->primary_svc('') +% if $primary_svc && $pkg_svc_primary != $svcpart; +% $pkg_svc->primary_svc('Y') +% if ! $primary_svc && $pkg_svc_primary == $svcpart; +% } % % push @fixups, "pkg_svc$svcpart"; % -% +% my $quan = 0; +% if ( $cgi->param("pkg_svc$svcpart") =~ /^\s*(\d+)\s*$/ ) { +% $quan = $1; +% } elsif ( $pkg_svc->quantity ) { +% $quan = $pkg_svc->quantity; +% } - quantity || 0 %>"> + @@ -208,10 +212,9 @@ Tax information -% foreach my $f ( qw( clone pkgnum ) ) { - - -% } +% foreach my $f ( qw( clone pkgnum ) ) { #safe, these were untained in %init + +% } % @@ -231,12 +234,9 @@ Tax information %#} else { %# push @fixups, 'taxclass'; #hidden %#} -%my @form_elements = ( 'classnum', 'taxclass' ); +%my @form_elements = ( 'classnum', 'taxclass', 'agent_type' ); % -%my @form_radio = (); -%if ( dbdef->table('pkg_svc')->column('primary_svc') ) { -% push @form_radio, 'pkg_svc_primary'; -%} +%my @form_radio = ( 'pkg_svc_primary' ); % %tie my %freq, 'Tie::IxHash', %{FS::part_pkg->freqs_href()}; %if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) { @@ -250,7 +250,8 @@ Tax information % 'form_action' => 'process/part_pkg.cgi', % 'form_elements' => \@form_elements, % 'form_text' => [ qw(pkg comment promo_code clone pkgnum pkgpart), -% @fixups +% qw(pay_weight credit_weight), #keys(%weight), +% @fixups, % ], % 'form_checkbox' => [ qw(setuptax recurtax disabled) ], % 'form_radio' => \@form_radio, @@ -282,10 +283,12 @@ Tax information % % $html .= ''. $href->{$field}{'name'}. ''; % +% my $format = sub { shift }; +% $format = $href->{$field}{'format'} if exists($href->{$field}{'format'}); % if ( ! exists($href->{$field}{'type'}) ) { % $html .= qq!!; % } elsif ( $href->{$field}{'type'} eq 'checkbox' ) { @@ -341,7 +344,10 @@ Tax information % '

'; % % $html .= '{pkgpart} ? "Apply changes" : "Add package" ) +% ). % '" onClick="fchanged(this)">'; % % $html; @@ -353,5 +359,67 @@ Tax information

Price plan <% $widget->html %> - - + +<% include('/elements/footer.html') %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Edit package definitions') + || $FS::CurrentUser::CurrentUser->access_right('Edit global package definitions'); + +if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { + $cgi->param('clone', $1); +} else { + $cgi->param('clone', ''); +} +if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { + $cgi->param('pkgnum', $1); +} else { + $cgi->param('pkgnum', ''); +} + +my ($query) = $cgi->keywords; + +my $conf = new FS::Conf; +my $part_pkg = ''; +my @agent_type = (); +my @all_agent_types = map {$_->typenum} qsearch('agent_type',{}); +if ( $cgi->param('error') ) { + $part_pkg = new FS::part_pkg ( { + map { $_, scalar($cgi->param($_)) } fields('part_pkg') + } ); + (@agent_type) = $cgi->param('agent_type'); +} + +my $action = ''; +my $clone_part_pkg = ''; +my $pkgpart = ''; +if ( $cgi->param('clone') ) { + $pkgpart = $cgi->param('clone'); + #$action = 'Custom Pricing'; + $action = 'Custom'; + $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); + $part_pkg ||= $clone_part_pkg->clone; + $part_pkg->disabled('Y') unless $cgi->param('error'); +} elsif ( $query && $query =~ /^(\d+)$/ ) { + (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1}) + unless $part_pkg; + $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1}); + $pkgpart = $part_pkg->pkgpart; +} else { + unless ( $part_pkg ) { + $part_pkg = new FS::part_pkg {}; + $part_pkg->plan('flat'); + @agent_type = @all_agent_types if $conf->exists('agent_defaultpkg'); + + } +} +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; + +