X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcontact.pm;h=60c521612e72091f7e017c9cb0f418de7f1b5246;hb=707368aa7db1cecdd05b74c8531249a1e1370823;hp=d0dd8b7731df447e38b38481a6938e52edb2287d;hpb=7b268e364a68b076e1f3bd3741159fb51759ee19;p=freeside.git

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index d0dd8b773..60c521612 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -2,12 +2,15 @@ package FS::contact;
 use base qw( FS::Record );
 
 use strict;
+use vars qw( $skip_fuzzyfiles );
 use Scalar::Util qw( blessed );
 use FS::Record qw( qsearchs dbh ); # qw( qsearch qsearchs dbh );
 use FS::contact_phone;
 use FS::contact_email;
 use FS::queue;
 
+$skip_fuzzyfiles = 0;
+
 =head1 NAME
 
 FS::contact - Object methods for contact records
@@ -161,7 +164,7 @@ sub insert {
 
   }
 
-  #unless ( $import || $skip_fuzzyfiles ) {
+  unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) {
     #warn "  queueing fuzzyfiles update\n"
     #  if $DEBUG > 1;
     $error = $self->queue_fuzzyfiles_update;
@@ -169,7 +172,7 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return "updating fuzzy search cache: $error";
     }
-  #}
+  }
 
   if ( $self->selfservice_access ) {
     my $error = $self->send_reset_email( queue=>1 );
@@ -207,6 +210,15 @@ sub delete {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  foreach my $cust_pkg ( $self->cust_pkg ) {
+    $cust_pkg->contactnum('');
+    my $error = $cust_pkg->replace;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
   foreach my $object ( $self->contact_phone, $self->contact_email ) {
     my $error = $object->delete;
     if ( $error ) {
@@ -309,7 +321,7 @@ sub replace {
 
   }
 
-  #unless ( $import || $skip_fuzzyfiles ) {
+  unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) {
     #warn "  queueing fuzzyfiles update\n"
     #  if $DEBUG > 1;
     $error = $self->queue_fuzzyfiles_update;
@@ -317,7 +329,7 @@ sub replace {
       $dbh->rollback if $oldAutoCommit;
       return "updating fuzzy search cache: $error";
     }
-  #}
+  }
 
   if (    ( $old->selfservice_access eq '' && $self->selfservice_access
               && ! $self->_password
@@ -454,6 +466,11 @@ sub line {
   $data;
 }
 
+sub firstlast {
+  my $self = shift;
+  $self->first . ' ' . $self->last;
+}
+
 sub contact_classname {
   my $self = shift;
   my $contact_class = $self->contact_class or return '';