projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5ae6df6
)
RT# 77532 - fixed error where cust main fax not showing, and fixed checking of phonet...
author
Christopher Burger
<burgerc@freeside.biz>
Tue, 28 May 2019 14:55:29 +0000
(10:55 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Tue, 28 May 2019 14:55:29 +0000
(10:55 -0400)
FS/FS/ConfDefaults.pm
patch
|
blob
|
history
FS/FS/UI/Web.pm
patch
|
blob
|
history
FS/FS/cust_main/Search.pm
patch
|
blob
|
history
FS/FS/phone_type.pm
patch
|
blob
|
history
httemplate/elements/select-cust-fields.html
patch
|
blob
|
history
httemplate/elements/tr-select-cust-fields.html
patch
|
blob
|
history
httemplate/search/cust_main.html
patch
|
blob
|
history
httemplate/search/elements/cust_main_phones.html
patch
|
blob
|
history
httemplate/view/cust_main/contacts_new.html
patch
|
blob
|
history
diff --git
a/FS/FS/ConfDefaults.pm
b/FS/FS/ConfDefaults.pm
index
d81e8e2
..
34987f4
100644
(file)
--- 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)',
'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)',
'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
76071d9
..
84f3979
100644
(file)
--- a/
FS/FS/UI/Web.pm
+++ b/
FS/FS/UI/Web.pm
@@
-475,7
+475,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';
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
479ebf5
..
25216c6
100644
(file)
--- a/
FS/FS/cust_main/Search.pm
+++ b/
FS/FS/cust_main/Search.pm
@@
-793,7
+793,7
@@
sub search {
# phones
##
# 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*)$/
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
3d9dced
..
de56527
100644
(file)
--- 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 {
=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;
}
return @phone_types;
}
diff --git
a/httemplate/elements/select-cust-fields.html
b/httemplate/elements/select-cust-fields.html
index
63e92ac
..
833f7c1
100644
(file)
--- 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)";
}
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 ];
$opt{'avail_fields'} ||= [ @fields ];
diff --git
a/httemplate/elements/tr-select-cust-fields.html
b/httemplate/elements/tr-select-cust-fields.html
index
0af432a
..
cbac202
100644
(file)
--- 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)";
}
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 ];
$opt{'avail_fields'} ||= [ @fields ];
diff --git
a/httemplate/search/cust_main.html
b/httemplate/search/cust_main.html
index
06a0d54
..
46e35da
100755
(executable)
--- 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
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
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
61aa1be
..
366d098
100644
(file)
--- 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>
<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 %>"
<TD>
<INPUT TYPE="text"
NAME="<% $phone %>"
@@
-23,5
+23,6
@@
my %phone_label = (
daytime => 'Day Phone',
night => 'Night Phone',
mobile => 'Mobile Phone',
daytime => 'Day Phone',
night => 'Night Phone',
mobile => 'Mobile Phone',
+ fax => 'Fax Number',
);
</%init>
\ No newline at end of file
);
</%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
bd213d1
..
0fdcc53
100644
(file)
--- 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%>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>
% }
<%$th%>Comment</TH>
</TR>