projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
contact.pm
diff --git
a/FS/FS/contact.pm
b/FS/FS/contact.pm
index
9ce73e1
..
60c5216
100644
(file)
--- 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 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;
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
=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;
#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";
}
$dbh->rollback if $oldAutoCommit;
return "updating fuzzy search cache: $error";
}
-
#
}
+ }
if ( $self->selfservice_access ) {
my $error = $self->send_reset_email( queue=>1 );
if ( $self->selfservice_access ) {
my $error = $self->send_reset_email( queue=>1 );
@@
-318,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;
#warn " queueing fuzzyfiles update\n"
# if $DEBUG > 1;
$error = $self->queue_fuzzyfiles_update;
@@
-326,7
+329,7
@@
sub replace {
$dbh->rollback if $oldAutoCommit;
return "updating fuzzy search cache: $error";
}
$dbh->rollback if $oldAutoCommit;
return "updating fuzzy search cache: $error";
}
-
#
}
+ }
if ( ( $old->selfservice_access eq '' && $self->selfservice_access
&& ! $self->_password
if ( ( $old->selfservice_access eq '' && $self->selfservice_access
&& ! $self->_password
@@
-463,6
+466,11
@@
sub line {
$data;
}
$data;
}
+sub firstlast {
+ my $self = shift;
+ $self->first . ' ' . $self->last;
+}
+
sub contact_classname {
my $self = shift;
my $contact_class = $self->contact_class or return '';
sub contact_classname {
my $self = shift;
my $contact_class = $self->contact_class or return '';