From 31592a2ac1d8762246cd173beb33606444fe3acc 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 Conflicts: httemplate/search/contact.html --- httemplate/elements/contact.html | 2 +- httemplate/elements/select-cust-fields.html | 2 +- httemplate/elements/tr-select-cust-fields.html | 2 +- httemplate/search/elements/options_cust_contacts.html | 2 +- httemplate/view/cust_main/contacts_new.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'httemplate') diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html index a9e1f23c9..a02458f2a 100644 --- a/httemplate/elements/contact.html +++ b/httemplate/elements/contact.html @@ -153,7 +153,7 @@ unless ($opt{'for_prospect'}) { } my $first = 0; -foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { +foreach my $phone_type ( FS::phone_type->get_phone_types() ) { next if $phone_type->typename =~ /^(Home|Fax)$/; my $f = 'phonetypenum'.$phone_type->phonetypenum; $label{$f} = $phone_type->typename. ' phone'; diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html index 7396808b1..63e92ac3d 100644 --- a/httemplate/elements/select-cust-fields.html +++ b/httemplate/elements/select-cust-fields.html @@ -3,7 +3,7 @@ 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; diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html index d3786d270..46228fee4 100644 --- a/httemplate/elements/tr-select-cust-fields.html +++ b/httemplate/elements/tr-select-cust-fields.html @@ -10,7 +10,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; diff --git a/httemplate/search/elements/options_cust_contacts.html b/httemplate/search/elements/options_cust_contacts.html index 8a6b76913..372bc6755 100644 --- a/httemplate/search/elements/options_cust_contacts.html +++ b/httemplate/search/elements/options_cust_contacts.html @@ -12,7 +12,7 @@ <% mt('Email') |h %> -% foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { +% foreach my $phone_type ( FS::phone_type->get_phone_types() ) { <% $phone_type->typename. ' Phone' |h %> diff --git a/httemplate/view/cust_main/contacts_new.html b/httemplate/view/cust_main/contacts_new.html index 19118ea27..22968b628 100644 --- a/httemplate/view/cust_main/contacts_new.html +++ b/httemplate/view/cust_main/contacts_new.html @@ -67,7 +67,7 @@ <%once> -my @phone_type = qsearch({table=>'phone_type', order_by=>'weight'}); +my @phone_type = FS::phone_type->get_phone_types(); <%init> -- cgit v1.2.1