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

more fixes and log cleanup

Browse Source
This commit is contained in:
Sebastian Grewe 2013-07-23 10:53:47 +02:00
parent ed259a5b44
commit 330169ae58
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,9 @@ class Transaction {
case 'status':
switch ($value) {
case 'Confirmed':
if ($filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != $filter['Donation_PPS']) $aFilter[] = "b.confirmations >= " . $this->config['confirmations'];
if (empty($filter['type']) || ($filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != 'Donation_PPS')) {
$aFilter[] = "b.confirmations >= " . $this->config['confirmations'];
}
break;
case 'Unconfirmed':
$aFilter[] = "b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0";

9
public/include/pages/admin/transactions.inc.php
View File

@ -25,5 +25,14 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
$debug->append('Using cached page', 3);
}
// Gernerate the GET URL for filters
if (isset($_REQUEST['filter'])) {
$strFilters = '';
foreach (@$_REQUEST['filter'] as $filter => $value) {
$filter = "filter[$filter]";
$strFilters .= "&$filter=$value";
}
$smarty->assign('FILTERS', $strFilters);
}
$smarty->assign('CONTENT', 'default.tpl');
?>

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

@ -4,8 +4,8 @@
<tr>
<td class="left">
{if $COUNTTRANSACTIONS / $LIMIT > 1}
{if $smarty.request.start > 0}
<a href="{$smarty.server.PHP_SELF}?page=admin&action=transactions&start={$smarty.request.start|default:"0" - $LIMIT}"><img src="{$PATH}/images/prev.png" /></a>
{if $smarty.request.start|default:"0" > 0}
<a href="{$smarty.server.PHP_SELF}?page={$smarty.request.page}&action={$smarty.request.action}&start={$smarty.request.start|default:"0" - $LIMIT}{if $FILTERS}{$FILTERS}{/if}"><img src="{$PATH}/images/prev.png" /></a>
{else}
<img src="{$PATH}/images/prev.png" />
{/if}
@ -13,8 +13,8 @@
</td>
<td class="right">
{if $COUNTTRANSACTIONS / $LIMIT > 1}
{if $COUNTTRANSACTIONS - $smarty.request.start - $LIMIT > 0}
<a href="{$smarty.server.PHP_SELF}?page=admin&action=transactions&start={$smarty.request.start|default:"0" + $LIMIT}"><img src="{$PATH}/images/next.png" /></a>
{if $COUNTTRANSACTIONS - $smarty.request.start|default:"0" - $LIMIT > 0}
<a href="{$smarty.server.PHP_SELF}?page={$smarty.request.page}&action={$smarty.request.action}&start={$smarty.request.start|default:"0" + $LIMIT}{if $FILTERS}{$FILTERS}{/if}"><img src="{$PATH}/images/next.png" /></a>
{else}
<img src="{$PATH}/images/next.png" />
{/if}
@ -25,20 +25,20 @@
<input type="hidden" name="page" value="{$smarty.request.page}" />
<input type="hidden" name="action" value="{$smarty.request.action}" />
<tr>
<td class="left">Type</td>
<td class="right">{html_options name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type}</td>
<td class="left">TX Type</td>
<td class="right">{html_options name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type|default:""}</td>
</tr>
<tr>
<td class="left">Status</td>
<td class="right">{html_options name="filter[status]" options=$TXSTATUS selected=$smarty.request.filter.status}</td>
<td class="left">TX Status</td>
<td class="right">{html_options name="filter[status]" options=$TXSTATUS selected=$smarty.request.filter.status|default:""}</td>
</tr>
<tr>
<td class="left">Account</td>
<td class="right"><input size="10" type="text" name="filter[account]" value="{$smarty.request.filter.account}" /></td>
<td class="right"><input size="20" type="text" name="filter[account]" value="{$smarty.request.filter.account|default:""}" /></td>
</tr>
<tr>
<td class="left">Address</td>
<td class="right"><input size="10" type="text" name="filter[address]" value="{$smarty.request.filter.address}" /></td>
<td class="right"><input size="20" type="text" name="filter[address]" value="{$smarty.request.filter.address|default:""}" /></td>
</tr>
<tr>
<td class="center" colspan="2"><input type="submit" class="submit small" value="Filter"></td>
@ -77,7 +77,7 @@
$TRANSACTIONS[transaction].type == 'Donation_PPS' OR
$TRANSACTIONS[transaction].type == 'Debit_MP' OR
$TRANSACTIONS[transaction].type == 'Debit_AP' OR
$TRANSACTIONS[transaction].confirmations > $GLOBAL.confirmations
$TRANSACTIONS[transaction].confirmations >= $GLOBAL.confirmations
}<font color="green">Confirmed</font>
{else if $TRANSACTIONS[transaction].confirmations == -1}<font color="red">Orphaned</font>
{else}<font color="orange">Unconfirmed</font>{/if}