X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=5586897fb4c4ab989d466cd5483fdb266482398e;hb=8be75d426dfc9125fa49dce625d40b7462b9be09;hp=2ab5339db3aafe9fb7f0a3091d2d64b39f8e7955;hpb=0ff2f82369f36a4f7a68ea80679eb39628f29988;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 2ab5339db..5586897fb 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -1,5 +1,3 @@
-
Payment History
-
%# payment links
% my $s = 0;
@@ -65,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,
)
%>
@@ -129,24 +127,57 @@
%# tax exemption link
-% if ( $curuser->access_right('View customer tax exemptions') ) {
- View tax exemptions
+% 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 ) {
+ View tax exemptions
+ <% $add_adjustment ? '|' : '' %>
+% }
+
+% if ( $add_adjustment ) {
+ <% include('/elements/popup_link.html', {
+ 'action' => $p.'edit/cust_tax_adjustment.html?custnum='. $cust_main->custnum,
+ 'label' => 'Add tax adjustment',
+ 'actionlabel' => 'Add tax adjustment',
+ #'color' => '#333399',
+ #'width' => 763,
+ 'height' => 200,
+ })
+ %>
+ |
+ View tax adjustments
+% }
+
-% }
+% }
%# batched payment links
% if ( ( $conf->exists('batch-enable') || $conf->config('batch-enable_payby') )
% && $curuser->access_right('View customer batched payments')
-% ) {
- View batched payments:
+% )
+% {
+ View batched payments:
% foreach my $status (qw( Queued In-transit Complete All )) {
<% $status %>
<% $status ne 'All' ? '|' : '' %>
% }
-
+
% }
+%# pending payment links
+
+% if ( $curuser->access_right('View customer pending payments')
+% && scalar($cust_main->cust_pay_pending)
+% )
+% {
+ View pending payments
+% }
+
%# and now the table
<% include("/elements/table-grid.html") %>
@@ -174,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)
|
@@ -195,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;
@@ -260,13 +291,13 @@
>
-
+ |
% unless ( !$target || $target{$target}++ ) {
% }
- <% time2str("%D",$item->{'date'}) %>
+ <% time2str($date_format, $item->{'date'}) %>
% if ( $target && $target{$target} == 1 ) {
@@ -277,19 +308,19 @@
|
<% $item->{'desc'} %>
|
-
+ |
<% $charge %>
|
-
+ |
<% $payment %>
|
-
+ |
<% $credit %>
|
-
+ |
<% $refund %>
|
-
+ |
<% $showbalance %>
|
@@ -324,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;
@@ -343,13 +375,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) {
@@ -360,6 +393,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, {
@@ -370,21 +412,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,
};