diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index c900aabf5..136b75080 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -274,8 +274,6 @@ class AppRequestsController extends AppController public function getBalance($session_id = 0) { $this->viewBuilder()->setLayout('ajax'); - $this->response = $this->response->withType('application/json'); - $login_result = $this->requestLogin($session_id, false); if($login_result !== true) { $this->set('body', $login_result); @@ -306,16 +304,12 @@ class AppRequestsController extends AppController } $body['decay_date'] = $now; - $this->addAdminError("AppRequests", "getBalance", $body, $user['id']); $this->set('body', $body); } public function listTransactions($page = 1, $count = 25, $orderDirection = 'ASC', $session_id = 0) { - $this->viewBuilder()->setLayout('ajax'); - $this->response = $this->response->withType('application/json'); - $startTime = microtime(true); $login_result = $this->requestLogin($session_id, false); @@ -331,6 +325,17 @@ class AppRequestsController extends AppController $transactionsTable = TableRegistry::getTableLocator()->get('Transactions'); $stateBalancesTable->updateBalances($user['id']); + + $gdtSum = 0; + + $gdtEntries = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'sumPerEmailApi'); + + if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { + $gdtSum = intval($gdtEntries['data']['sum']); + } else { + $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id'] ? $user['id'] : 0); + } + //echo "count: $count, page: $page
"; $limit = $count; $offset = 0; @@ -384,6 +389,7 @@ class AppRequestsController extends AppController 'transactions' => $transactions, 'transactionExecutingCount' => $session->read('Transactions.executing'), 'count' => $stateUserTransactionsQuery->count(), + 'gdtSum' => $gdtSum, 'timeUsed' => microtime(true) - $startTime ]; $now = new FrozenTime(); diff --git a/community_server/src/Template/AppRequests/list_transactions.ctp b/community_server/src/Template/AppRequests/list_transactions.ctp index 33530fb48..174092273 100644 --- a/community_server/src/Template/AppRequests/list_transactions.ctp +++ b/community_server/src/Template/AppRequests/list_transactions.ctp @@ -8,6 +8,7 @@ $body['balance'] = $this->element('centToFloat', ['cent' => $body['balance'], 'precision' => 4]); $body['decay'] = $this->element('centToFloat', ['cent' => $body['decay'], 'precision' => 4]); +$body['gdtSum'] = $this->element('centToFloat', ['cent' => $body['gdtSum'], 'precision' => 2]); foreach($body['transactions'] as $i => $transaction) { $useCeil = false;