From 6dfe815e37f5aa5bc1f3c00f9ab8ccac290915e8 Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Thu, 12 Aug 2021 13:58:10 +0000
Subject: [PATCH] adapt to new gdt list transaction format

---
 .../Controller/StateBalancesController.php    | 20 +++++++++++++------
 .../Template/StateBalances/overview_gdt.ctp   |  6 +-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/community_server/src/Controller/StateBalancesController.php b/community_server/src/Controller/StateBalancesController.php
index f150be489..39256e04e 100644
--- a/community_server/src/Controller/StateBalancesController.php
+++ b/community_server/src/Controller/StateBalancesController.php
@@ -188,13 +188,22 @@ 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($requestResult['data']['count'] > 100) {
+                $moreEntrysAsShown = true;
+            }
           //var_dump(array_keys($requestResult['data']));
-            $ownEntries = $requestResult['data']['ownEntries'];
+            $ownEntries = $requestResult['data']['gdtEntries'];
           //$gdtEntries = $requestResult['data']['entries'];
 
             $gdtSum = 0;
@@ -217,8 +226,7 @@ class StateBalancesController extends AppController
           //echo "gdtSum: $gdtSum<br>";
             $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 = '<h3>' . __('Zur Verfügung: ') . '</h3>';
-$gdtSumFromEmails = 0;
-foreach($gdtSumPerEmail as $email => $gdt) {
-  $gdtSumFromEmails += $gdt;
-}
 
 if($gdtSum > 0){
-  $header .= '<h2>'.$this->element('printGDT', ['number' => $gdtSumFromEmails]).'</h2>';
+  $header .= '<h2>'.$this->element('printGDT', ['number' => $gdtSum]).'</h2>';
 }
 if($moreEntrysAsShown) {
   $header .= '<span>'. __('Nur die letzten 100 Einträge werden angezeigt!') . '</span>';