fix contact self-service disabled on edit (and some basic contact reports), RT#25533, RT#32171, RT#32212

3 files changed, 72 insertions, 15 deletions

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 4e57032..bad831a 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -93,11 +93,9 @@ tie my %rights, 'Tie::IxHash',
     'New prospect',
     'View prospect',
     'Edit prospect',
-    'List prospects',
     'Edit contact', #!
     #'New contact',
     #'View customer contacts',
-    #'List contacts',
     'Generate quotation',
   ],
   
@@ -269,6 +267,8 @@ tie my %rights, 'Tie::IxHash',
   # report/listing rights...
   ###
   'Reporting/listing rights' => [
+    'List prospects',
+    'List contacts',
     'List customers',
     'List all customers',
     'Advanced customer search',
diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 87b052f..ee0c494 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -247,6 +247,8 @@ sub _upgrade_data { # class method
     'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
     'Configuration' => 'Edit global fee definitions',
     'Edit package definition costs' => 'View package definition costs',
+    'List prospects' => 'List contacts',
+    'List customers' => 'List contacts',
   );
 
 #  foreach my $old_acl ( keys %onetime ) {
diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 60c5216..3205df1 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -4,10 +4,11 @@ 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::Record qw( qsearch qsearchs dbh );
 use FS::contact_phone;
 use FS::contact_email;
 use FS::queue;
+use FS::phone_type; #for cgi_contact_fields
 
 $skip_fuzzyfiles = 0;
 
@@ -32,8 +33,9 @@ FS::contact - Object methods for contact records
 
 =head1 DESCRIPTION
 
-An FS::contact object represents an example.  FS::contact inherits from
-FS::Record.  The following fields are currently supported:
+An FS::contact object represents an specific contact person for a prospect or
+customer.  FS::contact inherits from FS::Record.  The following fields are
+currently supported:
 
 =over 4
 
@@ -92,15 +94,13 @@ disabled
 
 =item new HASHREF
 
-Creates a new example.  To add the example to the database, see L<"insert">.
+Creates a new contact.  To add the contact to the database, see L<"insert">.
 
 Note that this stores the hash reference, not a distinct copy of the hash it
 points to.  You can ask the object for a copy with the I<hash> method.
 
 =cut
 
-# the new method can be inherited from FS::Record, if a table method is defined
-
 sub table { 'contact'; }
 
 =item insert
@@ -194,8 +194,6 @@ Delete this record from the database.
 
 =cut
 
-# the delete method can be inherited from FS::Record
-
 sub delete {
   my $self = shift;
 
@@ -350,7 +348,15 @@ sub replace {
 
 }
 
-#i probably belong in contact_phone.pm
+=item _parse_phonestring PHONENUMBER_STRING
+
+Subroutine, takes a string and returns a list (suitable for assigning to a hash)
+with keys 'countrycode', 'phonenum' and 'extension'
+
+(Should probably be moved to contact_phone.pm, hence the initial underscore.)
+
+=cut
+
 sub _parse_phonestring {
   my $value = shift;
 
@@ -413,15 +419,12 @@ sub queue_fuzzyfiles_update {
 
 =item check
 
-Checks all fields to make sure this is a valid example.  If there is
+Checks all fields to make sure this is a valid contact.  If there is
 an error, returns the error, otherwise returns false.  Called by the insert
 and replace methods.
 
 =cut
 
-# the check method should currently be supplied - FS::Record contains some
-# data checking routines
-
 sub check {
   my $self = shift;
 
@@ -456,6 +459,13 @@ sub check {
   $self->SUPER::check;
 }
 
+=item line
+
+Returns a formatted string representing this contact, including name, title and
+comment.
+
+=cut
+
 sub line {
   my $self = shift;
   my $data = $self->first. ' '. $self->last;
@@ -466,17 +476,37 @@ sub line {
   $data;
 }
 
+=item firstlast
+
+Returns a formatted string representing this contact, with just the name.
+
+=cut
+
 sub firstlast {
   my $self = shift;
   $self->first . ' ' . $self->last;
 }
 
+=item contact_classname
+
+Returns the name of this contact's class (see L<FS::contact_class>).
+
+=cut
+
 sub contact_classname {
   my $self = shift;
   my $contact_class = $self->contact_class or return '';
   $contact_class->classname;
 }
 
+=item by_selfservice_email EMAILADDRESS
+
+Alternate search constructor (class method).  Given an email address,
+returns the contact for that address, or the empty string if no contact
+has that email address.
+
+=cut
+
 sub by_selfservice_email {
   my($class, $email) = @_;
 
@@ -624,6 +654,31 @@ sub myaccount_cache {
                        } );
 }
 
+=item cgi_contact_fields
+
+Returns a list reference containing the set of contact fields used in the web
+interface for one-line editing (i.e. excluding contactnum, prospectnum, custnum
+and locationnum, as well as password fields, but including fields for
+contact_email and contact_phone records.)
+
+=cut
+
+sub cgi_contact_fields {
+  #my $class = shift;
+
+  my @contact_fields = qw(
+    classnum first last title comment emailaddress selfservice_access
+  );
+
+  push @contact_fields, 'phonetypenum'. $_->phonetypenum
+    foreach qsearch({table=>'phone_type', order_by=>'weight'});
+
+  \@contact_fields;
+
+}
+
+use FS::phone_type;
+
 =back
 
 =head1 BUGS