optimize customer view (esp. with lots of commission credits), RT#26416

[freeside.git] / httemplate / view / cust_main / payment_history.html

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index c7bf374..95e34a1 100644 (file)
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -270,6 +270,11 @@
 %                  ? sprintf("- $money_char\%.2f", $item->{'credit'})
 %                  : '';
 %
+%  $credit ||= sprintf( "<DEL>-&nbsp;$money_char\%.2f</DEL>",
+%                       $item->{'void_credit'}
+%                     )
+%    if exists($item->{'void_credit'});
+%
 %  my $refund  = exists($item->{'refund'})
 %                  ? sprintf("$money_char\%.2f", $item->{'refund'})
 %                  : '';
@@ -391,12 +396,34 @@ my %status = (
 my @history = ();
 
 my %opt = (
+
+  #config
   ( map { $_ => scalar($conf->config($_)) }
         qw( card_refund-days date_format )
   ),
   ( map { $_ => $conf->exists($_) } 
-        qw( deleteinvoices deletepayments deleterefunds pkg-balances )
-  )
+        qw( deleteinvoices deletepayments deleterefunds pkg-balances
+            cust_credit_bill_pkg-manual cust_bill_pay_pkg-manual
+          )
+  ),
+  'money_char             ' => $money_char,
+
+  #rights
+  ( map { $_ => $curuser->access_right($_) }
+      (
+        'View invoices', 'Void invoices', 'Unvoid invoices', 'Delete invoices',
+        'Apply payment', 'Refund credit card payment', 'Refund Echeck payment',
+        'Credit card void', 'Echeck void', 'Void payments', 'Unvoid payments',
+        'Delete payment', 'Unapply payment',
+        'Apply credit', 'Delete Credit', 'Unapply credit',
+        'Delete refund',
+        'Billing event reports', 'View customer billing events',
+      )
+  ),
+
+  #customer information
+  'total_owed'              => $cust_main->total_owed,
+  'total_unapplied_refunds' => $cust_main->total_unapplied_refunds,
 );
 
 $opt{'date_format'} ||= '%m/%d/%Y';
@@ -469,6 +496,15 @@ foreach my $cust_pay_void ($cust_main->cust_pay_void) {
 
 }
 
+#voided credits 
+foreach my $cust_credit_void ($cust_main->cust_credit_void) {
+  push @history, {
+    'date'        => $cust_credit_void->_date,
+    'desc'        => include('payment_history/voided_credit.html', $cust_credit_void, %opt ),
+    'void_credit' => $cust_credit_void->amount,
+  };
+}
+
 #declined payments
 foreach my $cust_pay_pending ($cust_main->cust_pay_pending_attempt) {
   push @history, {