X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=5586897fb4c4ab989d466cd5483fdb266482398e;hb=8be75d426dfc9125fa49dce625d40b7462b9be09;hp=2ac3f2633b10b6d543d2c07dbc6b90f4891450ef;hpb=3a02e398ce013116c6ee97fc18472a6f40e0798d;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 2ac3f2633..5586897fb 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -63,7 +63,7 @@
'action' => "${p}edit/cust_credit.cgi",
'cust_main' => $cust_main,
'actionlabel' => 'Enter credit',
- 'width' => 392,
+ 'width' => 616, #make room for reasons #540 default
#default# 'height' => 336,
)
%>
@@ -205,11 +205,11 @@
- <% time2str("%D",$date) %>
+ <% time2str($date_format, $date) %>
|
- Starting balance on <% time2str("%D",$date) %>
+ Starting balance on <% time2str($date_format, $date) %>
(show prior history)
|
@@ -226,7 +226,7 @@
%my %target = ();
%
%my $years = $conf->config('payment_history-years') || 2;
-%my $older_than = time - $years * 31556736; #60*60*24*365.24
+%my $older_than = time - $years * 31556926; #60*60*24*365.2422
%my $hidden = 0;
%my $seen = 0;
%my $old_history = 0;
@@ -291,13 +291,13 @@
>
-
+ |
% unless ( !$target || $target{$target}++ ) {
% }
- <% time2str("%D",$item->{'date'}) %>
+ <% time2str($date_format, $item->{'date'}) %>
% if ( $target && $target{$target} == 1 ) {
@@ -308,19 +308,19 @@
|
<% $item->{'desc'} %>
|
-
+ |
<% $charge %>
|
-
+ |
<% $payment %>
|
-
+ |
<% $credit %>
|
-
+ |
<% $refund %>
|
-
+ |
<% $showbalance %>
|
@@ -355,6 +355,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;
@@ -376,7 +377,7 @@ my @history = ();
my %opt = (
( map { $_ => scalar($conf->config($_)) }
- qw( card_refund-days )
+ qw( card_refund-days date_format )
),
( map { $_ => $conf->exists($_) }
qw( deleteinvoices deletepayments deleterefunds pkg-balances )
@@ -411,6 +412,16 @@ 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, {
@@ -421,6 +432,16 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
}
+#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, {