diff options
Diffstat (limited to 'httemplate/elements/tr-input-beginning_ending.html')
| -rw-r--r-- | httemplate/elements/tr-input-beginning_ending.html | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/httemplate/elements/tr-input-beginning_ending.html b/httemplate/elements/tr-input-beginning_ending.html index 8a1dd62a9..2aa597479 100644 --- a/httemplate/elements/tr-input-beginning_ending.html +++ b/httemplate/elements/tr-input-beginning_ending.html @@ -11,7 +11,7 @@ <SCRIPT TYPE="text/javascript"> Calendar.setup({ inputField: "<% $opt{prefix} %>beginning_text", - ifFormat: "%m/%d/%Y<% $time_format %>", + ifFormat: "<% $date_format. $time_format %>", button: "<% $opt{prefix} %>beginning_button", align: "BR" <% $input_time %> @@ -30,7 +30,7 @@ <SCRIPT TYPE="text/javascript"> Calendar.setup({ inputField: "<% $opt{prefix} %>ending_text", - ifFormat: "%m/%d/%Y<% $time_format %>", + ifFormat: "<% $date_format. $time_format %>", button: "<% $opt{prefix} %>ending_button", align: "BR" <% $input_time %> @@ -54,6 +54,10 @@ my $previous_request_count = ''; my %opt = @_; +my $conf = new FS::Conf; + +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + $opt{prefix} = '' unless defined $opt{prefix}; $opt{prefix} .= '_' if $opt{prefix}; |