projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 79363 Hide empty tax section, invoice_sections_with_taxes
[freeside.git]
/
FS
/
FS
/
contact.pm
diff --git
a/FS/FS/contact.pm
b/FS/FS/contact.pm
index
a873fda
..
fa047f5
100644
(file)
--- a/
FS/FS/contact.pm
+++ b/
FS/FS/contact.pm
@@
-10,6
+10,7
@@
use FS::Record qw( qsearch qsearchs dbh );
use FS::Cursor;
use FS::contact_phone;
use FS::contact_email;
use FS::Cursor;
use FS::contact_phone;
use FS::contact_email;
+use FS::contact::Import;
use FS::queue;
use FS::phone_type; #for cgi_contact_fields
use FS::cust_contact;
use FS::queue;
use FS::phone_type; #for cgi_contact_fields
use FS::cust_contact;
@@
-154,7
+155,7
@@
sub insert {
$self->custnum('');
my %link_hash = ();
$self->custnum('');
my %link_hash = ();
- for (qw( classnum comment selfservice_access invoice_dest )) {
+ for (qw( classnum comment selfservice_access invoice_dest
message_dest
)) {
$link_hash{$_} = $self->get($_);
$self->$_('');
}
$link_hash{$_} = $self->get($_);
$self->$_('');
}
@@
-429,7
+430,7
@@
sub replace {
$self->custnum('');
my %link_hash = ();
$self->custnum('');
my %link_hash = ();
- for (qw( classnum comment selfservice_access invoice_dest )) {
+ for (qw( classnum comment selfservice_access invoice_dest
message_dest
)) {
$link_hash{$_} = $self->get($_);
$self->$_('');
}
$link_hash{$_} = $self->get($_);
$self->$_('');
}
@@
-577,6
+578,15
@@
sub replace {
}
}
}
}
+ if ( $self->get('password') ) {
+ my $error = $self->is_password_allowed($self->get('password'))
+ || $self->change_password($self->get('password'));
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
+ }
+
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
@@
-663,7
+673,7
@@
and replace methods.
sub check {
my $self = shift;
sub check {
my $self = shift;
- if ( $self->selfservice_access eq 'R' ) {
+ if ( $self->selfservice_access eq 'R'
|| $self->selfservice_access eq 'P'
) {
$self->selfservice_access('Y');
$self->_resend('Y');
}
$self->selfservice_access('Y');
$self->_resend('Y');
}
@@
-945,7
+955,7
@@
sub cgi_contact_fields {
my @contact_fields = qw(
classnum first last title comment emailaddress selfservice_access
my @contact_fields = qw(
classnum first last title comment emailaddress selfservice_access
- invoice_dest
+ invoice_dest
message_dest password
);
push @contact_fields, 'phonetypenum'. $_->phonetypenum
);
push @contact_fields, 'phonetypenum'. $_->phonetypenum
@@
-1018,4
+1028,3
@@
L<FS::Record>, schema.html from the base documentation.
=cut
1;
=cut
1;
-