projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a98de57
)
RT# 77532 - created method to display phone types
author
Christopher Burger
<burgerc@freeside.biz>
Thu, 23 May 2019 01:15:35 +0000
(21:15 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Thu, 23 May 2019 01:15:35 +0000
(21:15 -0400)
FS/FS/UI/Web.pm
patch
|
blob
|
history
FS/FS/phone_type.pm
patch
|
blob
|
history
httemplate/elements/contact.html
patch
|
blob
|
history
httemplate/elements/select-cust-fields.html
patch
|
blob
|
history
httemplate/elements/tr-select-cust-fields.html
patch
|
blob
|
history
httemplate/search/contact.html
patch
|
blob
|
history
httemplate/search/elements/options_cust_contacts.html
patch
|
blob
|
history
httemplate/view/cust_main/contacts_new.html
patch
|
blob
|
history
diff --git
a/FS/FS/UI/Web.pm
b/FS/FS/UI/Web.pm
index
9eb49c4
..
76071d9
100644
(file)
--- a/
FS/FS/UI/Web.pm
+++ b/
FS/FS/UI/Web.pm
@@
-357,7
+357,7
@@
sub cust_header {
$header2method{'Cust#'} = 'display_custnum'
if $conf->exists('cust_main-default_agent_custid');
$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;
$header2method{'Contact '.$phone_type->typename.' phone(s)'} = sub {
my $self = shift;
my $num = $phone_type->phonetypenum;
@@
-373,7
+373,6
@@
foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
}
return \@phones;
};
}
return \@phones;
};
-
}
my %header2colormethod = (
}
my %header2colormethod = (
diff --git
a/FS/FS/phone_type.pm
b/FS/FS/phone_type.pm
index
ded6b91
..
3d9dced
100644
(file)
--- a/
FS/FS/phone_type.pm
+++ b/
FS/FS/phone_type.pm
@@
-91,6
+91,18
@@
sub check {
$self->SUPER::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) = @_;
# 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
599f662
..
308b846
100644
(file)
--- a/
httemplate/elements/contact.html
+++ b/
httemplate/elements/contact.html
@@
-180,7
+180,7
@@
unless ($opt{'for_prospect'}) {
}
my $first = 0;
}
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';
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
7396808
..
63e92ac
100644
(file)
--- 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;
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;
$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
62b8144
..
0af432a
100644
(file)
--- a/
httemplate/elements/tr-select-cust-fields.html
+++ b/
httemplate/elements/tr-select-cust-fields.html
@@
-8,7
+8,7
@@
my( $cust_fields, %opt ) = @_;
my @fields = FS::ConfDefaults->cust_fields_avail();
my $contact_phone_list;
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;
$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/contact.html
b/httemplate/search/contact.html
index
0f2b283
..
5def389
100644
(file)
--- a/
httemplate/search/contact.html
+++ b/
httemplate/search/contact.html
@@
-153,7
+153,7
@@
my $get_phone_sub = sub {
};
my @phones;
};
my @phones;
-foreach my $phone_type (
qsearch({table=>'phone_type', order_by=>'weight'}
) ) {
+foreach my $phone_type (
FS::phone_type->get_phone_types(
) ) {
push @phones, { label => $phone_type->typename.' Phone', field => $get_phone_sub->($phone_type->phonetypenum), };
}
push @phones, { label => $phone_type->typename.' Phone', field => $get_phone_sub->($phone_type->phonetypenum), };
}
diff --git
a/httemplate/search/elements/options_cust_contacts.html
b/httemplate/search/elements/options_cust_contacts.html
index
8a6b769
..
372bc67
100644
(file)
--- 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>
<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>
<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
9252b21
..
bd213d1
100644
(file)
--- a/
httemplate/view/cust_main/contacts_new.html
+++ b/
httemplate/view/cust_main/contacts_new.html
@@
-80,7
+80,7
@@
%}
<%once>
%}
<%once>
-my @phone_type =
qsearch({table=>'phone_type', order_by=>'weight'}
);
+my @phone_type =
FS::phone_type->get_phone_types(
);
</%once>
<%init>
</%once>
<%init>