X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-input-beginning_ending.html;h=be6e03c6f703df0579325e9c6095579af77ec507;hp=8a1dd62a998d60b124d489d16b43598954a2fe98;hb=HEAD;hpb=9eb843fefb50d8ca26a8941f2ebdf4d41b6dd0db diff --git a/httemplate/elements/tr-input-beginning_ending.html b/httemplate/elements/tr-input-beginning_ending.html index 8a1dd62a9..be6e03c6f 100644 --- a/httemplate/elements/tr-input-beginning_ending.html +++ b/httemplate/elements/tr-input-beginning_ending.html @@ -7,11 +7,11 @@ From date: - MAXLENGTH=<%$maxlength%>>
m/d/y<% $time_hint %> + MAXLENGTH=<%$maxlength%>>
m/d/y<% $time_hint %> +% unless ( $datesrequired ) { > (leave one or both dates blank for an open-ended search) +% } <%once> @@ -54,6 +56,17 @@ my $previous_request_count = ''; my %opt = @_; +my $conf = new FS::Conf; + +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; +my $datesrequired = 0; +$datesrequired = $opt{'datesrequired'} if $opt{'datesrequired'}; + +my $from = ''; +$from = $opt{'from'} if $opt{'from'}; +my $to = ''; +$to = $opt{'to'} if $opt{'to'}; + $opt{prefix} = '' unless defined $opt{prefix}; $opt{prefix} .= '_' if $opt{prefix}; @@ -61,7 +74,7 @@ my( $input_time, $time_format, $time_hint ) = ( '', '', '' ); my( $size, $maxlength ) = ( 11, 10 ); if ( $opt{'input_time'} ) { $input_time = ', showsTime: true, timeFormat: "12"'; # http://www.dynarch.com/demos/jscalendar/doc/html/reference.html#node_sec_2.3 - $time_format = ' %k:%M:%S'; # http://www.dynarch.com/demos/jscalendar/doc/html/reference.html#node_sec_5.3.5 + $time_format = ' %H:%M:%S'; # http://www.dynarch.com/demos/jscalendar/doc/html/reference.html#node_sec_5.3.5 $time_hint = ' h:m:s'; $size = 21; $maxlength = 27;