>
- |
+ |
% unless ( !$target || $target{$target}++ ) {
% }
- <% time2str("%D",$item->{'date'}) %>
+ <% time2str($date_format, $item->{'date'}) %>
% if ( $target && $target{$target} == 1 ) {
@@ -278,26 +296,26 @@
|
<% $item->{'desc'} %>
|
-
+ |
<% $charge %>
|
-
+ |
<% $payment %>
|
-
+ |
<% $credit %>
|
-
+ |
<% $refund %>
|
-
+ |
<% $showbalance %>
|
% }
%if ( scalar(@history) && $hidden && ! $seen++ ) {
-% balance_forward_row($balance, $lastdate);
+% balance_forward_row($balance, $lastdate, $money_char);
%}
@@ -325,6 +343,7 @@ my( $cust_main ) = @_;
my $custnum = $cust_main->custnum;
my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -344,13 +363,14 @@ my %status = (
#get payment history
my @history = ();
-my %opt =
+my %opt = (
( map { $_ => scalar($conf->config($_)) }
- qw( card_refund-days )
+ qw( card_refund-days date_format )
),
( map { $_ => $conf->exists($_) }
- qw( deletepayments deleterefunds )
- );
+ qw( deleteinvoices deletepayments deleterefunds pkg-balances )
+ )
+);
#invoices
foreach my $cust_bill ($cust_main->cust_bill) {
@@ -361,6 +381,15 @@ foreach my $cust_bill ($cust_main->cust_bill) {
};
}
+#statements
+foreach my $cust_statement ($cust_main->cust_statement) {
+ push @history, {
+ 'date' => $cust_statement->_date,
+ 'desc' => include('payment_history/statement.html', $cust_statement, %opt ),
+ #'charge' => $cust_bill->charged,
+ };
+}
+
#payments (some false laziness w/credits)
foreach my $cust_pay ($cust_main->cust_pay) {
push @history, {
@@ -371,21 +400,41 @@ foreach my $cust_pay ($cust_main->cust_pay) {
};
}
+#pending payments
+foreach my $cust_pay_pending ($cust_main->cust_pay_pending) {
+ push @history, {
+ 'date' => $cust_pay_pending->_date,
+ 'desc' => include('payment_history/pending_payment.html', $cust_pay_pending, %opt ),
+ 'void_payment' => $cust_pay_pending->paid,
+ };
+}
+
+
#voided payments
foreach my $cust_pay_void ($cust_main->cust_pay_void) {
push @history, {
'date' => $cust_pay_void->_date,
- 'desc' => include('payment_history/voided_payment.html', $cust_pay_void),
+ 'desc' => include('payment_history/voided_payment.html', $cust_pay_void, %opt ),
'void_payment' => $cust_pay_void->paid,
};
}
+#declined payments
+foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) {
+ push @history, {
+ 'date' => $cust_pay_pending->_date,
+ 'desc' => include('payment_history/attempted_payment.html', $cust_pay_pending, %opt ),
+ 'void_payment' => $cust_pay_pending->paid, #??
+ #'target' => $target, #XXX
+ };
+}
+
#credits (some false laziness w/payments)
foreach my $cust_credit ($cust_main->cust_credit) {
push @history, {
'date' => $cust_credit->_date,
- 'desc' => include('payment_history/credit.html', $cust_credit),
+ 'desc' => include('payment_history/credit.html', $cust_credit, %opt ),
'credit' => $cust_credit->amount,
};
@@ -401,4 +450,52 @@ foreach my $cust_refund ($cust_main->cust_refund) {
}
+sub translate_payby {
+ my ($payby,$payinfo) = (shift,shift);
+ my %payby = (
+ BILL => $payinfo ? mt('Check #') : '',
+ CHEK => mt('Electronic check '),
+ PREP => mt('Prepaid card '),
+ CARD => mt('Credit card #'),
+ COMP => mt('Complimentary by '),
+ CASH => mt('Cash'),
+ WEST => mt('Western Union'),
+ MCRD => mt('Manual credit card'),
+ );
+ $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby;
+ $payby;
+};
+
+sub translate_payby_refund {
+ my ($payby,$payinfo) = (shift,shift);
+ my %payby = (
+ BILL => $payinfo ? mt('Check #') : mt('Check'),
+ CHEK => mt('Electronic check '),
+ CARD => mt('Credit card #'),
+ COMP => mt('Complimentary by '),
+ );
+ $payby = (exists $payby{$payby}) ? $payby{$payby} : $payby;
+ $payby;
+};
+
+sub translate_payinfo {
+ my $object = shift;
+ my $payby = $object->payby;
+ my $payinfo = $object->payinfo;
+
+ if ( $payby eq 'CARD' ) {
+ $payinfo = $object->paymask;
+ } elsif ( $payby eq 'CHEK' ) {
+ my( $account, $aba ) = split('@', $object->paymask );
+ $payinfo = mt("ABA [_1], Acct #[_2]",$aba,$account);
+ }
+
+ ($payby,$payinfo);
+}
+
+sub areyousure_link {
+ my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
+ ' (