X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=821b1916a77e13ead172b3dad6e3ba52c02009e7;hb=9f351b4a4df08d607aa0d647709b06cbea1c5ffe;hp=c9264a044b7b8505f0d8fff7a7b2e2b10ef02189;hpb=7c02bdc86a3b0ca0804f4b0a696ff7d2cdb1f141;p=freeside.git diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index c9264a044..821b1916a 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -4,6 +4,7 @@ use strict; use vars qw($DEBUG @ISA @EXPORT_OK $me); use Exporter; use FS::Conf; +use FS::Misc::DateTime qw( parse_datetime ); use FS::Record qw(dbdef); use FS::cust_main; # are sql_balance and sql_date_balance in the right module? @@ -30,7 +31,7 @@ sub parse_beginning_ending { if ( $cgi->param($prefix.'begin') =~ /^(\d+)$/ ) { $beginning = $1; } elsif ( $cgi->param($prefix.'beginning') =~ /^([ 0-9\-\/]{1,64})$/ ) { - $beginning = str2time($1) || 0; + $beginning = parse_datetime($1) || 0; } my $ending = 4294967295; #2^32-1 @@ -38,7 +39,7 @@ sub parse_beginning_ending { $ending = $1 - 1; } elsif ( $cgi->param($prefix.'ending') =~ /^([ 0-9\-\/]{1,64})$/ ) { #probably need an option to turn off the + 86399 - $ending = str2time($1) + 86399; + $ending = parse_datetime($1) + 86399; } ( $beginning, $ending );