diff --git a/community_server/src/Controller/StateBalancesController.php b/community_server/src/Controller/StateBalancesController.php index f150be489..676fdf769 100644 --- a/community_server/src/Controller/StateBalancesController.php +++ b/community_server/src/Controller/StateBalancesController.php @@ -188,13 +188,28 @@ class StateBalancesController extends AppController return $result; } $user = $session->read('StateUser'); - $requestResult = $this->JsonRequestClient->sendRequestGDT(['email' => $user['email']], 'GdtEntries' . DS . 'listPerEmailApi'); + $requestResult = $this->JsonRequestClient->sendRequestGDT([ + 'email' => $user['email'], + 'page' => 1, + 'count' => 100, + 'orderDirection' => 'DESC' + ], 'GdtEntries' . DS . 'listPerEmailApi'); //var_dump($requestResult); - if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) { - + if('success' === $requestResult['state'] && 'success' === $requestResult['data']['state']) + { + $moreEntrysAsShown = false; + if(isset($requestResult['data']['count']) && $requestResult['data']['count'] > 100) { + $moreEntrysAsShown = true; + } else { + $moreEntrysAsShown = $requestResult['data']['moreEntrysAsShown']; + } //var_dump(array_keys($requestResult['data'])); - $ownEntries = $requestResult['data']['ownEntries']; + if(isset($requestResult['data']['gdtEntries'])) { + $ownEntries = $requestResult['data']['gdtEntries']; + } else { + $ownEntries = $requestResult['data']['ownEntries']; + } //$gdtEntries = $requestResult['data']['entries']; $gdtSum = 0; @@ -217,8 +232,7 @@ class StateBalancesController extends AppController //echo "gdtSum: $gdtSum
"; $this->set('gdtSum', $gdtSum); $this->set('ownEntries', $ownEntries); - $this->set('gdtSumPerEmail', $requestResult['data']['gdtSumPerEmail']); - $this->set('moreEntrysAsShown', $requestResult['data']['moreEntrysAsShown']); + $this->set('moreEntrysAsShown', $moreEntrysAsShown); $this->set('user', $user); if (isset($requestResult['data']['publishers'])) { diff --git a/community_server/src/Template/StateBalances/overview_gdt.ctp b/community_server/src/Template/StateBalances/overview_gdt.ctp index 85ecbfd50..eb67626b0 100644 --- a/community_server/src/Template/StateBalances/overview_gdt.ctp +++ b/community_server/src/Template/StateBalances/overview_gdt.ctp @@ -19,13 +19,9 @@ function publisherLink($publisher, $the) { $this->assign('title', __('GDT Kontoübersicht')); $header = '

' . __('Zur Verfügung: ') . '

'; -$gdtSumFromEmails = 0; -foreach($gdtSumPerEmail as $email => $gdt) { - $gdtSumFromEmails += $gdt; -} if($gdtSum > 0){ - $header .= '

'.$this->element('printGDT', ['number' => $gdtSumFromEmails]).'

'; + $header .= '

'.$this->element('printGDT', ['number' => $gdtSum]).'

'; } if($moreEntrysAsShown) { $header .= ''. __('Nur die letzten 100 Einträge werden angezeigt!') . '';