RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

properly deal with Fee_PPS and Donation_PPS

Browse Source
This commit is contained in:
Sebastian Grewe 2013-07-23 09:21:11 +02:00
parent 61cea524d1
commit ed259a5b44
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/include/classes/transaction.class.php
View File

@ -111,7 +111,7 @@ class Transaction {
case 'status': case 'status':
switch ($value) { switch ($value) {
case 'Confirmed': 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; break;
case 'Unconfirmed': case 'Unconfirmed':
$aFilter[] = "b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0"; $aFilter[] = "b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0";

2
public/templates/mmcFE/admin/transactions/default.tpl
View File

@ -73,6 +73,8 @@
<td>{$TRANSACTIONS[transaction].type}</td> <td>{$TRANSACTIONS[transaction].type}</td>
<td> <td>
{if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR {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_MP' OR
$TRANSACTIONS[transaction].type == 'Debit_AP' OR $TRANSACTIONS[transaction].type == 'Debit_AP' OR
$TRANSACTIONS[transaction].confirmations > $GLOBAL.confirmations $TRANSACTIONS[transaction].confirmations > $GLOBAL.confirmations