From a9bb74be91910903f8813bc92af06df8368c5379 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 13 Mar 2013 18:27:37 -0700 Subject: [PATCH] add time to payment report, RT#21061 --- FS/FS/UI/Web.pm | 8 ++++++-- httemplate/search/elements/report_cust_pay_or_refund.html | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index d6f183d8e..d31bbf0d6 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -32,15 +32,19 @@ sub parse_beginning_ending { my $beginning = 0; if ( $cgi->param($prefix.'begin') =~ /^(\d+)$/ ) { $beginning = $1; - } elsif ( $cgi->param($prefix.'beginning') =~ /^([ 0-9\-\/]{1,64})$/ ) { + } elsif ( $cgi->param($prefix.'beginning') =~ /^([ 0-9\-\/\:]{1,64})$/ ) { $beginning = parse_datetime($1) || 0; } my $ending = 4294967295; #2^32-1 if ( $cgi->param($prefix.'end') =~ /^(\d+)$/ ) { $ending = $1 - 1; - } elsif ( $cgi->param($prefix.'ending') =~ /^([ 0-9\-\/]{1,64})$/ ) { + } elsif ( $cgi->param($prefix.'ending') =~ /^([ 0-9\-\/\:]{1,64})$/ ) { #probably need an option to turn off the + 86399 + + #no, this should be add one day minus one second... + # 86399 is wrong twice a year when daylight savings time changes + # and leap seconds too but only a second rather than an hour.. $ending = parse_datetime($1) + 86399; } diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html index 872031de5..c79c3ab0b 100644 --- a/httemplate/search/elements/report_cust_pay_or_refund.html +++ b/httemplate/search/elements/report_cust_pay_or_refund.html @@ -73,7 +73,8 @@ Examples: <& /elements/tr-input-beginning_ending.html, - layout => 'horiz', + layout => 'horiz', + input_time => 1, &>
-- 2.11.0