X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_main_dayranges.html;h=91e039d285b0c513fcca778cb5a6151e0d85b554;hb=12acbe5a4071314fe87b949ffac478f132f5d305;hp=6bfe10e857096bffb468c709a54765184ba7f78e;hpb=35cff72e48d004b309409cac03e667463a558022;p=freeside.git

diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index 6bfe10e85..91e039d28 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -11,6 +11,7 @@ Example:
     my( $start, $end ) = @_;
 
     "SQL EXPRESSION BASED ON $start AND $end";
+    # where $start and $end are unix timestamps
   };
 
 </%doc>
@@ -20,19 +21,19 @@ Example:
                  'count_query' => $count_sql,
                  'header'      => [ 
                                     FS::UI::Web::cust_header(),
-                                    @pay_head,
                                     '0-30',
                                     '30-60',
                                     '60-90',
                                     '90+',
                                     'Total',
+                                    @pay_head,
                                   ],
                  'footer'      => [
                                     'Total',
                                     ( map '',
                                           ( 1 .. 
                                             scalar(FS::UI::Web::cust_header()-1)
-                                          ), @pay_labels
+                                          ),
                                     ),
                                     
                                     sprintf( $money_char.'%.2f',
@@ -45,48 +46,53 @@ Example:
                                              $row->{'rangecol_90_0'} ),
                                     sprintf( '<b>'. $money_char.'%.2f'. '</b>',
                                              $row->{'rangecol_0_0'} ),
+                                    ('') x @pay_labels,
                                   ],
                  'fields'      => [
                                     FS::UI::Web::cust_fields_subs(),
-                                    @pay_labels,
                                     format_rangecol('0_30'),
                                     format_rangecol('30_60'),
                                     format_rangecol('60_90'),
                                     format_rangecol('90_0'),
                                     format_rangecol('0_0'),
+                                    @pay_labels,
                                   ],
                  'links'       => [
                                     ( map { $_ ne 'Cust. Status' ? $clink : '' }
                                           FS::UI::Web::cust_header()
                                     ),
-                                    @pay_links,
                                     '',
                                     '',
                                     '',
                                     '',
                                     '',
+                                    @pay_links,
                                   ],
                  #'align'       => 'rlccrrrrr',
-                 'align'       => FS::UI::Web::cust_aligns(). 'rrrrr',
+                 'align'       => FS::UI::Web::cust_aligns(). 
+                                   'rrrrr'.
+                                  ('c' x @pay_labels),
                  #'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
                  #'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
                  'size'        => [ ( map '', FS::UI::Web::cust_header() ),
-                                    ( map '', @pay_labels ),
                                     #'-1', '', '', '', '',  '', ],
-                                    '', '', '', '', '',  '', ],
-                 'style'       => [ FS::UI::Web::cust_styles(),
+                                    '', '', '', '', '',  '', 
                                     ( map '', @pay_labels ),
+                                    ],
+                 'style'       => [ FS::UI::Web::cust_styles(),
                                     #'b', '', '', '', '', 'b', ],
-                                    '', '', '', '', 'b', ],
+                                    '', '', '', '', 'b', 
+                                    ( map '', @pay_labels ),
+                                    ],
                  'color'       => [
                                     FS::UI::Web::cust_colors(),
-                                    ( map '', @pay_labels ),
                                     '',
                                     '',
                                     '',
                                     '',
                                     '',
                                     '',
+                                    ( map '', @pay_labels ),
                                   ],
                %opt,
              )
@@ -108,7 +114,7 @@ my $range_sub = delete($opt{'range_sub'}); #or die
 
 my $offset = 0;
 if($cgi->param('as_of')) {
-  $offset = int((time - str2time($cgi->param('as_of'))) / 86400);
+  $offset = int((time - parse_datetime($cgi->param('as_of'))) / 86400);
   $opt{'title'} .= ' ('.$cgi->param('as_of').')' if $offset > 0;
 }
 
@@ -139,8 +145,12 @@ unless ( $cgi->param('all_customers') ) {
     $days = $1;
   }
 
+  # If this is set, allow cust_main records with nonzero balances
+  my $negative = $cgi->param('negative') || 0;
+
   push @where,
-    call_range_sub($range_sub, $days + $offset, 0, 'no_as'=>1). ' > 0'; # != 0';
+    call_range_sub($range_sub, $days, 0, 'offset' => $offset, 'no_as'=>1). 
+    ($negative ? ' != 0' : ' > 0');
 }
 
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -191,18 +201,32 @@ my $row = $total_sth->fetchrow_hashref();
 
 my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-my (@pay_head, @pay_labels, @pay_links);
+my (@payby, @pay_head, @pay_labels, @pay_links);
 
-if($opt{'payment_links'} && $curuser->access_right('Process payment')) {
-  @pay_head = ({ label => 'Process', nodownload => 1, colspan => 2 },
-                { nodownload => 1 });
+my %payby = map {$_ => 1} $conf->config('payby');
+if(%payby) {
+  push @payby, 'CARD' if ($payby{'CARD'} or $payby{'DCRD'});
+  push @payby, 'CHEK' if ($payby{'CHEK'} or $payby{'DCHK'});
+}
+else {
+  @payby = ('CARD','CHEK')
+}
+
+if($opt{'payment_links'} && $curuser->access_right('Process payment') && @payby) {
+  my %label = ( CARD => 'Card',
+                CHEK => 'E-Check' );
+  push @pay_head, ({nodownload => 1}) foreach @payby;
+  $pay_head[0] = { label => 'Process',
+                   nodownload => 1,
+                   colspan => scalar(@payby) };
 
-  @pay_labels = (map { my ($payby,$label) = @$_; 
-                        sub {($payby eq $_[0]->payby) ? "<b>$label</b>" : $label}
-                     } ([CARD => 'Card'], [CHEK => 'ACH']) );
+  @pay_labels = (map { my $payby = $_; 
+                       my $label = $label{$payby};
+                       sub {($payby eq $_[0]->payby) ? "<b>$label (on file)</b>" : $label}
+                     } @payby );
 
   @pay_links = (map { [ "${p}misc/payment.cgi?payby=$_;custnum=", 'custnum' ] }
-                         'CARD', 'CHEK' );
+                         @payby );
 }
 
 </%init>
@@ -229,11 +253,25 @@ my $money_char = $conf->config('money_char') || '$';
 # )
 
 sub call_range_sub {
-  my($range_sub, $start, $end, %opt) = @_;
+  my($range_sub, $startdays, $enddays, %opt) = @_;
+
+  my $as = $opt{'no_as'} ? '' : " AS rangecol_${startdays}_$enddays";
+
+  my $offset = $opt{'offset'} || 0;
+  # Always use $offset - 1day + 1sec = the last second of that day
+  my $cutoff = DateTime->now->set(hour => 23, minute => 59, second => 59);
+  $cutoff->subtract(days => $offset);
 
-  my $as = $opt{'no_as'} ? '' : " AS rangecol_${start}_$end";
+  my $start = $cutoff->clone;
+  $start->subtract(days => $startdays);
+ 
+  my $end = $cutoff->clone;
+  $end->subtract(days => $enddays);
 
-  my $sql = &{$range_sub}( $start, $end, $opt{'offset'} ); #%opt?
+  #warn "offset $offset (".$cutoff->epoch."), range $startdays-$enddays (".$start->epoch . '-' . ($enddays ? $end->epoch : '').")\n";
+  my $sql = &{$range_sub}( $start->epoch, 
+                           $enddays ? $end->epoch : '', 
+                           $cutoff->epoch ); #%opt?
 
   $sql = "SUM($sql)" if $opt{'sum'};