diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php index 15f29c77..020140d3 100644 --- a/public/include/classes/transaction.class.php +++ b/public/include/classes/transaction.class.php @@ -130,6 +130,7 @@ class Transaction { /** * Get total balance for all users locked in wallet + * This includes any outstanding unconfirmed transactions! * @param none * @return data double Amount locked for users **/ @@ -141,9 +142,7 @@ class Transaction { ( SELECT sum(t.amount) AS credit FROM $this->table AS t - LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id WHERE t.type = 'Credit' - AND b.confirmations >= ? ) AS t1, ( SELECT sum(t.amount) AS debit @@ -152,12 +151,10 @@ class Transaction { ) AS t2, ( SELECT sum(t.amount) AS other - FROM transactions AS t - LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id + FROM " . $this->table . " AS t WHERE t.type IN ('Donation','Fee') - AND b.confirmations >= ? ) AS t3"); - if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $this->config['confirmations'], $this->config['confirmations']) && $stmt->execute() && $stmt->bind_result($dBalance) && $stmt->fetch()) + if ($this->checkStmt($stmt) && $stmt->execute() && $stmt->bind_result($dBalance) && $stmt->fetch()) return $dBalance; // Catchall $this->setErrorMessage('Unable to find locked credits for all users'); diff --git a/public/include/pages/admin/wallet.inc.php b/public/include/pages/admin/wallet.inc.php new file mode 100644 index 00000000..cb094fe9 --- /dev/null +++ b/public/include/pages/admin/wallet.inc.php @@ -0,0 +1,25 @@ +isAdmin($_SESSION['USERDATA']['id'])) { + header("HTTP/1.1 404 Page not found"); + die(); +} + +if ($bitcoin->can_connect() === true){ + $dBalance = $bitcoin->query('getbalance'); +} else { + $dBalance = 0; + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to litecoind RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); +} + +$smarty->assign("BALANCE", $dBalance); +$smarty->assign("LOCKED", $transaction->getLockedBalance()); + +// Tempalte specifics +$smarty->assign("CONTENT", "default.tpl"); +?> diff --git a/public/templates/mmcFE/admin/wallet/default.tpl b/public/templates/mmcFE/admin/wallet/default.tpl new file mode 100644 index 00000000..42b8c8b3 --- /dev/null +++ b/public/templates/mmcFE/admin/wallet/default.tpl @@ -0,0 +1,16 @@ +{include file="global/block_header.tpl" BLOCK_HEADER="Wallet Information"} +
| Wallet Balance | +{$BALANCE|number_format:"8"} | +
|---|---|
| Locked for users | +{$LOCKED|number_format:"8"} | +
| Liquid Assets | +{($BALANCE - $LOCKED)|number_format:"8"} | +