X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=099bc4f2b5ec04d9cdacbc4b048475851c9a1c40;hp=4e4cd154f22fe07c51068ffeed7eddd4e2136c0f;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 4e4cd154f..099bc4f2b 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -18,6 +18,7 @@
 
 % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
 %        && $curuser->access_right('Process payment')
+%        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
   <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card payment</A>
@@ -25,6 +26,7 @@
 
 % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
 %        && $curuser->access_right('Process payment')
+%        && ! $cust_main->is_encrypted($cust_main->payinfo)
 %      ) {
   <% $s++ ? ' | ' : '' %>
   <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) payment</A>
@@ -47,6 +49,17 @@
   <BR>
 % } 
 
+% if ( $conf->exists('batch-enable')
+%      #&& $curuser->access_right('View customer tax exemptions')
+%    ) { 
+  View batched payments:
+%   foreach my $status (qw( Queued In-transit Complete All )) {
+      <A HREF="<% $p %>search/cust_pay_batch.cgi?status=<% $status{$status} %>;custnum=<% $custnum %>"><% $status %></A> 
+      <% $status ne 'All' ? '|' : '' %>
+%   }
+  <BR>
+% } 
+
 %#get payment history
 %my @history = ();
 %
@@ -60,11 +73,21 @@
 %  my $link = $curuser->access_right('View invoices')
 %               ? qq!<A HREF="${p}view/cust_bill.cgi?$invnum">!
 %               : '';
+%  my $events = '';
+%  if ( $cust_bill->num_cust_event
+%       && (    $curuser->access_right('Billing event reports')
+%            || $curuser->access_right('View customer billing events')
+%          )
+%     ) {
+%    $events =
+%      qq!<BR><FONT SIZE="-1"><A HREF="${p}search/cust_event.html?invnum=!.
+%      $cust_bill->invnum. '">(&nbsp;View invoice events&nbsp;)</A></FONT>';
+%  }
 %  push @history, {
 %    'date'   => $cust_bill->_date,
 %    'desc'   => $link. $pre.
 %                "Invoice #$invnum (Balance \$". $cust_bill->owed. ')'.
-%                $post. ( $link ? '</A>' : '' ),
+%                $post. ( $link ? '</A>' : '' ). $events,
 %    'charge' => $cust_bill->charged,
 %  };
 %}
@@ -76,7 +99,7 @@
 %
 %  my $payinfo;
 %  if ( $payby eq 'CARD' ) {
-%    $payinfo = $cust_pay->payinfo_masked;
+%    $payinfo = $cust_pay->paymask;
 %  } elsif ( $payby eq 'CHEK' && $cust_pay->payinfo =~ /^(\d+)\@(\d+)$/ ) {
 %    $payinfo = "ABA $2, Acct# $1";
 %  } else {
@@ -227,7 +250,7 @@
 %
 %  my $payby = $cust_pay_void->payby;
 %  my $payinfo = $payby eq 'CARD'
-%                  ? $cust_pay_void->payinfo_masked
+%                  ? $cust_pay_void->paymask
 %                  : $cust_pay_void->payinfo;
 %
 %  $payby =~ s/^BILL$/Check #/ if $payinfo;
@@ -363,16 +386,30 @@
 %
 %  my $payby = $cust_refund->payby;
 %  my $payinfo = $payby eq 'CARD'
-%                  ? $cust_refund->payinfo_masked
+%                  ? $cust_refund->paymask
 %                  : $cust_refund->payinfo;
 %
 %  $payby =~ s/^BILL$/Check #/ if $payinfo;
 %  $payby =~ s/^CHEK$/Electronic check /;
 %  $payby =~ s/^(CARD|COMP)$/$1 /;
 %
+%  my $delete = '';
+%  if ( $cust_refund->closed !~ /^Y/i
+%       && $conf->exists('deleterefunds')
+%       && $curuser->access_right('Delete refund')
+%     )
+%  {
+%    $delete = qq! (<A HREF="javascript:areyousure('!.
+%              qq!${p}misc/delete-cust_refund.cgi?!. $cust_refund->refundnum.
+%              qq!', 'Are you sure you want to delete this refund?')"!.
+%              qq! TITLE="Delete this refund from the database completely - not recommended"!.
+%              qq!>delete</A>)!;
+%  }
+%
 %  push @history, {
 %    'date'   => $cust_refund->_date,
-%    'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker,
+%    'desc'   => "Refund ($payby$payinfo) by ". $cust_refund->otaker. "<BR>".
+%                $delete,
 %    'refund' => $cust_refund->refund,
 %  };
 %
@@ -400,6 +437,31 @@
 %
 %#display payment history
 %
+%sub balance_forward_row {
+%  my( $b, $date ) = @_;
+%  my $conf = new FS::Conf;
+%  my $money_char = $conf->config('money_char') || '$';
+%  ( my $balance_forward = $money_char. $b ) =~ s/^\$\-/-&nbsp;\$/;
+
+   <TR ID="balance_forward_row">
+     <TD CLASS="grid" BGCOLOR="#dddddd">
+       <% time2str("%D",$date) %>
+     </TD>
+
+     <TD CLASS="grid" BGCOLOR="#dddddd">
+       <I>Starting balance on <% time2str("%D",$date) %></I>
+       (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
+     </TD>
+
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
+     <TD CLASS="grid" BGCOLOR="#dddddd"><I><% $balance_forward %></I></TD>
+
+   </TR>
+%}
+%
 %my $balance = 0;
 %my %target = ();
 %my $money_char = $conf->config('money_char') || '$';
@@ -409,9 +471,12 @@
 %my $hidden = 0;
 %my $seen = 0;
 %my $old_history = 0;
+%my $lastdate = 0;
 %
 %foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
 %
+%  $lastdate = $item->{'date'};
+%
 %  my $display;
 %  if ( $item->{'date'} < $older_than ) {
 %    $display = ' STYLE="display:none" ';
@@ -421,28 +486,7 @@
 %    $display = '';
 %
 %    if ( $hidden && ! $seen++ ) {
-%      ( my $balance_forward = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
-%    
-
-
-      <TR ID="balance_forward_row">
-        <TD CLASS="grid" BGCOLOR="#dddddd">
-          <% time2str("%D",$item->{'date'}) %>
-        </TD>
-
-        <TD CLASS="grid" BGCOLOR="#dddddd">
-          <I>Starting balance on <% time2str("%D",$item->{'date'}) %></I>
-          (<A HREF="javascript:void(0);" onClick="show_history();">show prior history</A>)
-        </TD>
-
-        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-        <TD CLASS="grid" BGCOLOR="#dddddd"></TD>
-        <TD CLASS="grid" BGCOLOR="#dddddd"><I><% $balance_forward %></I></TD>
-
-      </TR>
-%
+%      balance_forward_row($balance, $item->{'date'});
 %    }
 %
 %  }
@@ -523,6 +567,9 @@
   </TR>
 % } 
 
+%if ( scalar(@history) && $hidden && ! $seen++ ) {
+%  balance_forward_row($balance, $lastdate);
+%}
 
 </TABLE>
 
@@ -558,4 +605,11 @@ my @payby = grep /\w/, $conf->config('payby');
   unless @payby;
 my %payby = map { $_=>1 } @payby;
 
+my %status = (
+  'Queued'     => 'O', #Open
+  'In-transit' => 'I',
+  'Complete'   => 'R', #Resolved
+  'All'        => '',
+);
+
 </%init>