From 40a1ad133a19994311dc5a91b375d25aedd6d679 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 15 Dec 2014 22:46:40 -0800
Subject: fix time in payment and credit back-dating, RT#32320

---
 httemplate/elements/tr-input-date-field.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'httemplate/elements/tr-input-date-field.html')

diff --git a/httemplate/elements/tr-input-date-field.html b/httemplate/elements/tr-input-date-field.html
index 40162f0fd..ff9855184 100644
--- a/httemplate/elements/tr-input-date-field.html
+++ b/httemplate/elements/tr-input-date-field.html
@@ -26,7 +26,7 @@ Example:
 
 <TR>
   <TD ALIGN="right"><% $label %></TD>
-  <TD>
+  <TD COLSPAN=<% $colspan %>>
     <INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
     <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
   </TD>
@@ -38,12 +38,17 @@ Example:
     ifFormat:   "<% $format %>",
     button:     "<% $name %>_button",
     align:      "BR"
+%   if ( $format =~ /\%r/ ) {
+      ,
+      showsTime: true,
+      timeFormat: 12
+%   }
   });
 </SCRIPT>
 
 <%init>
 
-my($name, $value, $label, $format, $usedatetime, $noinit);
+my($name, $value, $label, $format, $usedatetime, $noinit, $colspan);
 if ( ref($_[0]) ) {
   my $opt = shift;
   $name        = $opt->{'name'};
@@ -52,8 +57,10 @@ if ( ref($_[0]) ) {
   $format      = $opt->{'format'};
   $usedatetime = $opt->{'usedatetime'};
   $noinit      = $opt->{'noinit'};
+  $colspan     = $opt->{'colspan'} || 1;
 } else {
   ($name, $value, $label, $format, $usedatetime) = @_;
+  $colspan = 1;
 }
 
 my $conf = new FS::Conf;
-- 
cgit v1.2.1