[freeside-commits] branch FREESIDE_3_BRANCH updated. 8c2c7b4dc761ce015972444fb9fb8df7e7a9a5a4
Ivan
ivan at 420.am
Tue Nov 18 19:49:50 PST 2014
The branch, FREESIDE_3_BRANCH has been updated
via 8c2c7b4dc761ce015972444fb9fb8df7e7a9a5a4 (commit)
from 6dc141f17f5d76d3ac74b705b7e1e27e2d28d2a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8c2c7b4dc761ce015972444fb9fb8df7e7a9a5a4
Author: Ivan Kohler <ivan at freeside.biz>
Date: Tue Nov 18 19:41:38 2014 -0800
fix contact self-service disabled on edit (and some basic contact reports), RT#25533, RT#32171, RT#32212
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 0369374..6d3937e 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 42e7ed2..0be3b23 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -244,6 +244,8 @@ sub _upgrade_data { # class method
'Edit global package definitions' => 'Edit package definition costs',
'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 c9cc69f..5626ca5 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -13,6 +13,7 @@ use FS::contact_phone;
use FS::contact_email;
use FS::queue;
use FS::cust_pkg;
+use FS::phone_type; #for cgi_contact_fields
$skip_fuzzyfiles = 0;
@@ -37,8 +38,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
@@ -97,15 +99,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
@@ -199,8 +199,6 @@ Delete this record from the database.
=cut
-# the delete method can be inherited from FS::Record
-
sub delete {
my $self = shift;
@@ -355,7 +353,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;
@@ -418,15 +424,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;
@@ -461,6 +464,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;
@@ -483,11 +493,23 @@ sub contact_class {
qsearchs('contact_class', { 'classnum' => $self->classnum } );
}
+=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 '';
@@ -514,6 +536,13 @@ sub cust_pkg {
qsearch('cust_pkg', { 'contactnum' => $self->contactnum } );
}
+=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) = @_;
@@ -662,6 +691,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
diff --git a/httemplate/edit/process/cust_main-contacts.html b/httemplate/edit/process/cust_main-contacts.html
index d902dee..10ec363 100644
--- a/httemplate/edit/process/cust_main-contacts.html
+++ b/httemplate/edit/process/cust_main-contacts.html
@@ -5,18 +5,8 @@
'skip_process' => 1, #we don't want to make any changes to cust_main
'process_o2m' => {
'table' => 'contact',
- 'fields' => \@contact_fields,
+ 'fields' => FS::contact->cgi_contact_fields,
},
'redirect' => popurl(3). 'view/cust_main.cgi?',
)
%>
-<%init>
-
-my @contact_fields = qw(
- classnum first last title comment emailaddress selfservice_access
-);
-foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
- push @contact_fields, 'phonetypenum'.$phone_type->phonetypenum;
-}
-
-</%init>
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 4fb8f62..82ec50c 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -59,6 +59,9 @@ $cgi->param('invoicing_list', join(',', @invoicing_list) );
# is this actually used? if so, we need to clone locations...
# but I can't find anything that sets this parameter to a non-empty value
+# yes, fec48523d3cf056da08813f9b2b7d633b27aaf8d for #16582 is where it came in,
+# for "duplicate address checking for new customers". afaict still in
+# edit/cust_main/bottomfixup.html (and working?)
$cgi->param('duplicate_of_custnum') =~ /^(\d+)$/;
my $duplicate_of = $1;
@@ -350,15 +353,11 @@ if ( $new->custnum eq '' or $duplicate_of ) {
}
-unless ( $error ) { #XXX i guess i should be transactional... all in the insert
+unless ( $error ) { #XXX i should be transactional... all in the insert
# or replace call
- my @contact_fields = qw( classnum first last title comment emailaddress );
- foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
- push @contact_fields, 'phonetypenum'.$phone_type->phonetypenum;
- }
$error = $new->process_o2m( 'table' => 'contact',
- 'fields' => \@contact_fields,
+ 'fields' => FS::contact->cgi_contact_fields,
'params' => scalar($cgi->Vars),
);
}
diff --git a/httemplate/search/contact.html b/httemplate/search/contact.html
new file mode 100644
index 0000000..1933493
--- /dev/null
+++ b/httemplate/search/contact.html
@@ -0,0 +1,68 @@
+<& elements/search.html,
+ title => 'Contacts',
+ name_singular => 'contact',
+ query => { select => $select,
+ table => 'contact',
+ addl_from => $addl_from,
+ hashref => \%hash,
+ extra_sql => $extra_sql,
+ },
+ count_query => "SELECT COUNT(*) FROM contact $extra_sql", #XXX
+ header => \@header,
+ fields => \@fields,
+ links => \@links,
+&>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('List contacts');
+
+my $select = 'contact.*';
+my %hash = ();
+my $addl_from = '';
+
+my @header = ( 'First', 'Last', 'Title', );
+my @fields = ( 'first', 'last', 'title', );
+my @links = ( '', '', '' );
+
+my $company_link = '';
+
+if ( $cgi->param('selfservice_access') eq 'Y' ) {
+ $hash{'selfservice_access'} = 'Y';
+}
+
+my $extra_sql = '';
+if ( $cgi->param('link') ) {
+
+ my $coalesce = ', COALESCE( cust_main.company,';
+ my $as = ') AS prospect_or_customer';
+
+ if ( $cgi->param('link') eq 'cust_main' ) {
+ push @header, 'Customer';
+ $select .= "$coalesce cust_main.first||' '||cust_main.last $as";
+ $addl_from = ' LEFT JOIN cust_main USING ( custnum )';
+ $extra_sql = ' custnum IS NOT NULL ';
+ $company_link = [ $p.'view/cust_main.cgi?', 'custnum' ];
+ } elsif ( $cgi->param('link') eq 'prospect_main' ) {
+ push @header, 'Prospect';
+ $select .= "$coalesce contact.first||' '||contact.last $as";
+ $addl_from = ' LEFT JOIN prospect_main USING ( prospectnum )';
+ $extra_sql = ' prospectnum IS NOT NULL ';
+ $company_link = [ $p.'view/prospect_main.html?', 'prospectnum' ];
+ } else {
+ die "don't know how to report on contacts linked to specified table";
+ }
+
+ #because right now its harder to show it for both kinds of contacts
+ push @fields, 'prospect_or_customer';
+ push @links, $company_link;
+
+}
+
+push @header, 'Self-service';
+push @fields, 'selfservice_access';
+
+$extra_sql = (keys(%hash) ? ' AND ' : ' WHERE '). $extra_sql
+ if $extra_sql;
+
+</%init>
diff --git a/httemplate/search/report_contact.html b/httemplate/search/report_contact.html
new file mode 100644
index 0000000..3583bb4
--- /dev/null
+++ b/httemplate/search/report_contact.html
@@ -0,0 +1,43 @@
+<& /elements/header.html, mt($title) &>
+
+<FORM ACTION="contact.html" METHOD="GET">
+
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+ <& /elements/tr-select-agent.html,
+ 'curr_value' => scalar( $cgi->param('agentnum') ),
+ 'label' => emt('Contacts for agent: '),
+ 'disable_empty' => 0,
+ &>
+
+ <& /elements/tr-select.html,
+ 'label' => 'Contact source', #??? not "type" - contacts have a type
+ 'field' => 'link',
+ 'options' => [ 'prospect_main', 'cust_main', '' ],
+ 'labels' => { 'prospect_main' => 'Prospect contacts',
+ 'cust_main' => 'Customer contacts',
+ '' => 'All contacts',
+ },
+ 'curr_value' => scalar( $cgi->param('link') ),
+ &>
+
+</FORM>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" VALUE="<% mt('Get Report') |h %>">
+
+</FORM>
+
+<& /elements/footer.html &>
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('List contacts');
+
+my $conf = new FS::Conf;
+
+my $title = 'Contact Report';
+
+</%init>
diff --git a/httemplate/search/report_cust_credit_bill_pkg.html b/httemplate/search/report_cust_credit_bill_pkg.html
index 2b9e1e6..1754032 100644
--- a/httemplate/search/report_cust_credit_bill_pkg.html
+++ b/httemplate/search/report_cust_credit_bill_pkg.html
@@ -3,7 +3,7 @@
<FORM ACTION="cust_credit_bill_pkg.html" METHOD="GET">
<!--<INPUT TYPE="hidden" NAME="magic" VALUE="_date">-->
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
<& /elements/tr-select-user.html,
'label' => emt('Employee: '),
diff --git a/httemplate/search/report_quotation.html b/httemplate/search/report_quotation.html
index 1be904d..8f4da6a 100644
--- a/httemplate/search/report_quotation.html
+++ b/httemplate/search/report_quotation.html
@@ -5,7 +5,7 @@
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospectnum %>">
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
% unless ( $custnum ) {
<& /elements/tr-select-agent.html,
diff --git a/httemplate/search/report_sqlradius_usage.html b/httemplate/search/report_sqlradius_usage.html
index 7e54465..e818fb5 100644
--- a/httemplate/search/report_sqlradius_usage.html
+++ b/httemplate/search/report_sqlradius_usage.html
@@ -2,7 +2,7 @@
<FORM ACTION="sqlradius_usage.html" METHOD="GET">
-<TABLE BGCOLOR="#cccccc" CELLSPACING=0
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
<& /elements/tr-select-agent.html,
'empty_label' => 'all',
-----------------------------------------------------------------------
Summary of changes:
FS/FS/AccessRight.pm | 4 +-
FS/FS/access_right.pm | 2 +
FS/FS/contact.pm | 78 +++++++++++++++++---
httemplate/edit/process/cust_main-contacts.html | 12 +--
httemplate/edit/process/cust_main.cgi | 11 ++-
httemplate/search/contact.html | 68 +++++++++++++++++
httemplate/search/report_contact.html | 43 +++++++++++
httemplate/search/report_cust_credit_bill_pkg.html | 2 +-
httemplate/search/report_quotation.html | 2 +-
httemplate/search/report_sqlradius_usage.html | 2 +-
10 files changed, 190 insertions(+), 34 deletions(-)
create mode 100644 httemplate/search/contact.html
create mode 100644 httemplate/search/report_contact.html
More information about the freeside-commits
mailing list