projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 80669 Cancelled customers on customer churn report
[freeside.git]
/
FS
/
FS
/
contact.pm
diff --git
a/FS/FS/contact.pm
b/FS/FS/contact.pm
index
148fa61
..
4db3cdf
100644
(file)
--- a/
FS/FS/contact.pm
+++ b/
FS/FS/contact.pm
@@
-12,6
+12,7
@@
use FS::contact_class;
use FS::cust_location;
use FS::contact_phone;
use FS::contact_email;
use FS::cust_location;
use FS::contact_phone;
use FS::contact_email;
+use FS::contact::Import;
use FS::queue;
use FS::cust_pkg;
use FS::phone_type; #for cgi_contact_fields
use FS::queue;
use FS::cust_pkg;
use FS::phone_type; #for cgi_contact_fields
@@
-370,6
+371,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;
'';
@@
-456,7
+466,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 'E' || $self->selfservice_access eq 'P'
) {
$self->selfservice_access('Y');
$self->_resend('Y');
}
$self->selfservice_access('Y');
$self->_resend('Y');
}
@@
-690,8
+700,6
@@
sub send_reset_email {
#email it
#email it
- my $conf = new FS::Conf;
-
my $cust_main = $self->cust_main
or die "no customer"; #reset a password for a prospect contact? someday
my $cust_main = $self->cust_main
or die "no customer"; #reset a password for a prospect contact? someday
@@
-744,6
+752,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 password
);
push @contact_fields, 'phonetypenum'. $_->phonetypenum
);
push @contact_fields, 'phonetypenum'. $_->phonetypenum