[freeside-commits] branch FREESIDE_4_BRANCH updated. 727183110e28fc634f7813b85ba9797f1be83c38
Christopher Burger
burgerc at freeside.biz
Tue May 28 08:46:46 PDT 2019
The branch, FREESIDE_4_BRANCH has been updated
via 727183110e28fc634f7813b85ba9797f1be83c38 (commit)
via 2cbc631a817e19dcfe4b61d2fd856e87f01d3509 (commit)
from af5d7f1ca409f3679a76740bb5f29016963f99d3 (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 727183110e28fc634f7813b85ba9797f1be83c38
Author: Christopher Burger <burgerc at freeside.biz>
Date: Tue May 28 10:55:29 2019 -0400
RT# 77532 - fixed error where cust main fax not showing, and fixed checking of phonetypenum
diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm
index 12b1d8a63..216b597f3 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 4bbe4671e..bbb8e701d 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -472,7 +472,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, 'agent_custid';
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 479ebf5c4..25216c6d6 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -793,7 +793,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 3d9dced6f..de565270a 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 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)";
}
- at fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields;
+ at 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 4a83ee8f4..58954bc86 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
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 61aa1be6e..366d0983b 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
diff --git a/httemplate/view/cust_main/contacts_new.html b/httemplate/view/cust_main/contacts_new.html
index bd213d1dd..0fdcc5371 100644
--- a/httemplate/view/cust_main/contacts_new.html
+++ b/httemplate/view/cust_main/contacts_new.html
@@ -13,7 +13,7 @@
<%$th%>Send messages</TH>
<%$th%>Self-service</TH>
% foreach my $phone_type (@phone_type) {
- <%$th%><% $phone_type->typename |h %></TH>
+ <%$th%><% $phone_type->typename |h %> phone</TH>
% }
<%$th%>Comment</TH>
</TR>
commit 2cbc631a817e19dcfe4b61d2fd856e87f01d3509
Author: Christopher Burger <burgerc at freeside.biz>
Date: Fri May 24 10:51:08 2019 -0400
RT# 77532 - can search cust main phone numbers in advanced customer search
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 63f10fb64..479ebf5c4 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -789,6 +789,21 @@ sub search {
)";
}
+ ##
+ # phones
+ ##
+
+ foreach my $phonet (qw(daytime night mobile)) {
+ if ($params->{$phonet}) {
+ $params->{$phonet} =~ s/\D//g;
+ $params->{$phonet} =~ /^(\d{3})(\d{3})(\d{4})(\d*)$/
+ or next;
+ my $phonen = "$1-$2-$3";
+ if ($4) { push @where, "cust_main.".$phonet." = '".$phonen." x$4'"; }
+ else { push @where, "cust_main.".$phonet." like '".$phonen."%'"; }
+ }
+ }
+
###
# refnum
###
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index d0d0f27ec..4a83ee8f4 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -51,6 +51,7 @@ my %search_hash = ();
my @scalars = qw (
agentnum salesnum status
address city county state zip country location_history
+ daytime night mobile
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
new file mode 100644
index 000000000..61aa1be6e
--- /dev/null
+++ b/httemplate/search/elements/cust_main_phones.html
@@ -0,0 +1,27 @@
+<TR>
+ <TH VALIGN="top" ALIGN="right"><% mt('Phones') |h %></TD>
+ <TD COLSPAN=6>
+ <TABLE CELLSPACING=0 CELLPADDING=0>
+ <TR>
+% foreach my $phone (qw(daytime night mobile)) {
+ <TD>
+ <INPUT TYPE="text"
+ NAME="<% $phone %>"
+ VALUE=""
+ SIZE=18
+ >
+ <BR><FONT SIZE=-1 COLOR="#333333"><% mt($phone_label{$phone}) |h %></FONT>
+ </TD>
+ <TD> </TD>
+% }
+ </TR>
+ </TABLE>
+ </TD>
+</TR>
+<%init>
+my %phone_label = (
+ daytime => 'Day Phone',
+ night => 'Night Phone',
+ mobile => 'Mobile Phone',
+);
+</%init>
\ No newline at end of file
diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index da2f1a4e9..3dd92af2e 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -165,6 +165,7 @@
<FONT CLASS="fsinnerbox-title"><% emt('Location search options') %></FONT>
<TABLE CLASS="fsinnerbox">
<& elements/options_cust_location.html &>
+ <& elements/cust_main_phones.html &>
</TABLE>
<BR>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/ConfDefaults.pm | 2 +-
FS/FS/UI/Web.pm | 2 +-
FS/FS/cust_main/Search.pm | 15 +++++++++++++++
FS/FS/phone_type.pm | 4 ++--
httemplate/elements/select-cust-fields.html | 2 +-
httemplate/elements/tr-select-cust-fields.html | 2 +-
httemplate/search/cust_main.html | 1 +
.../phones.html => search/elements/cust_main_phones.html} | 11 +++++------
httemplate/search/report_cust_main.html | 1 +
httemplate/view/cust_main/contacts_new.html | 2 +-
10 files changed, 29 insertions(+), 13 deletions(-)
copy httemplate/{edit/cust_main/phones.html => search/elements/cust_main_phones.html} (72%)
More information about the freeside-commits
mailing list