[freeside-commits] freeside/httemplate/misc delay_susp_pkg.html, 1.3, 1.3.2.1 cancel_pkg.html, 1.9, 1.9.2.1 order_pkg.html, 1.9, 1.9.2.1

Ivan,,, ivan at wavetail.420.am
Mon Mar 8 02:57:19 PST 2010


Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail.420.am:/tmp/cvs-serv29007/httemplate/misc

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	delay_susp_pkg.html cancel_pkg.html order_pkg.html 
Log Message:
proper use of date_format config for international date formats, RT#7009

Index: delay_susp_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/delay_susp_pkg.html,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -w -d -r1.3 -r1.3.2.1
--- delay_susp_pkg.html	21 Jun 2009 15:21:31 -0000	1.3
+++ delay_susp_pkg.html	8 Mar 2010 10:57:17 -0000	1.3.2.1
@@ -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') ) {

Index: cancel_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/cancel_pkg.html,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -w -d -r1.9 -r1.9.2.1
--- cancel_pkg.html	27 Jul 2009 19:51:16 -0000	1.9
+++ cancel_pkg.html	8 Mar 2010 10:57:17 -0000	1.9.2.1
@@ -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') ) {

Index: order_pkg.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/order_pkg.html,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -w -d -r1.9 -r1.9.2.1
--- order_pkg.html	7 Aug 2009 00:39:14 -0000	1.9
+++ order_pkg.html	8 Mar 2010 10:57:17 -0000	1.9.2.1
@@ -54,7 +54,7 @@
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "start_date_text",
-    ifFormat:   "%m/%d/%Y",
+    ifFormat:   "<% $date_format %>",
     button:     "start_date_button",
     align:      "BR"
   });
@@ -90,6 +90,7 @@
   unless $FS::CurrentUser::CurrentUser->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;



More information about the freeside-commits mailing list