summaryrefslogtreecommitdiff
path: root/httemplate/view/cust_main/payment_history.html
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate/view/cust_main/payment_history.html')
-rw-r--r--httemplate/view/cust_main/payment_history.html178
1 files changed, 135 insertions, 43 deletions
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 5c2aa24c9..aef5fb8f8 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -21,21 +21,21 @@
<% if ( $payby{'BILL'} && $curuser->access_right('Post payment') ) { %>
<%= $s++ ? ' | ' : '' %>
- <A HREF="<%= $p %>edit/cust_pay.cgi?payby=BILL;custnum=<%= $custnum %>">Post check payment</A>
+ <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=BILL;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter check payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter check payment</A>
<% } %>
<% if ( $payby{'CASH'} && $curuser->access_right('Post payment') ) { %>
<%= $s++ ? ' | ' : '' %>
- <A HREF="<%= $p %>edit/cust_pay.cgi?payby=CASH;custnum=<%= $custnum %>">Post cash payment</A>
+ <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_pay.cgi?popup=1;payby=CASH;custnum=<%= $custnum %>', 392, 336, 'cust_pay_popup' ), CAPTION, 'Enter cash payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter cash payment</A>
<% } %>
<% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) { %>
<%= $s++ ? ' | ' : '' %>
- <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Post Western Union payment</A>
+ <A HREF="<%= $p %>edit/cust_pay.cgi?payby=WEST;custnum=<%= $custnum %>">Enter Western Union payment</A>
<% } %>
@@ -62,7 +62,7 @@
<% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) { %>
<%= $s++ ? ' | ' : '' %>
- <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual credit card payment</A>
+ <A HREF="<%= $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<%= $custnum %>">Post manual (offline) credit card payment</A>
<% } %>
@@ -70,7 +70,7 @@
<% if ( $curuser->access_right('Post credit') ) { %>
- <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Post credit</A>
+ <A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%= $p %>edit/cust_credit.cgi?<%= $custnum %>', 392, 336, 'cust_credit_popup' ), CAPTION, 'Enter credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Enter credit</A>
<BR>
@@ -135,7 +135,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
$post = '</FONT></B>';
$apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
$cust_pay->paynum.
- qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+ qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
} elsif ( scalar(@cust_bill_pay) == 1
&& scalar(@cust_pay_refund) == 0
@@ -161,7 +161,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
} elsif ( $app->isa('FS::cust_pay_refund') ) {
$desc .= '&nbsp;&nbsp;'.
'$'. $app->amount.
- ' refunded on'. time2str("%D", $app->_date).
+ ' refunded on '. time2str("%D", $app->_date).
'<BR>';
} else {
die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
@@ -173,7 +173,7 @@ foreach my $cust_pay ($cust_main->cust_pay) {
$cust_pay->unapplied. ' unapplied</FONT></B>'.
qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_bill_pay.cgi?!.
$cust_pay->paynum.
- qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+ qq!', 392, 336, 'cust_bill_pay_popup' ), CAPTION, 'Apply payment', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
'<BR>';
}
}
@@ -195,13 +195,14 @@ foreach my $cust_pay ($cust_main->cust_pay) {
my $void = '';
if ( $cust_pay->closed !~ /^Y/i
&& ( ( $cust_pay->payby eq 'CARD'
- && $conf->exists('cc-void')
- && $curuser->acccess_right('Credit card void')
+ && $curuser->access_right('Credit card void')
)
|| ( $cust_pay->payby eq 'CHEK'
- && $conf->exists('echeck-void')
- && $curuser->acccess_right('Echeck void')
- )
+ && $curuser->access_right('Echeck void')
+ )
+ || ( $cust_pay->payby !~ /^(CARD|CHEK)$/
+ && $curuser->access_right('Regular void')
+ )
)
)
{
@@ -231,7 +232,6 @@ foreach my $cust_pay ($cust_main->cust_pay) {
my $unapply = '';
if ( $cust_pay->closed !~ /^Y/i
- && $conf->exists('unapplypayments')
&& scalar(@cust_bill_pay)
&& $curuser->access_right('Unapply payment')
)
@@ -268,7 +268,6 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
my $unvoid = '';
if ( $cust_pay_void->closed !~ /^Y/i
- && $conf->exists('unvoid')
&& $curuser->access_right('Unvoid')
)
{
@@ -307,7 +306,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
$post = '</FONT></B>';
$apply = qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
$cust_credit->crednum.
- qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
+ qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!;
} elsif ( scalar(@cust_credit_bill) == 1
&& scalar(@cust_credit_refund) == 0
&& $cust_credit->credited == 0 ) {
@@ -332,7 +331,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
} elsif ( $app->isa('FS::cust_credit_refund') ) {
$desc .= '&nbsp;&nbsp;'.
'$'. $app->amount.
- ' refunded on'. time2str("%D", $app->_date).
+ ' refunded on '. time2str("%D", $app->_date).
'<BR>';
} else {
die "$app is not a FS::cust_credit_bill or a FS::cust_credit_refund";
@@ -343,14 +342,18 @@ foreach my $cust_credit ($cust_main->cust_credit) {
$cust_credit->credited. ' unapplied</FONT></B>'.
qq! (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_credit_bill.cgi?!.
$cust_credit->crednum.
- qq!', 392, 336, 'cust_credit_popup' ), CAPTION, 'Post credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
+ qq!', 392, 336, 'cust_credit_bill_popup' ), CAPTION, 'Apply credit', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">apply</A>)!.
'<BR>';
}
}
#
my $delete = '';
if ( $cust_credit->closed !~ /^Y/i
- && $conf->exists('deletecredits')
+
+ #s'pose deleting a credit isn't bad like deleting a payment
+ # and this needs to be generally available until we have credit voiding..
+ #&& $conf->exists('deletecredits')
+
&& $curuser->access_right('Delete credit')
)
{
@@ -362,7 +365,6 @@ foreach my $cust_credit ($cust_main->cust_credit) {
my $unapply = '';
if ( $cust_credit->closed !~ /^Y/i
- && $conf->exists('unapplycredits')
&& scalar(@cust_credit_bill)
&& $curuser->access_right('Unapply credit')
)
@@ -408,37 +410,98 @@ foreach my $cust_refund ($cust_main->cust_refund) {
%>
-<%= include("/elements/table.html") %>
+<%= include("/elements/table-grid.html") %>
+
+<% my $bgcolor1 = '#eeeeee';
+ my $bgcolor2 = '#ffffff';
+ my $bgcolor = '';
+%>
+
<TR>
- <TH>Date</TH>
- <TH>Description</TH>
- <TH><FONT SIZE=-1>Charge</FONT></TH>
- <TH><FONT SIZE=-1>Payment</FONT></TH>
- <TH><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
- <TH><FONT SIZE=-1>Refund</FONT></TH>
- <TH><FONT SIZE=-1>Balance</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Charge</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Payment</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>In-house<BR>Credit</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Refund</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Balance</FONT></TH>
</TR>
<%
#display payment history
-my %target;
my $balance = 0;
+my %target = ();
+my $money_char = $conf->config('money_char') || '$';
+
+my $years = $conf->config('payment_history-years') || 2;
+my $older_than = time - $years * 31556736; #60*60*24*365.24
+my $hidden = 0;
+my $seen = 0;
+my $old_history = 0;
+
foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
+ my $display;
+ if ( $item->{'date'} < $older_than ) {
+ $display = ' STYLE="display:none" ';
+ $hidden = 1;
+ } else {
+
+ $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>
+
+ <%
+ }
+
+ }
+
+ if ( $bgcolor eq $bgcolor1 ) {
+ $bgcolor = $bgcolor2;
+ } else {
+ $bgcolor = $bgcolor1;
+ }
+
my $charge = exists($item->{'charge'})
- ? sprintf('$%.2f', $item->{'charge'})
+ ? sprintf("$money_char\%.2f", $item->{'charge'})
: '';
+
my $payment = exists($item->{'payment'})
- ? sprintf('-&nbsp;$%.2f', $item->{'payment'})
+ ? sprintf("-&nbsp;$money_char\%.2f", $item->{'payment'})
: '';
- $payment ||= sprintf('<DEL>-&nbsp;$%.2f</DEL>', $item->{'void_payment'})
+
+ $payment ||= sprintf( "<DEL>-&nbsp;$money_char\%.2f</DEL>",
+ $item->{'void_payment'}
+ )
if exists($item->{'void_payment'});
+
my $credit = exists($item->{'credit'})
- ? sprintf('-&nbsp;$%.2f', $item->{'credit'})
+ ? sprintf("-&nbsp;$money_char\%.2f", $item->{'credit'})
: '';
+
my $refund = exists($item->{'refund'})
- ? sprintf('$%.2f', $item->{'refund'})
+ ? sprintf("$money_char\%.2f", $item->{'refund'})
: '';
my $target = exists($item->{'target'}) ? $item->{'target'} : '';
@@ -449,12 +512,12 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
$balance += $item->{'refund'} if exists $item->{'refund'};
$balance = sprintf("%.2f", $balance);
$balance =~ s/^\-0\.00$/0.00/; #yay ieee fp
- ( my $showbalance = '$'. $balance ) =~ s/^\$\-/-&nbsp;\$/;
+ ( my $showbalance = $money_char. $balance ) =~ s/^\$\-/-&nbsp;\$/;
%>
- <TR>
- <TD>
+ <TR <%= $display ? $display.' ID="old_history'.$old_history++.'"' : ''%>>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
<% unless ( !$target || $target{$target}++ ) { %>
<A NAME="<%= $target %>">
<% } %>
@@ -464,15 +527,44 @@ foreach my $item ( sort { $a->{'date'} <=> $b->{'date'} } @history ) {
<% } %>
</FONT>
</TD>
- <TD><%= $item->{'desc'} %></TD>
- <TD ALIGN="right"><%= $charge %></TD>
- <TD ALIGN="right"><%= $payment %></TD>
- <TD ALIGN="right"><%= $credit %></TD>
- <TD ALIGN="right"><%= $refund %></TD>
- <TD ALIGN="right"><%= $showbalance %></TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $item->{'desc'} %>
+ </TD>
+ <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $charge %>
+ </TD>
+ <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $payment %>
+ </TD>
+ <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $credit %>
+ </TD>
+ <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $refund %>
+ </TD>
+ <TD ALIGN="right" CLASS="grid" BGCOLOR="<%= $bgcolor %>">
+ <%= $showbalance %>
+ </TD>
</TR>
<% } %>
</TABLE>
+<SCRIPT TYPE="text/javascript">
+
+function show_history () {
+ //alert('showing history!');
+
+ var balance_forward_row = document.getElementById('balance_forward_row');
+
+ balance_forward_row.style.display = 'none';
+ for ( var i = 0; i < <%= $old_history %>; i++ ) {
+ var oldRow = document.getElementById('old_history'+i);
+ oldRow.style.display = '';
+ }
+
+}
+
+</SCRIPT>
+
generated by cgit v1.2.1 (git 2.18.0) at 2025-08-11 03:08:16 +0000