RT# 77532 - fixed error where cust main fax not showing, and fixed checking of phonetypenum

Conflicts:
	httemplate/search/cust_main.html
	httemplate/view/cust_main/contacts_new.html

8 files changed, 10 insertions, 9 deletions

diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm
index f073252af..d1c3171f1 100644
--- a/FS/FS/ConfDefaults.pm
+++ b/FS/FS/ConfDefaults.pm
@@ -36,7 +36,7 @@ sub cust_fields_avail { (
   'Agent | Agent Cust# or Cust# | Cust. Status | Customer' =>
     'Agent | Agent Cust# | Status | Last, First or Company (Last, First)',
 
-  "Customer | Day phone | Night phone | Mobile phone | Fax number | Contact phone(s)" =>
+  'Customer | Day phone | Night phone | Mobile phone | Fax number | Contact phone(s)' =>
     'Customer | (all phones)',
   'Cust# | Customer | Day phone | Night phone | Mobile phone | Fax number | Contact phone(s)' =>
     'custnum | Customer | (all phones)',
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 33a9702a2..c2a600629 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -471,7 +471,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, "payby AS cust_payby"
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 8073ce102..a12846c1c 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -795,7 +795,7 @@ sub search {
   # phones
   ##
 
-  foreach my $phonet (qw(daytime night mobile)) {
+  foreach my $phonet (qw(daytime night mobile fax)) {
     if ($params->{$phonet}) {
       $params->{$phonet} =~ s/\D//g;
       $params->{$phonet} =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
diff --git a/FS/FS/phone_type.pm b/FS/FS/phone_type.pm
index 9439cd09b..d5c43afd5 100644
--- a/FS/FS/phone_type.pm
+++ b/FS/FS/phone_type.pm
@@ -98,8 +98,8 @@ 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')"});
+  ## not using Home and Fax right now. false laziness with  /elements/contact.html
+  my @phone_types = qsearch({table=>'phone_type', order_by=>'ORDER BY weight DESC', extra_sql => " WHERE typename NOT IN ('Home','Fax')"});
   return @phone_types;
 }
 
diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html
index 63e92ac3d..833f7c1af 100644
--- a/httemplate/elements/select-cust-fields.html
+++ b/httemplate/elements/select-cust-fields.html
@@ -6,7 +6,7 @@
   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 ];
 
diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html
index 46228fee4..8a54e51ff 100644
--- a/httemplate/elements/tr-select-cust-fields.html
+++ b/httemplate/elements/tr-select-cust-fields.html
@@ -13,7 +13,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 ];
 
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index 4d5d18fe8..c3b01eb35 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -51,7 +51,7 @@ my %search_hash = ();
 my @scalars = qw (
   agentnum salesnum status
   address city county state zip country location_history
-  daytime night mobile
+  daytime night mobile fax
   paydate_year paydate_month invoice_terms
   no_censustract with_geocode with_email tax no_tax POST no_POST
   custbatch usernum
diff --git a/httemplate/search/elements/cust_main_phones.html b/httemplate/search/elements/cust_main_phones.html
index de62119f9..c7a41eba5 100644
--- a/httemplate/search/elements/cust_main_phones.html
+++ b/httemplate/search/elements/cust_main_phones.html
@@ -3,7 +3,7 @@
   <TD COLSPAN=6>
     <TABLE CELLSPACING=0 CELLPADDING=0>
       <TR>
-% foreach my $phone (qw(daytime night mobile)) {
+% foreach my $phone (qw(daytime night mobile fax)) {
         <TD>
           <INPUT TYPE="text"
                  NAME="<% $phone %>"
@@ -23,5 +23,6 @@ my %phone_label = (
   daytime => 'Day Phone',
   night   => 'Night Phone',
   mobile  => 'Mobile Phone',
+  fax     => 'Fax Number',
 );
 </%init>
\ No newline at end of file