X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=3603d37675a6433d8246f408a527de3d7c7deab2;hb=0c8fb96e40e3d9dc4ebb1f421e58efd0ac8ba5a4;hp=204647f9711793fa2b32d74953eafd9042ba539c;hpb=1fed7d3c8a2e483177e39eadab4e5d916c86ec8f;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 204647f97..3603d3767 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -58,6 +58,11 @@
<% mt('Post manual (offline/POS) credit card payment') |h %>
% }
+% if ( $payby{'MCRD'} && $curuser->access_right('Post payment') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('Post manual (offline) electronic check payment') |h %>
+% }
+
<% $s ? '
' : '' %>
%# credit links
@@ -97,7 +102,7 @@
'action' => "${p}edit/cust_refund.cgi?popup=1;payby=BILL",
'cust_main' => $cust_main,
'actionlabel' => emt('Enter check refund'),
- 'width' => 392,
+ 'width' => 440,
&>
% }
@@ -136,15 +141,29 @@
<% mt('Post manual (offline/POS) credit card refund') |h %>
% }
+% if ( $payby{'MCHK'} && $curuser->access_right('Post refund') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('Post manual (offline) electronic check refund') |h %>
+% }
+
%# invoice reports, combined statement
% if ( $curuser->access_right('List invoices') ) {
-% if ( $num_cust_bill > 0 ) {
- <%
- mt('Download typeset statement PDF') |h %>
+% if ( $curuser->access_right('Resend invoices')
+% && $cust_main->invoicing_list_emailonly ) {
+
+ <% mt('Email statement to this customer') |h %>
+
+% }
+% if ( $num_cust_bill > 0
+% && $curuser->access_right('View legacy typeset statements')
+% ) {
+ <%
+ mt('Download typeset statement PDF') |h %>
+
% }
<% mt('Invoice reports') |h %>
% }
@@ -321,29 +340,43 @@
% if ( $item->{'balance_forward'} ) {
<& .balance_forward_row, $item->{'balance'}, $item->{'date'} &>
-% }
+% }
%} # foreach $item
+% if ( $old_history ) {
+<& .hide_history_row, $old_history++ &>
+% }
+
|
+
<%def .balance_forward_row>
% my( $b, $date ) = @_;
@@ -356,7 +389,7 @@ function show_history () {
<% mt("Starting balance on [_1]", time2str($date_format, $date) ) |h %>
- (<% mt('show prior history') |h %>)
+ (<% mt('show prior history') |h %>)
|
|
@@ -367,6 +400,17 @@ function show_history () {
%def>
+<%def .hide_history_row>
+% my $num = shift;
+
+ |
+
+ (<% mt('hide prior history') |h %>)
+ |
+ |
+
+%def>
+
<%shared>
my $conf = new FS::Conf;
my $date_format = $conf->config('date_format') || '%m/%d/%Y';
@@ -411,11 +455,12 @@ my %opt = (
#rights
( map { $_ => $curuser->access_right($_) }
(
- 'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices',
+ 'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices', 'Resend invoices',
'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
+ 'Post refund', 'Post check refund', 'Post cash refund ', 'Refund 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',
)
@@ -424,6 +469,7 @@ my %opt = (
#customer information
'total_owed' => $cust_main->total_owed,
'total_unapplied_refunds' => $cust_main->total_unapplied_refunds,
+ 'has_email_address' => scalar($cust_main->invoicing_list_emailonly),
);
$opt{'date_format'} ||= '%m/%d/%Y';
@@ -432,6 +478,8 @@ $opt{'date_format'} ||= '%m/%d/%Y';
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,
};
@@ -442,6 +490,8 @@ my $num_cust_bill = 0;
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,
};
@@ -452,6 +502,8 @@ foreach my $cust_bill ($cust_main->cust_bill) {
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,
};
@@ -461,6 +513,8 @@ foreach my $cust_bill_void ($cust_main->cust_bill_void) {
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,
};
@@ -470,6 +524,8 @@ foreach my $cust_statement ($cust_main->cust_statement) {
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
@@ -480,6 +536,8 @@ foreach my $cust_pay ($cust_main->cust_pay) {
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,
};
@@ -490,6 +548,8 @@ foreach my $cust_pay_pending ($cust_main->cust_pay_pending) {
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,
};
@@ -500,6 +560,8 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
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,
};
@@ -509,6 +571,8 @@ foreach my $cust_credit_void ($cust_main->cust_credit_void) {
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
@@ -521,6 +585,8 @@ foreach my $cust_pay_batch (
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,
};
@@ -530,6 +596,8 @@ foreach my $cust_pay_batch (
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,
};
@@ -540,6 +608,8 @@ foreach my $cust_credit ($cust_main->cust_credit) {
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,
};
@@ -551,7 +621,12 @@ my $years = $conf->config('payment_history-years') || 2;
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) {
@@ -578,7 +653,11 @@ if ( @history and $history[-1]->{'hide'} ) {
# 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 {
@@ -616,13 +695,18 @@ sub translate_payinfo {
my $payby = $object->payby;
my $payinfo = $object->payinfo;
- my $conf = new FS::Conf;
-
if ( $payby eq 'CARD' ) {
$payinfo = $object->paymask;
} elsif ( $payby eq 'CHEK' ) {
+ #false laziness w/payinfo_Mixin::payby_payinfo_pretty, should use that
my( $account, $aba ) = split('@', $object->paymask );
- $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
+ if ( $aba =~ /^(\d{5})\.(\d{3})$/ ) { #blame canada
+ my($branch, $routing) = ($1, $2);
+ $payinfo = emt("Routing [_1], Branch [_2], Acct [_3]",
+ $routing, $branch, $account);
+ } else {
+ $payinfo = emt("Routing [_1], Acct [_2]", $aba, $account);
+ }
}
($payby,$payinfo);
@@ -630,7 +714,7 @@ sub translate_payinfo {
sub areyousure_link {
my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
- ' ('.$label.')';
+ ' ('.$label.')';
}
%init>