diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/process/part_event.html | 15 | ||||
| -rw-r--r-- | httemplate/elements/menu.html | 5 | ||||
| -rw-r--r-- | httemplate/graph/signupdate.cgi | 27 |
3 files changed, 32 insertions, 15 deletions
diff --git a/httemplate/edit/process/part_event.html b/httemplate/edit/process/part_event.html index a8c434c1a..481439d53 100644 --- a/httemplate/edit/process/part_event.html +++ b/httemplate/edit/process/part_event.html @@ -85,6 +85,21 @@ if ( $cgi->param('_initialize') ) { $cgi->param('disabled', 'Y'); } + + my $balance_age_rx = qr/^(condition.+)\.balance_age\.age$/; + + foreach my $param ( keys %{ $cgi->Vars() } ){ + + next unless ( $param =~ /$balance_age_rx/ ); + next unless $cgi->param($1) eq 'balance_age'; + + my $errstr = FS::part_event::Condition::balance_age-> + check_options( { age => $cgi->param($param), + age_units => $cgi->param("${param}_units") } ); + + return $errstr if $errstr; + } + return ''; }, 'noerror_callback' => sub { diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 7e329cf23..61cdd746f 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -113,8 +113,9 @@ tie my %report_customers, 'Tie::IxHash'; $report_customers{'List customers'} = [ \%report_customers_lists, 'List customers' ] if $curuser->access_right('List all customers'); $report_customers{'Zip code distribution'} = [ $fsurl. 'search/report_cust_main-zip.html', 'Zip codes by number of customers' ]; -$report_customers{'Customer signup report'} = [ $fsurl. 'graph/report_cust_signup.html', 'New customer signups by date' ], -$report_customers{'Advanced customer reports'} = [ $fsurl. 'search/report_cust_main.html', 'by status, signup date, agent, etc.' ] +$report_customers{'Customer signup report'} = [ $fsurl. 'graph/report_cust_signup.html', 'New customer signups by date' ]; +$report_customers{'Signup date report'} = [ $fsurl. 'graph/report_signupdate.html', 'Signup date report (by date of signup)' ]; +$report_customers{'Advanced customer reports'} = [ $fsurl. 'search/report_cust_main.html', 'by status, signup date, agent, etc.' ] if $curuser->access_right('Advanced customer search'); tie my %report_invoices_open, 'Tie::IxHash', diff --git a/httemplate/graph/signupdate.cgi b/httemplate/graph/signupdate.cgi index 5b7075868..23e459664 100644 --- a/httemplate/graph/signupdate.cgi +++ b/httemplate/graph/signupdate.cgi @@ -32,22 +32,23 @@ my @count = (0) x 24; my %where; $where{'agentnum'} = $agentnum if $agentnum; $where{'usernum'} = $usernum if $usernum; -my $sdate = $cgi->param('start_year'). - '-'. - $cgi->param('start_month'). - '-01'; -my $edate = ($cgi->param('end_year') + - ($cgi->param('end_month')==12)). - '-'. - ($cgi->param('end_month') % 12 + 1). - '-01'; # first day of the next month - -my $sql = "AND signupdate >= ".str2time($sdate). - " AND signupdate < ".str2time($edate); + +my $sdate = DateTime->new( + year => $cgi->param('start_year'), + month => $cgi->param('start_month'), +)->epoch(); + +my $edate = DateTime->new( + year => $cgi->param('end_year'), + month => ($cgi->param('end_month') % 12 + 1) # first day of the next month +)->epoch(); + +my $where .= " AND signupdate >= $sdate ". + " AND signupdate <= $edate "; foreach my $cust (qsearch({ table => 'cust_main', hashref => \%where, - extra_sql => $sql } )) { + extra_sql => $where } )) { next if !$cust->signupdate; my $hour = time2str('%H',$cust->signupdate); $count[$hour]++; |