diff options
| author | ivan <ivan> | 2010-03-08 10:57:06 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-03-08 10:57:06 +0000 |
| commit | 06a85a88bfdb0d3fc79ee055eb8327658dfe63ab (patch) | |
| tree | 239e526d182be4b3a8824811fde923fbd50621f5 /httemplate/misc | |
| parent | 611624bc08f525d19e1bd548a7d005aa73a53145 (diff) | |
proper use of date_format config for international date formats, RT#7009
Diffstat (limited to 'httemplate/misc')
| -rwxr-xr-x | httemplate/misc/cancel_pkg.html | 7 | ||||
| -rwxr-xr-x | httemplate/misc/delay_susp_pkg.html | 7 | ||||
| -rw-r--r-- | httemplate/misc/order_pkg.html | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html index 607ce13c4..67d2847cc 100755 --- a/httemplate/misc/cancel_pkg.html +++ b/httemplate/misc/cancel_pkg.html @@ -31,7 +31,7 @@ <SCRIPT TYPE="text/javascript"> Calendar.setup({ inputField: "expire_date", - ifFormat: "%m/%d/%Y", + ifFormat: "<% $date_format %>", button: "expire_button", align: "BR" }); @@ -58,7 +58,10 @@ <%init> -my $date = time2str("%m/%d/%Y", time); +my %conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + +my $date = time2str($date_format, time); my($pkgnum, $reasonnum); if ( $cgi->param('error') ) { diff --git a/httemplate/misc/delay_susp_pkg.html b/httemplate/misc/delay_susp_pkg.html index d4a6da18f..5d6a2bd09 100755 --- a/httemplate/misc/delay_susp_pkg.html +++ b/httemplate/misc/delay_susp_pkg.html @@ -25,7 +25,7 @@ <SCRIPT TYPE="text/javascript"> Calendar.setup({ inputField: "dun_date", - ifFormat: "%m/%d/%Y", + ifFormat: "<% $date_format %>", button: "dun_button", align: "BR" }); @@ -42,7 +42,10 @@ <%init> -my $date = time2str("%m/%d/%Y", time); +my %conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + +my $date = time2str($date_format, time); my($pkgnum); if ( $cgi->param('error') ) { diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 864e8328c..666099a02 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -60,7 +60,7 @@ <SCRIPT TYPE="text/javascript"> Calendar.setup({ inputField: "start_date_text", - ifFormat: "%m/%d/%Y", + ifFormat: "<% $date_format %>", button: "start_date_button", align: "BR" }); @@ -107,6 +107,7 @@ die "access denied" unless $curuser->access_right('Order customer package'); my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; $cgi->param('custnum') =~ /^(\d+)$/ or die "no custnum"; my $custnum = $1; |