X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=2d12f7d14b6273bdcb5d8085a2b5de8d6d73d414;hb=d856e90f730f72d173c2eedde4c81bba20c583b8;hp=709e3f7dd7292b693e67dba3813a477b362104b5;hpb=a36e0f8a0f69349dafaa16d1d2d57dfb6e5dbc85;p=freeside.git
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 709e3f7dd..2d12f7d14 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -7,7 +7,7 @@ use Carp qw( confess );
use HTML::Entities;
use FS::Conf;
use FS::Misc::DateTime qw( parse_datetime day_end );
-use FS::Record qw(dbdef);
+use FS::Record qw(dbdef qsearch);
use FS::cust_main; # are sql_balance and sql_date_balance in the right module?
#use vars qw(@ISA);
@@ -300,7 +300,7 @@ sub cust_header {
my %header2method = (
'Customer' => 'name',
'Cust. Status' => 'cust_status_label',
- 'Cust#' => 'custnum',
+ 'Cust#' => 'display_custnum',
'Name' => 'contact',
'Company' => 'company',
@@ -343,6 +343,9 @@ sub cust_header {
'(service) Latitude' => 'ship_latitude',
'(service) Longitude' => 'ship_longitude',
'Invoicing email(s)' => 'invoicing_list_emailonly_scalar',
+ 'Contact email(s)' => 'contact_list_emailonly',
+ 'Invoices' => 'contact_list_cust_invoice_only',
+ 'Messages' => 'contact_list_cust_message_only',
# FS::Upgrade::upgrade_config removes this from existing cust-fields settings
# 'Payment Type' => 'cust_payby',
'Current Balance' => 'current_balance',
@@ -354,6 +357,24 @@ sub cust_header {
$header2method{'Cust#'} = 'display_custnum'
if $conf->exists('cust_main-default_agent_custid');
+foreach my $phone_type ( FS::phone_type->get_phone_types() ) {
+ $header2method{'Contact '.$phone_type->typename.' phone(s)'} = sub {
+ my $self = shift;
+ my $num = $phone_type->phonetypenum;
+
+ my @phones;
+ foreach (FS::cust_main::contact_list_name_phones($self)) {
+ my $data = [
+ {
+ 'data' => $_->first.' '.$_->last.' '.FS::contact_phone::phonenum_pretty($_),
+ },
+ ];
+ push @phones, $data if $_->phonetypenum eq $phone_type->phonetypenum;
+ }
+ return \@phones;
+ };
+}
+
my %header2colormethod = (
'Cust. Status' => 'cust_statuscolor',
);
@@ -411,7 +432,14 @@ sub cust_sort_fields {
cust_header(@_) if( @_ or !@cust_fields );
#inefficientish, but tiny lists and only run once per page
- map { $_ eq 'custnum' ? 'custnum' : '' } @cust_fields;
+ my @sort_fields;
+ foreach (@cust_fields) {
+ if ($_ eq "custnum") { push @sort_fields, 'custnum'; }
+ elsif ($_ eq "contact" || $_ eq "name") { push @sort_fields, '(last, first)'; }
+ elsif ($_ eq "company") { push @sort_fields, 'company'; }
+ else { push @sort_fields, ''; }
+ }
+ return @sort_fields;
}
@@ -447,7 +475,7 @@ sub cust_sql_fields {
}
}
- foreach my $field (qw(daytime night mobile fax )) {
+ foreach my $field (qw(daytime night mobile fax)) {
push @fields, $field if (grep { $_ eq $field } @cust_fields);
}
push @fields, 'agent_custid';
@@ -468,9 +496,9 @@ sub cust_sql_fields {
=item join_cust_main [ TABLE[.CUSTNUM] ] [ LOCATION_TABLE[.LOCATIONNUM] ]
Returns an SQL join phrase for the FROM clause so that the fields listed
-in L will be available. Currently joins to cust_main
+in L will be available. Currently joins to cust_main
itself, as well as cust_location (under the aliases 'bill_location' and
-'ship_location') if address fields are needed. L should have
+'ship_location') if address fields are needed. L should have
been called already.
All of these will be left joins; if you want to exclude rows with no linked
@@ -743,6 +771,7 @@ use FS::CurrentUser;
use FS::Record qw(qsearchs);
use FS::queue;
use FS::CGI qw(rooturl);
+use FS::Report::Queued::FutureAutobill;
$DEBUG = 0;