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

5 files changed, 84 insertions, 16 deletions

diff --git a/httemplate/search/contact.html b/httemplate/search/contact.html
index 0292fa539..193349369 100644
--- a/httemplate/search/contact.html
+++ b/httemplate/search/contact.html
@@ -8,16 +8,23 @@
                      extra_sql => $extra_sql,
                    },
   count_query   => "SELECT COUNT(*) FROM contact $extra_sql", #XXX
-  header        => [ 'First', 'Last', 'Title', 'Company', 'Self-service', ],
-  fields        => [ 'first', 'last', 'title', 'company', 'selfservice_access' ],
-  links         => [ '', '', '', $company_link, '', ],
+  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' ) {
@@ -25,18 +32,36 @@ if ( $cgi->param('selfservice_access') eq 'Y' ) {
 }
 
 my $extra_sql = '';
-if ( $cgi->param('cust_main') ) {
-  $select .= ', cust_main.company';
-  $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('prospect_main') ) {
-  $select .= ', prospect_main.company';
-  $addl_from = ' LEFT JOIN prospect_main USING ( prospectnum )';
-  $extra_sql = ' prospectnum IS NOT NULL ';
-  $company_link  = [ $p.'view/prospect_main.html?', 'prospectnum' ];
+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;
 
diff --git a/httemplate/search/report_contact.html b/httemplate/search/report_contact.html
new file mode 100644
index 000000000..3583bb428
--- /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 2b9e1e69d..175403219 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 1be904dc3..8f4da6a1f 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 7e54465d3..e818fb57d 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',