X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fdid_order.pm;h=1479565b158b91458998e5707b4d2da5b8b34864;hp=2404ad817a64edb18964a2314b541114154b28bc;hb=8d0e8149e7b19ad8543ac6c8c663be63dbc34762;hpb=9a59cc9d51350d7eefb25697cd0d99188f686ea5

diff --git a/FS/FS/did_order.pm b/FS/FS/did_order.pm
index 2404ad817..1479565b1 100644
--- a/FS/FS/did_order.pm
+++ b/FS/FS/did_order.pm
@@ -1,7 +1,7 @@
 package FS::did_order;
+use base qw( FS::o2m_Common FS::Record );
 
 use strict;
-use base qw( FS::o2m_Common FS::Record );
 use FS::Record qw( qsearch qsearchs dbh );
 
 =head1 NAME
@@ -124,6 +124,8 @@ sub delete {
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
 }
 
 =item merge SOURCE_ORDER
@@ -133,11 +135,11 @@ Merges the DID order given by SOURCE_ORDER into THIS order.
 The following fields from the source order are transferred, only if they aren't
 set in this order:
 -vendor order #
--submitted
 -confirmed
 -customer
 
-DID order items are transferred into this order.
+DID order items are transferred into this order. Per-order customer is cleared
+if any order items are assigned to a customer.
 
 The source order is deleted.
 
@@ -157,25 +159,57 @@ sub merge {
 
     return "DID vendors do not match"
         if $src->vendornum != $self->vendornum;
-
-    my @move_if_unset = qw( vendor_order_id submitted confirmed custnum );
+        
+    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 $oldAutoCommit = $FS::UID::AutoCommit;
+    local $FS::UID::AutoCommit = 0;
+    my $dbh = dbh;
+
+    my @move_if_unset = qw( vendor_order_id confirmed custnum );
     foreach my $f ( @move_if_unset ) {
         $self->$f($src->$f) if !$self->$f;
     }
 
     my $error = '';
-    my @did_order_items = qsearch('did_order_item', { 'ordernum' => $src->ordernum });
-    foreach my $did_order_item ( @did_order_items ) {
+    my $item_has_cust = 0;
+    my @did_order_item = $src->did_order_item;
+    foreach my $did_order_item ( @did_order_item ) {
         $did_order_item->ordernum($self->ordernum);
+        $item_has_cust = 1 if $did_order_item->custnum;
         $error = $did_order_item->replace;
-        return $error if $error;
+        if ( $error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return "can't replace did order item "
+                                  . $did_order_item->orderitemnum . ": $error";
+        }
     }
 
+    @did_order_item = $self->did_order_item;
+    foreach my $did_order_item ( @did_order_item ) {
+        $item_has_cust = 1 if $did_order_item->custnum;
+    }
+
+    $self->custnum('') if $item_has_cust;
+
     $error = $src->delete;
-    return $error if !$error;
+    if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't delete source order: $error"; 
+    }
 
     $error = $self->replace;
-    return $error if !$error;
+    if ( $error ) {
+        $dbh->rollback if $oldAutoCommit;
+        return "can't replace target order: $error"; 
+    }
+
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
     '';
 }
@@ -220,13 +254,6 @@ sub check {
 
 Returns the did_order_items (see L<FS::did_order_item>) associated with this bulk DID order.
 
-=cut
-
-sub did_order_item {
-  my $self = shift;
-  qsearch( 'did_order_item', { 'ordernum' => $self->ordernum } );
-}
-
 =item cust_main
 
 Returns all cust_main (see L<FS::cust_main>), if any, associated with this