diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-09-05 11:45:48 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-09-05 11:45:48 -0700 |
| commit | 656a9b83e02e5eb5aea314b23546b156631ac51a (patch) | |
| tree | 62d68333cfb14e6b348836fc356b05b539f41b9b /httemplate | |
| parent | f5f6c1b1a622d934b4450e4923f95012c5874098 (diff) | |
| parent | f3145308f69d7d3d42af6132439cff26b4fc9008 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/graph/signupdate.cgi | 8 | ||||
| -rw-r--r-- | httemplate/view/cust_main/change_history.html | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/httemplate/graph/signupdate.cgi b/httemplate/graph/signupdate.cgi index 23e459664..011817c3a 100644 --- a/httemplate/graph/signupdate.cgi +++ b/httemplate/graph/signupdate.cgi @@ -40,13 +40,13 @@ my $sdate = DateTime->new( my $edate = DateTime->new( year => $cgi->param('end_year'), - month => ($cgi->param('end_month') % 12 + 1) # first day of the next month -)->epoch(); + month => $cgi->param('end_month') +)->add( months => 1 )->epoch(); my $where .= " AND signupdate >= $sdate ". - " AND signupdate <= $edate "; + " AND signupdate < $edate "; -foreach my $cust (qsearch({ table => 'cust_main', +foreach my $cust (qsearch({ table => 'cust_main', hashref => \%where, extra_sql => $where } )) { next if !$cust->signupdate; diff --git a/httemplate/view/cust_main/change_history.html b/httemplate/view/cust_main/change_history.html index bf32a49f9..217b14e7f 100644 --- a/httemplate/view/cust_main/change_history.html +++ b/httemplate/view/cust_main/change_history.html @@ -42,6 +42,7 @@ tie my %tables, 'Tie::IxHash', 'svc_broadband' => 'Broadband', 'svc_external' => 'External service', 'svc_phone' => 'Phone', + 'svc_cable' => 'Cable', 'phone_device' => 'Phone device', 'cust_pkg_discount' => 'Discount', #? it gets provisioned anyway 'phone_avail' => 'Phone', @@ -59,6 +60,7 @@ my %table_join = ( 'svc_broadband' => $svc_join, 'svc_external' => $svc_join, 'svc_phone' => $svc_join, + 'svc_cable' => $svc_join, 'phone_device' => $svc_join, 'cust_pkg_discount'=> $pkg_join, ); |