From a98de57aee063b3ff737c283336f83b2e50e14a8 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Wed, 22 May 2019 12:58:05 -0400 Subject: RT 77532 - added contact phone numbers to advanced customer report --- httemplate/elements/tr-select-cust-fields.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'httemplate/elements/tr-select-cust-fields.html') diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html index dd8513316..62b8144e3 100644 --- a/httemplate/elements/tr-select-cust-fields.html +++ b/httemplate/elements/tr-select-cust-fields.html @@ -6,6 +6,13 @@ my( $cust_fields, %opt ) = @_; -$opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ]; +my @fields = FS::ConfDefaults->cust_fields_avail(); +my $contact_phone_list; +foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { + $contact_phone_list .= " | Contact ".$phone_type->typename." phone(s)"; +} +@fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; + +$opt{'avail_fields'} ||= [ @fields ]; -- cgit v1.2.1 From 2b199169bd62b8582eedb872b4e76bee48899e81 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Wed, 22 May 2019 21:15:35 -0400 Subject: RT# 77532 - created method to display phone types --- httemplate/elements/tr-select-cust-fields.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/elements/tr-select-cust-fields.html') diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html index 62b8144e3..0af432ae7 100644 --- a/httemplate/elements/tr-select-cust-fields.html +++ b/httemplate/elements/tr-select-cust-fields.html @@ -8,7 +8,7 @@ my( $cust_fields, %opt ) = @_; my @fields = FS::ConfDefaults->cust_fields_avail(); my $contact_phone_list; -foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { +foreach my $phone_type ( FS::phone_type->get_phone_types() ) { $contact_phone_list .= " | Contact ".$phone_type->typename." phone(s)"; } @fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; -- cgit v1.2.1 From 5b0df166c22e13eba83fabee858846ead6a54141 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Tue, 28 May 2019 10:55:29 -0400 Subject: RT# 77532 - fixed error where cust main fax not showing, and fixed checking of phonetypenum --- httemplate/elements/tr-select-cust-fields.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/elements/tr-select-cust-fields.html') diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html index 0af432ae7..cbac20280 100644 --- a/httemplate/elements/tr-select-cust-fields.html +++ b/httemplate/elements/tr-select-cust-fields.html @@ -11,7 +11,7 @@ my $contact_phone_list; foreach my $phone_type ( FS::phone_type->get_phone_types() ) { $contact_phone_list .= " | Contact ".$phone_type->typename." phone(s)"; } -@fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; +@fields = map {s/ \| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; $opt{'avail_fields'} ||= [ @fields ]; -- cgit v1.2.1