diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2019-05-22 12:58:05 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2019-05-22 21:17:32 -0400 |
| commit | 496ac38bb92a4ddb68318909c8b9d228ddda7bfb (patch) | |
| tree | b5ac0df05dcd82deb974d85e9d0257e11fa0229e /httemplate | |
| parent | af1b255c779c5c6d0ddd354d670e6b909c26c4e3 (diff) | |
RT 77532 - added contact phone numbers to advanced customer report
Conflicts:
FS/FS/ConfDefaults.pm
FS/FS/cust_main.pm
FS/FS/cust_main/Search.pm
httemplate/elements/tr-select-cust-fields.html
httemplate/search/contact.html
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/elements/select-cust-fields.html | 10 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-cust-fields.html | 23 | ||||
| -rw-r--r-- | httemplate/search/elements/options_cust_contacts.html | 17 |
3 files changed, 26 insertions, 24 deletions
diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html index 5e3063877..7396808b1 100644 --- a/httemplate/elements/select-cust-fields.html +++ b/httemplate/elements/select-cust-fields.html @@ -1,8 +1,14 @@ <%init> my( $cust_fields, %opt ) = @_; - use FS::ConfDefaults; - $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ]; + my @fields = FS::ConfDefaults->cust_fields_avail(); + my $contact_phone_list; + foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { + $contact_phone_list .= " | Contact ".$phone_type->typename." phone(s)"; + } + @fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; + + $opt{'avail_fields'} ||= [ @fields ]; tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} }; </%init> diff --git a/httemplate/elements/tr-select-cust-fields.html b/httemplate/elements/tr-select-cust-fields.html index 80562fe3d..d3786d270 100644 --- a/httemplate/elements/tr-select-cust-fields.html +++ b/httemplate/elements/tr-select-cust-fields.html @@ -1,15 +1,20 @@ -% -% my( $cust_fields, %opt ) = @_; -% -% use FS::ConfDefaults; -% $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ]; -% -% - - <TR> <TD ALIGN="right"><% $opt{'label'} || 'Customer fields' %></TD> <TD> <% include( '/elements/select-cust-fields.html', $cust_fields, %opt ) %> </TD> </TR> +<%init> + +my( $cust_fields, %opt ) = @_; + +my @fields = FS::ConfDefaults->cust_fields_avail(); +my $contact_phone_list; +foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { + $contact_phone_list .= " | Contact ".$phone_type->typename." phone(s)"; +} +@fields = map {s/\| Contact phone\(s\)/$contact_phone_list/g; $_; } @fields; + +$opt{'avail_fields'} ||= [ @fields ]; + +</%init> diff --git a/httemplate/search/elements/options_cust_contacts.html b/httemplate/search/elements/options_cust_contacts.html index cfbf834b0..8a6b76913 100644 --- a/httemplate/search/elements/options_cust_contacts.html +++ b/httemplate/search/elements/options_cust_contacts.html @@ -12,21 +12,12 @@ <TH ALIGN="right" VALIGN="center"><% mt('Email') |h %></TH> <TD><INPUT TYPE="text" NAME="<%$field_prefix%>email" SIZE=54></TD> </TR> - - <TR> - <TH ALIGN="right" VALIGN="center"><% mt('Home Phone') |h %></TH> - <TD><INPUT TYPE="text" NAME="<%$field_prefix%>homephone" SIZE=54></TD> - </TR> - - <TR> - <TH ALIGN="right" VALIGN="center"><% mt('Work Phone') |h %></TH> - <TD><INPUT TYPE="text" NAME="<%$field_prefix%>workphone" SIZE=54></TD> - </TR> - +% foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) { <TR> - <TH ALIGN="right" VALIGN="center"><% mt('Mobile Phone') |h %></TH> - <TD><INPUT TYPE="text" NAME="<%$field_prefix%>mobilephone" SIZE=54></TD> + <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> +% } <%init> |