X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=8745cac8740905c263bf4abb02330103d4c0bd15;hb=1df8ca6e580bffa11c412b8ae59cd98028ed6470;hp=24988eae4356b3e6d25a2a8a2842f227df9a16a6;hpb=17b8fb9cf3cc04d58c984b643943ea34fa0ec177;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 24988eae4..8745cac87 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -13,6 +13,7 @@
'cust_main' => $cust_main,
'actionlabel' => emt('Enter check payment'),
'width' => 392,
+ 'height' => 392,
&>
% }
@@ -24,6 +25,7 @@
'cust_main' => $cust_main,
'actionlabel' => emt('Enter cash payment'),
'width' => 392,
+ 'height' => 392,
&>
% }
@@ -32,7 +34,7 @@
<% mt('Enter Western Union payment') |h %>
% }
-
+<% $s ? '
' : '' %>
% $s=0;
% if ( ( $payby{'CARD'} || $payby{'DCRD'} )
@@ -56,11 +58,13 @@
<% mt('Post manual (offline/POS) credit card payment') |h %>
% }
-
+<% $s ? '
' : '' %>
-%# credit link
+%# 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",
@@ -68,8 +72,20 @@
'actionlabel' => emt('Enter credit'),
'width' => 616, #make room for reasons #540 default
&>
-
+% }
+% 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 ? '
' : '' %>
%# refund links
@@ -123,8 +139,14 @@
-%# invoice reports
+%# invoice reports, combined statement
% if ( $curuser->access_right('List invoices') ) {
+% if ( $conf->exists('cust_main-print_statement_link')
+% and $num_cust_bill > 0 ) {
+ <%
+ mt('Print a current statement') |h %>
+
+% }
<% mt('Invoice reports') |h %>
% }
@@ -267,7 +289,11 @@
%
% my $charge = exists($item->{'charge'})
% ? sprintf("$money_char\%.2f", $item->{'charge'})
-% : '';
+% : exists($item->{'charge_nobal'})
+% ? sprintf("$money_char\%.2f", $item->{'charge_nobal'})
+% : exists($item->{'void_charge'})
+% ? sprintf("$money_char\%.2f", $item->{'void_charge'})
+% : '';
%
% my $payment = exists($item->{'payment'})
% ? sprintf("- $money_char\%.2f", $item->{'payment'})
@@ -396,13 +422,35 @@ my %opt = (
)
);
+$opt{'date_format'} ||= '%m/%d/%Y';
+
+#legacy invoices
+foreach my $legacy_cust_bill ($cust_main->legacy_cust_bill) {
+ push @history, {
+ 'date' => $legacy_cust_bill->_date,
+ 'desc' => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ),
+ 'charge_nobal' => $legacy_cust_bill->charged,
+ };
+}
+
#invoices
+my $num_cust_bill = 0;
foreach my $cust_bill ($cust_main->cust_bill) {
push @history, {
'date' => $cust_bill->_date,
'desc' => include('payment_history/invoice.html', $cust_bill, %opt ),
'charge' => $cust_bill->charged,
};
+ $num_cust_bill++;
+}
+
+#voided invoices
+foreach my $cust_bill_void ($cust_main->cust_bill_void) {
+ push @history, {
+ 'date' => $cust_bill_void->_date,
+ 'desc' => include('payment_history/voided_invoice.html', $cust_bill_void, %opt ),
+ 'void_charge' => $cust_bill_void->charged,
+ };
}
#statements
@@ -468,7 +516,7 @@ foreach my $cust_credit ($cust_main->cust_credit) {
foreach my $cust_refund ($cust_main->cust_refund) {
push @history, {
'date' => $cust_refund->_date,
- 'desc' => include('payment_history/refund.html', $cust_refund),
+ 'desc' => include('payment_history/refund.html', $cust_refund, %opt),
'refund' => $cust_refund->refund,
};
@@ -477,14 +525,15 @@ foreach my $cust_refund ($cust_main->cust_refund) {
sub translate_payby {
my ($payby,$payinfo) = (shift,shift);
my %payby = (
+ FS::payby->payby2shortname,
BILL => $payinfo ? emt('Check #') : '',
CHEK => emt('Electronic check '),
PREP => emt('Prepaid card '),
CARD => emt('Credit card #'),
COMP => emt('Complimentary by '),
- CASH => emt('Cash'),
- WEST => emt('Western Union'),
- MCRD => emt('Manual credit card'),
+ #CASH => emt('Cash'),
+ #WEST => emt('Western Union'),
+ #MCRD => emt('Manual credit card'),
);
$payby = (exists $payby{$payby}) ? $payby{$payby} : $payby;
$payby;
@@ -493,6 +542,7 @@ sub translate_payby {
sub translate_payby_refund {
my ($payby,$payinfo) = (shift,shift);
my %payby = (
+ FS::payby->payby2shortname,
BILL => $payinfo ? emt('Check #') : emt('Check'),
CHEK => emt('Electronic check '),
CARD => emt('Credit card #'),
@@ -513,11 +563,7 @@ sub translate_payinfo {
$payinfo = $object->paymask;
} elsif ( $payby eq 'CHEK' ) {
my( $account, $aba ) = split('@', $object->paymask );
- if ( $conf->exists('echeck-no_routing') ) {
- $payinfo = emt("Acct #[_1]", $account);
- } else {
- $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
- }
+ $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
}
($payby,$payinfo);
|