X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=0d0a13491f9dd3c26ace59b3ce7ffa92d0d69f1f;hb=d1a885c65ac10e19bed0333a380dafeb42c2cef1;hp=d489426f96e440b952698b12b94e9d21a3252b85;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac;p=freeside.git

diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index d489426f9..0d0a13491 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -19,91 +19,43 @@ foreach (qw( setuptax recurtax disabled )) {
 
 my $new = new FS::part_pkg ( {
   map {
-    $_, scalar($cgi->param($_));
+    $_ => scalar($cgi->param($_));
   } fields('part_pkg')
 } );
 
-#warn "setuptax: ". $new->setuptax;
-#warn "recurtax: ". $new->recurtax;
+my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) }
+              map { $_->svcpart }
+              qsearch('part_svc', {} );
 
-#most of the stuff below should move to part_pkg.pm
-
-foreach my $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 );
-    myexit();
-  }
-}
+my $error;
+my $custnum = '';
+if ( $cgi->param('taxclass') eq '(select)' ) {
 
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-local $SIG{PIPE} = 'IGNORE';
+  $error = 'Must select a tax class';
 
-local $FS::UID::AutoCommit = 0;
+} elsif ( $pkgpart ) {
 
-my $error;
-if ( $pkgpart ) {
-  $error = $new->replace($old);
+  $error = $new->replace( $old,
+                          pkg_svc     => \%pkg_svc,
+                          primary_svc => scalar($cgi->param('pkg_svc_primary')),
+                        );
 } else {
-  $error = $new->insert;
-  $pkgpart=$new->pkgpart;
+
+  $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;
 }
+
 if ( $error ) {
-  $dbh->rollback;
   $cgi->param('error', $error );
   print $cgi->redirect(popurl(2). "part_pkg.cgi?". $cgi->query_string );
-  myexit();
-}
-
-foreach my $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;
-    }
-  }
-}
-
-unless ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $dbh->commit or die $dbh->errstr;
-  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
+} elsif ( $custnum )  {
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
 } 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);
+  print $cgi->redirect(popurl(3). "browse/part_pkg.cgi");
 }
 
 %>