From a7ec3dcd42e7f15b2bce2abfb5dc9ea07c964cd4 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 7 May 2012 11:18:15 -0700 Subject: add spouse_birthdate, RT#17577 --- httemplate/search/cust_main.html | 14 +++++++++++--- httemplate/search/report_cust_main.html | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) (limited to 'httemplate/search') diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 498024ba0..bb5eae7e3 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -64,14 +64,22 @@ for my $param (qw( classnum payby tagnum )) { # parse dates ### -foreach my $field (qw( signupdate )) { +foreach my $field (qw( signupdate birthdate spouse_birthdate )) { my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); - next if $beginning == 0 && $ending == 4294967295 && !defined($cgi->param('signuphour')); + next if $beginning == 0 && $ending == 4294967295 && ( $field ne 'signupdate' || !defined($cgi->param('signuphour')) ); #or $disable{$cgi->param('status')}->{$field}; - $search_hash{$field} = [ $beginning, $ending, $cgi->param('signuphour') ]; + unless ( $field eq 'signupdate' ) { + $beginning -= 43200; + $ending -= 43200; + } + + my @ary = ( $beginning, $ending ); + push @ary, scalar($cgi->param('signuphour')) if $field eq 'signupdate'; + + $search_hash{$field} = \@ary; } diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html index 0ef5a5196..c7a3ad954 100755 --- a/httemplate/search/report_cust_main.html +++ b/httemplate/search/report_cust_main.html @@ -42,6 +42,34 @@ +% if ( $conf->exists('cust_main-enable_birthdate') ) { + + <% mt('Date of Birth') |h %> + + + <& /elements/tr-input-beginning_ending.html, + prefix => 'birthdate', + layout => 'horiz', + &> +
+ + +% } + +% if ( $conf->exists('cust_main-enable_spouse_birthdate') ) { + + <% mt('Spouse Date of Birth') |h %> + + + <& /elements/tr-input-beginning_ending.html, + prefix => 'spouse_birthdate', + layout => 'horiz', + &> +
+ + +% } + <& /elements/tr-select-cust_tag.html, 'cgi' => $cgi, 'is_report' => 1, -- cgit v1.2.1