diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index 136b75080..250dd2fdd 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -325,17 +325,6 @@ 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; @@ -389,7 +378,6 @@ 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 174092273..33530fb48 100644 --- a/community_server/src/Template/AppRequests/list_transactions.ctp +++ b/community_server/src/Template/AppRequests/list_transactions.ctp @@ -8,7 +8,6 @@ $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; diff --git a/docker-compose.override.yml b/docker-compose.override.yml index cbb041457..f47b458f9 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -52,6 +52,7 @@ services: - mariadb networks: - internal-net + - external-net volumes: - ./community_server/config/php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini - ./community_server/src:/var/www/cakephp/src diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 9be7e3278..cd5fe4e2c 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -133,7 +133,6 @@ export default { pagination.items, ) if (result.success) { - this.GdtBalance = Number(result.result.data.gdtSum) this.transactions = result.result.data.transactions this.balance = Number(result.result.data.decay) this.bookedBalance = Number(result.result.data.balance) @@ -149,6 +148,7 @@ export default { console.log(' communityAPI.transactionsgdt') console.log(result2.result) console.log(result2.result.data.gdtEntries) + this.GdtBalance = Number(result2.result.data.gdtSum) this.transactionsGdt = result2.result.data.gdtEntries this.transactionGdtCount = result2.result.data.count /*