X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=2638abaaa5589d4be5bed5ce339980435bae0837;hb=2fa93569943d258103ac6d3e1db75223427f081b;hp=fba232dd8183e8b187fc1c0560849466f2ee5973;hpb=4778dab8ae1c8cb6e6c784c9da1e475072479516;p=freeside.git

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index fba232dd8..2638abaaa 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -323,45 +323,20 @@ error, otherwise returns false.
 
 =cut
 
-sub insert {
-  my $self = shift;
-  my %options = @_;
+sub preinsert_hook_first {
+  my( $self, %options ) = @_;
 
-  if ( $DEBUG ) {
-    warn "[$me] insert called on $self: ". Dumper($self).
-         "\nwith options: ". Dumper(%options);
-  }
-
-  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;
+  return '' unless $options{'cust_location'};
 
   #false laziness w/cust_pkg.pm... move this to location_Mixin?  that would
   #make it more of a base class than a mixin... :)
-  if ( $options{'cust_location'} ) {
-    my $error = $options{'cust_location'}->find_or_insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return "inserting cust_location (transaction rolled back): $error";
-    }
-    $self->locationnum( $options{'cust_location'}->locationnum );
-  }
+  $options{'cust_location'}->custnum( $self->cust_svc->cust_pkg->custnum );
+  my $error = $options{'cust_location'}->find_or_insert;
+  return "inserting cust_location (transaction rolled back): $error"
+    if $error;
+  $self->locationnum( $options{'cust_location'}->locationnum );
   #what about on-the-fly edits?  if the ui supports it?
 
-  my $error = $self->SUPER::insert(%options);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';
 
 }