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

Merge pull request #207 from TheSerapher/issue-206

Browse Source 
Do not mark PPS transactions as unconfirmed
This commit is contained in:
Sebastian Grewe 2013-06-17 07:45:03 -07:00
commit a8a565ff7d
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,10 +203,7 @@ class Transaction {
FROM $this->table AS t FROM $this->table AS t
LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id
WHERE WHERE
( t.type IN ('Credit','Bonus') AND b.confirmations < ?
( t.type IN ('Credit','Bonus') AND b.confirmations < ? ) OR
( t.type = 'Credit_PPS' )
)
AND t.account_id = ? AND t.account_id = ?
) AS t4, ) AS t4,
( (
@ -215,8 +212,7 @@ class Transaction {
LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id
WHERE WHERE
( (
( t.type IN ('Donation','Fee') AND b.confirmations < ? ) OR t.type IN ('Donation','Fee') AND b.confirmations < ?
( t.type IN ('Donation_PPS', 'Fee_PPS', 'TXFee') )
) )
AND t.account_id = ? AND t.account_id = ?
) AS t5 ) AS t5