default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / elements / select-cust-fields.html

diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html
index 98feaf8..833f7c1 100644 (file)
--- a/httemplate/elements/select-cust-fields.html
+++ b/httemplate/elements/select-cust-fields.html
@@ -1,22 +1,24 @@
-%
-%  my( $cust_fields, %opt ) = @_;
-%
-%  use FS::ConfDefaults;
-%  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
-%
-%  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
-%
-%
+<%init>
+  my( $cust_fields, %opt ) = @_;
 
+  my @fields = FS::ConfDefaults->cust_fields_avail();
+  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;
+
+  $opt{'avail_fields'} ||= [ @fields ];
+
+  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
+</%init>
 
 <SELECT NAME="cust_fields">
 
   <OPTION VALUE="">(configured default)
-% 
-%     foreach my $value ( keys %hash ) { 
-
 
-       <OPTION VALUE="<% $value %>"><% $hash{$value} %>
+% foreach my $value ( keys %hash ) { 
+  <OPTION VALUE="<% $value %>"><% $hash{$value} %>
 % }