[freeside-commits] branch FREESIDE_3_BRANCH updated. 31592a2ac1d8762246cd173beb33606444fe3acc

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  31592a2ac1d8762246cd173beb33606444fe3acc (commit)
      from  496ac38bb92a4ddb68318909c8b9d228ddda7bfb (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 31592a2ac1d8762246cd173beb33606444fe3acc
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed May 22 21:15:35 2019 -0400

    RT# 77532 - created method to display phone types
    
    Conflicts:
            httemplate/search/contact.html

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index d5233f88b..33a9702a2 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -353,7 +353,7 @@ sub cust_header {
   $header2method{'Cust#'} = 'display_custnum'
     if $conf->exists('cust_main-default_agent_custid');
 
-foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
+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;
@@ -369,7 +369,6 @@ foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
     }
   return \@phones;
   };
-
 }
 
   my %header2colormethod = (
diff --git a/FS/FS/phone_type.pm b/FS/FS/phone_type.pm
index d2ef465bd..9439cd09b 100644
--- a/FS/FS/phone_type.pm
+++ b/FS/FS/phone_type.pm
@@ -91,6 +91,18 @@ sub check {
   $self->SUPER::check;
 }
 
+=item get_phone_types
+
+returns a list of phone_types.
+
+=cut
+
+sub get_phone_types {
+  ## only using mobile(3) and work(1) right now.
+  my @phone_types = qsearch({table=>'phone_type', order_by=>'ORDER BY weight DESC', extra_sql => " WHERE phonetypenum IN ('1','3')"});
+  return @phone_types;
+}
+
 # Used by FS::Setup to initialize a new database.
 sub _populate_initial_data {
   my ($class, %opts) = @_;
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 @@
       <TH ALIGN="right" VALIGN="center"><% mt('Email') |h %></TH>
       <TD><INPUT TYPE="text" NAME="<%$field_prefix%>email" SIZE=54></TD>
     </TR>
-% foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
+% foreach my $phone_type ( FS::phone_type->get_phone_types() ) {
     <TR>
       <TH ALIGN="right" VALIGN="center"><% $phone_type->typename. ' Phone' |h %></TH>
       <TD><INPUT TYPE="text" NAME="<% $field_prefix %>phonetypenum<% $phone_type->phonetypenum %>" SIZE=54></TD>
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 @@
 </TABLE>
 <%once>
 
-my @phone_type = qsearch({table=>'phone_type', order_by=>'weight'});
+my @phone_type = FS::phone_type->get_phone_types();
 
 </%once>
 <%init>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/UI/Web.pm                                       |  3 +--
 FS/FS/phone_type.pm                                   | 12 ++++++++++++
 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 +-
 7 files changed, 18 insertions(+), 7 deletions(-)