From 24a277312c1faf14adf1dfd60d9c14f6475507a0 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Tue, 23 Jul 2013 12:01:45 +0200
Subject: [PATCH] fixing TXFee display and filter

---
 public/include/classes/transaction.class.php          | 2 +-
 public/templates/mmcFE/admin/transactions/default.tpl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php
index 7758f4cf..42f811f0 100644
--- a/public/include/classes/transaction.class.php
+++ b/public/include/classes/transaction.class.php
@@ -111,7 +111,7 @@ class Transaction {
           case 'status':
             switch ($value) {
             case 'Confirmed':
-              if (empty($filter['type']) || ($filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != 'Donation_PPS')) {
+              if (empty($filter['type']) || ($filter['type'] != 'TXFee' && $filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != 'Donation_PPS')) {
                 $aFilter[] = "b.confirmations >= " . $this->config['confirmations'];
               }
                 break;
diff --git a/public/templates/mmcFE/admin/transactions/default.tpl b/public/templates/mmcFE/admin/transactions/default.tpl
index 4a2b18e8..8561d114 100644
--- a/public/templates/mmcFE/admin/transactions/default.tpl
+++ b/public/templates/mmcFE/admin/transactions/default.tpl
@@ -77,6 +77,7 @@
                 $TRANSACTIONS[transaction].type == 'Donation_PPS' OR
                 $TRANSACTIONS[transaction].type == 'Debit_MP' OR
                 $TRANSACTIONS[transaction].type == 'Debit_AP' OR
+                $TRANSACTIONS[transaction].type == 'TXFee' OR
                 $TRANSACTIONS[transaction].confirmations >= $GLOBAL.confirmations
             }<font color="green">Confirmed</font>
             {else if $TRANSACTIONS[transaction].confirmations == -1}<font color="red">Orphaned</font>