diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index 4e3598c6c..20bdeed31 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -161,7 +161,7 @@ class AppController extends Controller
foreach($json['user'] as $key => $value) {
$session->write('StateUser.' . $key, $value );
}
-
+ //var_dump($json);
$transactionPendings = $json['Transaction.pending'];
//echo "read transaction pending: $transactionPendings
";
$session->write('Transactions.pending', $transactionPendings);
diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php
index 90944a268..0f81cf4c5 100644
--- a/src/Controller/StateBalancesController.php
+++ b/src/Controller/StateBalancesController.php
@@ -40,16 +40,11 @@ class StateBalancesController extends AppController
$startTime = microtime(true);
$this->viewBuilder()->setLayout('frontend_ripple');
$session = $this->getRequest()->getSession();
- $user = $session->read('StateUser');
-// var_dump($user);
- if(!$user) {
- //return $this->redirect(Router::url('/', true) . 'account/', 303);
- $result = $this->requestLogin();
- if($result !== true) {
- return $result;
- }
- $user = $session->read('StateUser');
+ $result = $this->requestLogin();
+ if($result !== true) {
+ return $result;
}
+ $user = $session->read('StateUser');
$creationsTable = TableRegistry::getTableLocator()->get('TransactionCreations');
$creationTransactions = $creationsTable
@@ -135,10 +130,19 @@ class StateBalancesController extends AppController
'memo' => $sendCoins->transaction->memo
]);
}
+ uasort($transactions, array($this, 'sortTransactions'));
$this->set('transactions', $transactions);
$this->set('balance', $session->read('StateUser.balance'));
$this->set('timeUsed', microtime(true) - $startTime);
}
+
+ public function sortTransactions($a, $b) {
+ if ($a['date'] == $b['date']) {
+ return 0;
+ }
+ return ($a['date'] > $b['date']) ? -1 : 1;
+
+ }
/**
* View method
diff --git a/src/Template/Element/navi.ctp b/src/Template/Element/navi.ctp
index 8bc8eb7e5..cb8caad69 100644
--- a/src/Template/Element/navi.ctp
+++ b/src/Template/Element/navi.ctp
@@ -1,5 +1,6 @@
getRequest()->getSession();
@@ -20,7 +21,11 @@ $navi = [];
->setIconColor('grd-alert-color');
array_push($navi, $errorNaviEntry);
}*/
-$balanceNaviEntry = new NaviEntry($this->element('printGradido', ['number' => $balance]), 'mdi-wallet-outline', 'StateBalances', 'overview');
+$balanceNaviEntry = new NaviEntry(
+ __('Kontoübersicht') . ' (' . $this->element('printGradido', ['number' => $balance]) . ')',
+ //__('Kontoübersicht'),
+ 'mdi-wallet-outline', 'StateBalances', 'overview'
+);
if($balance < 0 ) {
//$balanceNaviEntry->setIconColor('grd-alert-color');
} else if($balance > 0) {
diff --git a/src/Template/Layout/frontend_ripple.ctp b/src/Template/Layout/frontend_ripple.ctp
index 8677debbb..52d0eb43a 100644
--- a/src/Template/Layout/frontend_ripple.ctp
+++ b/src/Template/Layout/frontend_ripple.ctp
@@ -42,7 +42,7 @@ $GLOBALS["self"] = $this;
-
Alpha 0.9.0
+
Alpha 0.10.0