From dc404e7519cf0ec3a0024a662c5e0c5566f9a194 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 8 Mar 2010 10:57:18 +0000
Subject: proper use of date_format config for international date formats,
 RT#7009

---
 httemplate/edit/REAL_cust_pkg.cgi | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'httemplate/edit/REAL_cust_pkg.cgi')

diff --git a/httemplate/edit/REAL_cust_pkg.cgi b/httemplate/edit/REAL_cust_pkg.cgi
index c31213805..18d4415c6 100755
--- a/httemplate/edit/REAL_cust_pkg.cgi
+++ b/httemplate/edit/REAL_cust_pkg.cgi
@@ -94,7 +94,7 @@
   <SCRIPT TYPE="text/javascript">
     Calendar.setup({
       inputField: "<% $column %>_text",
-      ifFormat:   "%m/%d/%Y",
+      ifFormat:   "<% $date_format %>",
       button:     "<% $column %>_button",
       align:      "BR"
     });
@@ -129,20 +129,16 @@
 
 <% include('/elements/footer.html') %>
 
-<%once>
-
-#my $format = "%c %z (%Z)";
-my $format = "%m/%d/%Y %T %z (%Z)";
-
-#false laziness w/view/cust_main/packages.html
-#my( $billed_or_prepaid,
-
-</%once>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Edit customer package dates');
 
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+my $format = $date_format. ' %T %z (%Z)';
+
 my $error = '';
 my( $pkgnum, $cust_pkg );
 
-- 
cgit v1.2.1