diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php index 987a8970..2d4431a9 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 ($filter['type'] != 'Credit_PPS') $aFilter[] = "b.confirmations >= " . $this->config['confirmations']; + if ($filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != $filter['Donation_PPS']) $aFilter[] = "b.confirmations >= " . $this->config['confirmations']; break; case 'Unconfirmed': $aFilter[] = "b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0"; diff --git a/public/templates/mmcFE/admin/transactions/default.tpl b/public/templates/mmcFE/admin/transactions/default.tpl index ee0b2aac..7141b5b1 100644 --- a/public/templates/mmcFE/admin/transactions/default.tpl +++ b/public/templates/mmcFE/admin/transactions/default.tpl @@ -73,6 +73,8 @@ {$TRANSACTIONS[transaction].type} {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR + $TRANSACTIONS[transaction].type == 'Fee_PPS' OR + $TRANSACTIONS[transaction].type == 'Donation_PPS' OR $TRANSACTIONS[transaction].type == 'Debit_MP' OR $TRANSACTIONS[transaction].type == 'Debit_AP' OR $TRANSACTIONS[transaction].confirmations > $GLOBAL.confirmations