<TR>
<TD ALIGN="left">
-%# payment links
-
-% my $s = 0;
-% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment' ]) ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter check payment'),
- 'action' => "${p}edit/cust_pay.cgi?popup=1;payby=BILL",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter check payment'),
- 'width' => ( $opt{'pkg-balances'} ? 763 : 392),
- 'height' => 392,
- &>
-% }
-
-% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter cash payment'),
- 'action' => "${p}edit/cust_pay.cgi?popup=1;payby=CASH",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter cash payment'),
- 'width' => ( $opt{'pkg-balances'} ? 763 : 392),
- 'height' => 392,
- &>
-% }
-
-% if ( $payby{'WEST'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=WEST;custnum=<% $custnum %>"><% mt('Enter Western Union payment') |h %></A>
-% }
-
-<% $s ? '<BR>' : '' %>
-% $s=0;
-
-% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-% && $curuser->access_right(['Process payment', 'Process credit card payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CARD;custnum=<% $custnum %>"><% mt('Process credit card payment') |h %></A>
-% }
-
-% if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-% && $curuser->access_right(['Process payment', 'Process Echeck payment'])
-% && ! $cust_main->is_encrypted($cust_main->payinfo)
-% ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>misc/payment.cgi?payby=CHEK;custnum=<% $custnum %>"><% mt('Process electronic check (ACH) payment') |h %></A>
-% }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card payment') |h %></A>
-% }
-
-<% $s ? '<BR>' : '' %>
-
-%# credit links
-
-% $s=0;
-% if ( $curuser->access_right('Post credit') ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter credit'),
- 'action' => "${p}edit/cust_credit.cgi",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter credit'),
- 'width' => ( $opt{'pkg-balances'} ? 763 : 616),
- &>
-% }
-% if ( $curuser->access_right('Credit line items') ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Credit line items'),
- #'action' => "${p}search/cust_bill_pkg.cgi?nottax=1;type=select",
- 'action' => "${p}edit/credit-cust_bill_pkg.html",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Credit line items'),
- 'width' => 968, #763,
- 'height' => 575,
- &>
-% }
-<% $s ? '<BR>' : '' %>
-
-%# refund links
-
-% $s = 0;
-% if ( $payby{'BILL'} && $curuser->access_right(['Post refund', 'Post check refund']) ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter check refund'),
- 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter check refund'),
- 'width' => 392,
- &>
-% }
-
-% if ( $payby{'CASH'} && $curuser->access_right(['Post refund', 'Post cash refund']) ) {
- <% $s++ ? ' | ' : '' %>
- <& /elements/popup_link-cust_main.html,
- 'label' => emt('Enter cash refund'),
- 'action' => "${p}edit/cust_refund.cgi?popup=1;payby=CASH",
- 'cust_main' => $cust_main,
- 'actionlabel' => emt('Enter cash refund'),
- 'width' => 392,
- &>
-% }
-
-%# someday, perhaps. very few gateways let you do unlinked refunds at all.
-%# Authorize.net makes you sign a special form
-%#
-%# % if ( ( $payby{'CARD'} || $payby{'DCRD'} )
-%# % && $curuser->access_right('Process refund')
-%# % && ! $cust_main->is_encrypted($cust_main->payinfo)
-%# % ) {
-%# <% $s++ ? ' | ' : '' %>
-%# <A HREF="<% $p %>misc/refund.cgi?payby=CARD;custnum=<% $custnum %>">Process credit card refund</A>
-%# % }
-%#
-%# % if ( ( $payby{'CHEK'} || $payby{'DCHK'} )
-%# % && $curuser->access_right('Process refund')
-%# % && ! $cust_main->is_encrypted($cust_main->payinfo)
-%# % ) {
-%# <% $s++ ? ' | ' : '' %>
-%# <A HREF="<% $p %>misc/refund.cgi?payby=CHEK;custnum=<% $custnum %>">Process electronic check (ACH) refund</A>
-%# % }
-
-% if ( $payby{'MCRD'} && $curuser->access_right('Post refund') ) {
- <% $s++ ? ' | ' : '' %>
- <A HREF="<% $p %>edit/cust_refund.cgi?payby=MCRD;custnum=<% $custnum %>"><% mt('Post manual (offline/POS) credit card refund') |h %></A>
-% }
-
- </TD>
- <TD ALIGN="right" VALIGN="top">
-
-%# invoice reports, combined statement
-% if ( $curuser->access_right('List invoices') ) {
-% if ( $num_cust_bill > 0 ) {
- <A HREF="<% $p %>view/cust_main_statement-pdf.cgi?<% $custnum %>"><%
- mt('Download typeset statement PDF') |h %></A>
- <BR>
-% }
- <A HREF="<% $p %>search/report_cust_bill.html?custnum=<% $custnum %>"><% mt('Invoice reports') |h %></A>
-% }
-<BR>
-
-%# XXX payments, credits, refund reports
-
-%# tax exemption link
-
-% my $view_exemptions = $curuser->access_right('View customer tax exemptions');
-% my $add_adjustment = ( $conf->exists('enable_tax_adjustments')
-% && $curuser->access_right('Add customer tax adjustment')
-% );
-% if ( $view_exemptions || $add_adjustment ) {
-
-% if ( $view_exemptions ) {
- <A HREF="<% $p %>search/cust_tax_exempt_pkg.cgi?custnum=<% $custnum %>"><% mt('View tax exemptions') |h %></A>
- <% $add_adjustment ? '|' : '' %>
-% }
-
-% if ( $add_adjustment ) {
- <& /elements/popup_link.html, {
- 'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum,
- 'label' => emt('Add tax adjustment'),
- 'actionlabel' => emt('Add tax adjustment'),
- 'height' => 200,
- }
- &>
- |
- <A HREF="<% $p %>search/cust_tax_adjustment.html?custnum=<% $custnum %>"><% mt('View tax adjustments') |h %></A>
-% }
-
- <BR>
-% }
-
%# batched payment links
% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
<BR>
% }
-%# pending payment links
-
-% if ( $curuser->access_right('View customer pending payments')
-% && scalar($cust_main->cust_pay_pending)
-% )
-% {
- <A HREF="<% $p %>search/cust_pay_pending.html?magic=_date;statusNOT=done;custnum=<% $custnum %>"><% mt('View pending payments') |h %></A><BR>
-% }
-
</TD>
</TR>
<TR>
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Date') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Description') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Refund') |h %></FONT></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1><% mt('Balance') |h %></FONT></TH>
</TR>
+</THEAD>
%#display payment history
qw( card_refund-days date_format )
),
( map { $_ => $conf->exists($_) }
- qw( deleteinvoices deletepayments deleterefunds pkg-balances
+ qw( deletepayments deleterefunds pkg-balances
cust_credit_bill_pkg-manual cust_bill_pay_pkg-manual
)
),
#rights
( map { $_ => $curuser->access_right($_) }
(
- 'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices',
+ 'View invoices', 'Void invoices', 'Unvoid invoices',
'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
'Delete payment', 'Unapply payment',
- 'Apply credit', 'Delete Credit', 'Unapply credit',
+ 'Apply credit', 'Delete credit', 'Unapply credit', 'Void credit', 'Unvoid credit',
'Delete refund',
'Billing event reports', 'View customer billing events',
)
foreach my $legacy_cust_bill ($cust_main->legacy_cust_bill) {
push @history, {
'date' => $legacy_cust_bill->_date,
+ 'order' => 1,
+ 'num' => $legacy_cust_bill->legacyid,
'desc' => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ),
'charge_nobal' => $legacy_cust_bill->charged,
};
foreach my $cust_bill ($cust_main->cust_bill) {
push @history, {
'date' => $cust_bill->_date,
+ 'order' => 1,
+ 'num' => $cust_bill->invnum,
'desc' => include('payment_history/invoice.html', $cust_bill, %opt ),
'charge' => $cust_bill->charged,
};
foreach my $cust_bill_void ($cust_main->cust_bill_void) {
push @history, {
'date' => $cust_bill_void->_date,
+ 'order' => 0,
+ 'num' => $cust_bill_void->invnum,
'desc' => include('payment_history/voided_invoice.html', $cust_bill_void, %opt ),
'void_charge' => $cust_bill_void->charged,
};
foreach my $cust_statement ($cust_main->cust_statement) {
push @history, {
'date' => $cust_statement->_date,
+ 'order' => 2,
+ 'num' => $cust_statement->statementnum,
'desc' => include('payment_history/statement.html', $cust_statement, %opt ),
#'charge' => $cust_bill->charged,
};
foreach my $cust_pay ($cust_main->cust_pay) {
push @history, {
'date' => $cust_pay->_date,
+ 'order' => 6,
+ 'num' => $cust_pay->paynum,
'desc' => include('payment_history/payment.html', $cust_pay, %opt ),
'payment' => $cust_pay->paid,
#'target' => $target, #XXX
foreach my $cust_pay_pending ($cust_main->cust_pay_pending) {
push @history, {
'date' => $cust_pay_pending->_date,
+ 'order' => 4,
+ 'num' => $cust_pay_pending->paypendingnum,
'desc' => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ),
'void_payment' => $cust_pay_pending->paid,
};
foreach my $cust_pay_void ($cust_main->cust_pay_void) {
push @history, {
'date' => $cust_pay_void->_date,
+ 'order' => 3,
+ 'num' => $cust_pay_void->paynum,
'desc' => include('payment_history/voided_payment.html', $cust_pay_void, %opt ),
'void_payment' => $cust_pay_void->paid,
};
foreach my $cust_credit_void ($cust_main->cust_credit_void) {
push @history, {
'date' => $cust_credit_void->_date,
+ 'order' => 7,
+ 'num' => $cust_credit_void->paynum,
'desc' => include('payment_history/voided_credit.html', $cust_credit_void, %opt ),
'void_credit' => $cust_credit_void->amount,
};
foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) {
push @history, {
'date' => $cust_pay_pending->_date,
+ 'order' => 5,
+ 'num' => $cust_pay_pending->paypendingnum,
'desc' => include('payment_history/attempted_payment.html', $cust_pay_pending, %opt ),
'void_payment' => $cust_pay_pending->paid, #??
#'target' => $target, #XXX
my $pay_batch = $cust_pay_batch->pay_batch;
push @history, {
'date' => $pay_batch->upload,
+ 'order' => 5,
+ 'num' => $cust_pay_batch->paybatchnum,
'desc' => include('payment_history/attempted_batch_payment.html', $cust_pay_batch, %opt),
'void_payment' => $cust_pay_batch->amount,
};
foreach my $cust_credit ($cust_main->cust_credit) {
push @history, {
'date' => $cust_credit->_date,
+ 'order' => 8,
+ 'num' => $cust_credit->crednum,
'desc' => include('payment_history/credit.html', $cust_credit, %opt ),
'credit' => $cust_credit->amount,
};
foreach my $cust_refund ($cust_main->cust_refund) {
push @history, {
'date' => $cust_refund->_date,
+ 'order' => 9,
+ 'num' => $cust_refund->refundnum,
'desc' => include('payment_history/refund.html', $cust_refund, %opt),
'refund' => $cust_refund->refund,
};
my $older_than = time - $years * 31556926; #60*60*24*365.2422
my $balance = 0;
-@history = sort { $a->{date} <=> $b->{date} } @history;
+@history = sort { $a->{date} <=> $b->{date}
+ or $a->{order} <=> $b->{order}
+ or $a->{num} <=> $b->{num}
+ }
+ @history;
+
my $i = 0;
my $balance_forward;
foreach my $item (@history) {
# then sort in user-pref order
if ( $curuser->option('history_order') eq 'newest' ) {
- @history = sort { $b->{date} <=> $a->{date} } @history;
+ @history = sort { $b->{date} <=> $a->{date}
+ or $b->{order} <=> $a->{order} #or still forward here?
+ or $b->{num} <=> $a->{num}
+ }
+ @history;
} # else it's already oldest-first, and there are no other options yet
sub translate_payby {
projects / freeside.git / blobdiff