X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FPackages.pm;h=29e3bec13dc1aab409e98bcc52dc86496729164f;hb=194d0e29f4587669032da09c3bf814c3531898a2;hp=ee38f047e420ca31a5ee82221c316ad2f3b7984b;hpb=ceaa9e6ca4222595c1795c4bbde8d1c9609045e7;p=freeside.git

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index ee38f047e..29e3bec13 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -87,7 +87,7 @@ sub order_pkg {
     if exists($opt->{'depend_jobnum'}) && $opt->{'depend_jobnum'};
 
   my %insert_params = map { $opt->{$_} ? ( $_ => $opt->{$_} ) : () }
-                          qw( ticket_subject ticket_queue );
+                          qw( ticket_subject ticket_queue allow_pkgpart );
 
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
@@ -100,17 +100,26 @@ sub order_pkg {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
-  if ( $opt->{'cust_location'} &&
-       ( ! $cust_pkg->locationnum || $cust_pkg->locationnum == -1 ) ) {
-    my $error = $opt->{'cust_location'}->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "inserting cust_location (transaction rolled back): $error";
+  if ( $opt->{'locationnum'} and $opt->{'locationnum'} != -1 ) {
+
+    $cust_pkg->locationnum($opt->{'locationnum'});
+
+  } elsif ( $opt->{'cust_location'} ) {
+
+    if ( ! $opt->{'cust_location'}->locationnum ) {
+      # not inserted yet
+      my $error = $opt->{'cust_location'}->insert;
+      if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "inserting cust_location (transaction rolled back): $error";
+      }
     }
     $cust_pkg->locationnum($opt->{'cust_location'}->locationnum);
-  }
-  else {
+
+  } else {
+
     $cust_pkg->locationnum($self->ship_locationnum);
+
   }
 
   $cust_pkg->custnum( $self->custnum );
@@ -147,7 +156,7 @@ sub order_pkg {
   # add supplemental packages, if any are needed
   my $part_pkg = FS::part_pkg->by_key($cust_pkg->pkgpart);
   foreach my $link ($part_pkg->supp_part_pkg_link) {
-    warn "inserting supplemental package ".$link->dst_pkgpart;
+    #warn "inserting supplemental package ".$link->dst_pkgpart;
     my $pkg = FS::cust_pkg->new({
         'pkgpart'       => $link->dst_pkgpart,
         'pkglinknum'    => $link->pkglinknum,
@@ -164,6 +173,7 @@ sub order_pkg {
         'refnum'        => $cust_pkg->refnum,
         'discountnum'   => $cust_pkg->discountnum,
         'waive_setup'   => $cust_pkg->waive_setup,
+        'allow_pkgpart' => $opt->{'allow_pkgpart'},
     });
     $error = $self->order_pkg('cust_pkg' => $pkg);
     if ( $error ) {