From de9c24de9f0d26ddaee02915f5684884eced5ff0 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
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

Conflicts:
	httemplate/search/cust_main.html
	httemplate/view/cust_main/contacts_new.html
---
 httemplate/elements/select-cust-fields.html      | 2 +-
 httemplate/elements/tr-select-cust-fields.html   | 2 +-
 httemplate/search/cust_main.html                 | 2 +-
 httemplate/search/elements/cust_main_phones.html | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'httemplate')

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
-- 
cgit v1.2.1