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

Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap

Browse Source 
Purty News
This commit is contained in:
root 2014-03-01 13:12:03 -07:00
commit bb0b9dc8be
2 changed files with 73 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/include/pages/admin/reports.inc.php
View File

@ -28,24 +28,24 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
$iLimit = 1000; $iLimit = 1000;
} }
if (@$_REQUEST['next'] && !empty($_REQUEST['height'])) {
$iHeight = @$roundstats->getNextBlockForStats($_REQUEST['height'], $iLimit);
if (!$iHeight) {
$aBlock = $block->getLast();
$iHeight = $aBlock['height'];
}
} else if (@$_REQUEST['prev'] && !empty($_REQUEST['height'])) {
$iHeight = $_REQUEST['height'];
} else if (!empty($_REQUEST['height']) && is_numeric($_REQUEST['height'])) {
$iHeight = $_REQUEST['height'];
} else {
$aBlock = $block->getLast();
$iHeight = $aBlock['height'];
}
if (@$_REQUEST['search']) { if (@$_REQUEST['search']) {
$iHeight = $roundstats->searchForBlockHeight($_REQUEST['search']); $iHeight = $roundstats->searchForBlockHeight($_REQUEST['search']);
} }
if (@$_REQUEST['next'] && !empty($_REQUEST['height'])) {
$iHeight = @$roundstats->getNextBlock($_REQUEST['height']);
if (!$iHeight) {
$iBlock = $block->getLast();
$iHeight = $iBlock['height'];
}
} else if (@$_REQUEST['prev'] && !empty($_REQUEST['height'])) {
$iHeight = $roundstats->getPreviousBlock($_REQUEST['height']);
} else if (empty($_REQUEST['height'])) {
$iBlock = $block->getLast();
$iHeight = $iBlock['height'];
} else {
$iHeight = $_REQUEST['height'];
}
$_REQUEST['height'] = $iHeight;
if (@$_REQUEST['filter']) { if (@$_REQUEST['filter']) {
$filter = $_REQUEST['filter']; $filter = $_REQUEST['filter'];

22
public/templates/bootstrap/admin/reports/earnings_control.tpl
View File

@ -1,27 +1,23 @@
<form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form"> <form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape|escape}"> <input type="hidden" name="page" value="{$smarty.request.page|escape|escape}">
<input type="hidden" name="action" value="{$smarty.request.action|escape|escape}"> <input type="hidden" name="action" value="{$smarty.request.action|escape|escape}">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"> <div class="panel-heading">
<i class="fa fa-search fa-fw"></i> Earnings Information Earnings Information
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<td> <tr>
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > ($BLOCKLIMIT - 1)}{$REPORTDATA[$BLOCKLIMIT - 1].height}{/if}&prev=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"<i class="icon-left-open"></i></a> <td colspan="4">
</td> <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > ($BLOCKLIMIT - 1)}{$REPORTDATA[$BLOCKLIMIT - 1].height}{/if}&prev=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"<i class="fa fa-chevron-left fa-fw"></i></a>
<td> <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > 0}{$REPORTDATA[0].height}{/if}&next=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"><i class="fa fa-chevron-right fa-fw pull-right"></i></a>
<a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > 0}{$REPORTDATA[0].height}{/if}&next=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"><i class="icon-right-open"></i></a>
</td> </td>
</tr>
</thead> </thead>
</table>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody> <tbody>
<tr> <tr>
<td> <td>
@ -44,7 +40,7 @@
</td> </td>
<td> <td>
<div class="form-group"> <div class="form-group">
<label>SHOW EMPTY ROUNDS</label> <label>Show empty rounds</label>
<br> <br>
<input type="hidden" name="filter" value="0" /> <input type="hidden" name="filter" value="0" />
<input type="checkbox" data-size="small" name="filter" id="filter" value="1" {if $FILTER}checked{/if}/> <input type="checkbox" data-size="small" name="filter" id="filter" value="1" {if $FILTER}checked{/if}/>
@ -60,5 +56,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>