X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcontact.pm;h=e5ddcdcb6782b049276108a80178935f05933a26;hb=450d0dec955bf6ae8d7acdc13a8bfc19777089d3;hp=612048022b99ecdc15576bbbfb2ae5851c1bbf26;hpb=1cfc3ea3efb8c75388ad344ea9481f6f8df072b9;p=freeside.git diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm index 612048022..e5ddcdcb6 100644 --- a/FS/FS/contact.pm +++ b/FS/FS/contact.pm @@ -1,11 +1,13 @@ package FS::contact; -use base qw( FS::Record ); +use base qw( FS::Password_Mixin + FS::Record ); use strict; use vars qw( $skip_fuzzyfiles ); use Carp; use Scalar::Util qw( blessed ); use FS::Record qw( qsearch qsearchs dbh ); +use FS::Cursor; use FS::contact_phone; use FS::contact_email; use FS::queue; @@ -88,6 +90,9 @@ empty or bcrypt disabled +=item invoice_dest + +empty, or 'Y' if email invoices should be sent to this contact =back @@ -111,6 +116,25 @@ sub table { 'contact'; } Adds this record to the database. If there is an error, returns the error, otherwise returns false. +If the object has an C field, L records will +be created for each (comma-separated) email address in that field. If any of +these coincide with an existing email address, this contact will be merged with +the contact with that address. + +Then, if the object has any fields named C an +L record will be created for each of them. Those fields +should contain phone numbers of the appropriate types (where N is the key of +an L record identifying the type of number: daytime, night, +etc.). + +After inserting the record, if the object has a 'custnum' or 'prospectnum' +field, an L or L record will be +created to link the contact to the customer. The following fields will also +be included in that record, if they are set on the object: +- classnum +- comment +- selfservice_access + =cut sub insert { @@ -164,20 +188,24 @@ sub insert { } + my $error; if ( $existing_contact ) { $self->$_($existing_contact->$_()) for qw( contactnum _password _password_encoding ); - $self->SUPER::replace($existing_contact); + $error = $self->SUPER::replace($existing_contact); } else { - my $error = $self->SUPER::insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } + $error = $self->SUPER::insert; + + } + + $error ||= $self->insert_password_history; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; } my $cust_contact = ''; @@ -403,6 +431,9 @@ sub replace { } my $error = $self->SUPER::replace($old); + if ( $old->_password ne $self->_password ) { + $error ||= $self->insert_password_history; + } if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; @@ -643,6 +674,7 @@ sub check { || $self->ut_textn('_password') || $self->ut_enum('_password_encoding', [ '', 'bcrypt']) || $self->ut_enum('disabled', [ '', 'Y' ]) + || $self->ut_flag('invoice_dest') ; return $error if $error; @@ -766,9 +798,22 @@ sub authenticate_password { } +=item change_password NEW_PASSWORD + +Changes the contact's selfservice access password to NEW_PASSWORD. This does +not check password policy rules (see C) and will return +an error only if editing the record fails for some reason. + +If NEW_PASSWORD is the same as the existing password, this does nothing. + +=cut + sub change_password { my($self, $new_password) = @_; + # do nothing if the password is unchanged + return if $self->authenticate_password($new_password); + $self->change_password_fields( $new_password ); $self->replace; @@ -886,6 +931,7 @@ sub cgi_contact_fields { my @contact_fields = qw( classnum first last title comment emailaddress selfservice_access + invoice_dest ); push @contact_fields, 'phonetypenum'. $_->phonetypenum @@ -899,6 +945,32 @@ use FS::upgrade_journal; sub _upgrade_data { #class method my ($class, %opts) = @_; + # always migrate cust_main_invoice records over + local $FS::cust_main::import = 1; # override require_phone and such + my $search = FS::Cursor->new('cust_main_invoice', {}); + while (my $cust_main_invoice = $search->fetch) { + my $custnum = $cust_main_invoice->custnum; + my $dest = $cust_main_invoice->dest; + my $cust_main = $cust_main_invoice->cust_main; + + if ( $dest =~ /^\d+$/ ) { + my $svc_acct = FS::svc_acct->by_key($dest); + die "custnum $custnum, invoice destination svcnum $svc_acct does not exist\n" + if !$svc_acct; + $dest = $svc_acct->email; + } + + my $error = $cust_main->replace( [ $dest ] ); + + if ( $error ) { + die "custnum $custnum, invoice destination $dest, creating contact: $error\n"; + } + + $error = $cust_main_invoice->delete; + die "custnum $custnum, cleaning up cust_main_invoice: $error\n" if $error; + + } # while $search->fetch + unless ( FS::upgrade_journal->is_done('contact__DUPEMAIL') ) { foreach my $contact (qsearch('contact', {})) {