diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index a2cff0bde..0b447b60e 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -193,7 +193,10 @@ 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('user', $user); + if(isset($requestResult['data']['publishers'])) { $publishers = $requestResult['data']['publishers']; $this->set('publishers', $publishers); diff --git a/src/Template/StateBalances/overview_gdt.ctp b/src/Template/StateBalances/overview_gdt.ctp index ccf3e1069..485fbb030 100644 --- a/src/Template/StateBalances/overview_gdt.ctp +++ b/src/Template/StateBalances/overview_gdt.ctp @@ -24,6 +24,10 @@ function publisherLink($publisher, $the) { } $this->assign('title', __('GDT Kontoübersicht')); +$gdtSumFromEmails = 0; +foreach($gdtSumPerEmail as $email => $gdt) { + $gdtSumFromEmails += $gdt; +} ?>
@@ -31,7 +35,10 @@ $this->assign('title', __('GDT Kontoübersicht'));

0) : ?> -

element('printGDT', ['number' => $gdtSum]) ?>

+

element('printGDT', ['number' => $gdtSumFromEmails]) ?>

+ + +
@@ -48,20 +55,17 @@ $this->assign('title', __('GDT Kontoübersicht')); - - - - + + + + - - - + + + @@ -94,10 +101,11 @@ $this->assign('title', __('GDT Kontoübersicht')); - - - - + + + + + @@ -105,14 +113,16 @@ $this->assign('title', __('GDT Kontoübersicht')); $elopageTransaction = $entry['connect']['elopage_transaction']; $gdtEntry = $entry['connect']['gdt_entry']; ?> - @@ -127,6 +137,12 @@ $this->assign('title', __('GDT Kontoübersicht')); + @@ -136,4 +152,13 @@ $this->assign('title', __('GDT Kontoübersicht')); -Html->css(['gdt.css']) ?> \ No newline at end of file +Html->css(['gdt.css']) ?> +Html->script(['basic', 'popper.min', 'tippy-bundle.umd.min']) ?> + \ No newline at end of file
element('printEuro', ['number' => $entry['amount']]); ?> element('printEuro', ['number' => $entry['amount2']]) ?> @@ -73,6 +77,9 @@ $this->assign('title', __('GDT Kontoübersicht')); element('printGDT', ['number' => $entry['gdt']]) ?>
+
element('printGDT', ['number' => $gdtEntry['gdt']]) ?>