X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=d3d4f8510bd6ce87bfad5136928c125643a193fa;hb=12f5c0d0824f8eefaa107ed3ea5e6503950968a6;hp=6cfaa122e5e7e740be60e0e854069f322f7a8398;hpb=a6d3e4dc73803cffad96fd4b6270b2fb5f4b0568;p=freeside.git diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index 6cfaa122e..d3d4f8510 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -1,114 +1,107 @@ -<% -# +%if ( $error ) { +% $dbh->rollback if $oldAutoCommit; +% $cgi->param('error', $error ); +<% $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string ) %> +%} elsif ( $custnum ) { +% $dbh->commit or die $dbh->errstr if $oldAutoCommit; +<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum") %> +%} else { +% $dbh->commit or die $dbh->errstr if $oldAutoCommit; +<% $cgi->redirect(popurl(3). "browse/part_pkg.cgi") %> +%} +<%init> -use strict; -use vars qw( $cgi $pkgpart $old $new $part_svc $error $dbh ); -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use FS::UID qw(cgisuidsetup); -use FS::CGI qw(popurl); -use FS::Record qw(qsearch qsearchs fields); -use FS::part_pkg; -use FS::pkg_svc; -use FS::cust_pkg; +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Edit package definitions') + || $FS::CurrentUser::CurrentUser->access_right('Edit global package definitions'); -$cgi = new CGI; -$dbh = &cgisuidsetup($cgi); +my $dbh = dbh; +my $conf = new FS::Conf; -$pkgpart = $cgi->param('pkgpart'); +my $pkgpart = $cgi->param('pkgpart'); -$old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart; +my $old = qsearchs('part_pkg',{'pkgpart'=>$pkgpart}) if $pkgpart; + +tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; +my $href = $plans{$cgi->param('plan')}->{'fields'}; #fixup plandata +my $error; my $plandata = $cgi->param('plandata'); my @plandata = split(',', $plandata); $cgi->param('plandata', - join('', map { "$_=". $cgi->param($_). "\n" } @plandata ) + join('', map { my $parser = sub { shift }; + $parser = $href->{$_}{parse} if exists($href->{$_}{parse}); + my $value = join(', ', &$parser($cgi->param($_))); + my $check = $href->{$_}{check}; + if ( $check && ! &$check($value) ) { + $value = join(', ', $cgi->param($_)); + $error ||= "Illegal ". ($href->{$_}{name}||$_). ": $value"; + } + "$_=$value\n"; + } @plandata ) ); -$new = new FS::part_pkg ( { +foreach (qw( setuptax recurtax disabled )) { + $cgi->param($_, '') unless defined $cgi->param($_); +} + +my @agents; +foreach ($cgi->param('agent_type')) { + /^(\d+)$/; + push @agents, $1 if $1; +} +$error = "At least one agent type must be specified." + unless( scalar(@agents) || + $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ || + !$pkgpart && $conf->exists('agent-defaultpkg') + ); + +my $new = new FS::part_pkg ( { map { - $_, scalar($cgi->param($_)); + $_ => scalar($cgi->param($_)); } fields('part_pkg') } ); -#most of the stuff below should move to part_pkg.pm +my $oldAutoCommit = $FS::UID::AutoCommit; +local $FS::UID::AutoCommit = 0; -foreach $part_svc ( qsearch('part_svc', {} ) ) { - my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0; - unless ( $quantity =~ /^(\d+)$/ ) { - $cgi->param('error', "Illegal quantity" ); - print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string ); - exit; - } -} +my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) } + map { $_->svcpart } + qsearch('part_svc', {} ); -local $SIG{HUP} = 'IGNORE'; -local $SIG{INT} = 'IGNORE'; -local $SIG{QUIT} = 'IGNORE'; -local $SIG{TERM} = 'IGNORE'; -local $SIG{TSTP} = 'IGNORE'; -local $SIG{PIPE} = 'IGNORE'; +my $custnum = ''; +if ( $error ) { -local $FS::UID::AutoCommit = 0; + # fall through -if ( $pkgpart ) { - $error = $new->replace($old); +} elsif ( $cgi->param('taxclass') eq '(select)' ) { + + $error = 'Must select a tax class'; + +} elsif ( $pkgpart ) { + + $error = $new->replace( $old, + pkg_svc => \%pkg_svc, + primary_svc => scalar($cgi->param('pkg_svc_primary')), + ); } else { - $error = $new->insert; - $pkgpart=$new->pkgpart; -} -if ( $error ) { - $dbh->rollback; - $cgi->param('error', $error ); - print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string ); - exit; -} -foreach $part_svc (qsearch('part_svc',{})) { - my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0; - my $old_pkg_svc = qsearchs('pkg_svc', { - 'pkgpart' => $pkgpart, - 'svcpart' => $part_svc->svcpart, - } ); - my $old_quantity = $old_pkg_svc ? $old_pkg_svc->quantity : 0; - next unless $old_quantity != $quantity; #!here - my $new_pkg_svc = new FS::pkg_svc( { - 'pkgpart' => $pkgpart, - 'svcpart' => $part_svc->svcpart, - 'quantity' => $quantity, - } ); - if ( $old_pkg_svc ) { - my $myerror = $new_pkg_svc->replace($old_pkg_svc); - if ( $myerror ) { - $dbh->rollback; - die $myerror; - } - } else { - my $myerror = $new_pkg_svc->insert; - if ( $myerror ) { - $dbh->rollback; - die $myerror; - } - } + $error = $new->insert( pkg_svc => \%pkg_svc, + primary_svc => scalar($cgi->param('pkg_svc_primary')), + cust_pkg => $cgi->param('pkgnum'), + custnum_ref => \$custnum, + ); + $pkgpart = $new->pkgpart; } -unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) { - $dbh->commit or die $dbh->errstr; - print $cgi->redirect(popurl(3). "browse/part_pkg.cgi"); -} else { - my($old_cust_pkg) = qsearchs( 'cust_pkg', { 'pkgnum' => $1 } ); - my %hash = $old_cust_pkg->hash; - $hash{'pkgpart'} = $pkgpart; - my($new_cust_pkg) = new FS::cust_pkg \%hash; - my $myerror = $new_cust_pkg->replace($old_cust_pkg); - if ( $myerror ) { - $dbh->rollback; - die "Error modifying cust_pkg record: $myerror\n"; - } - - $dbh->commit or die $dbh->errstr; - print $cgi->redirect(popurl(3). "view/cust_main.cgi?". $new_cust_pkg->custnum); +unless ( $error || $conf->exists('agent_defaultpkg') ) { + my $error = $new->process_m2m( + 'link_table' => 'type_pkgs', + 'target_table' => 'agent_type', + 'params' => \@agents, + ); } -%> + +