From 6b08d3d5ef2539c0a2deee90a64014df6b34f33c Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Thu, 11 Jun 2020 15:14:31 +0000 Subject: [PATCH] check other user in case of he was deleted from db and to prevent showing warning --- src/Controller/StateBalancesController.php | 11 +++++++++-- src/Template/StateBalances/overview.ctp | 14 -------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Controller/StateBalancesController.php b/src/Controller/StateBalancesController.php index a0bb1de0b..a4a23cbf2 100644 --- a/src/Controller/StateBalancesController.php +++ b/src/Controller/StateBalancesController.php @@ -144,10 +144,17 @@ class StateBalancesController extends AppController $otherUser = null; if ($sendCoins->state_user_id == $user['id']) { $type = 'send'; - $otherUser = $involvedUserIndices[$sendCoins->receiver_user_id]; + if(isset($involvedUserIndices[$sendCoins->receiver_user_id])) { + $otherUser = $involvedUserIndices[$sendCoins->receiver_user_id]; + } } else if ($sendCoins->receiver_user_id == $user['id']) { $type = 'receive'; - $otherUser = $involvedUserIndices[$sendCoins->state_user_id]; + if(isset($involvedUserIndices[$sendCoins->state_user_id])) { + $otherUser = $involvedUserIndices[$sendCoins->state_user_id]; + } + } + if(null == $otherUser) { + $otherUser = $this->StateBalances->StateUsers->newEntity(); } array_push($transactions, [ 'name' => $otherUser->first_name . ' ' . $otherUser->last_name, diff --git a/src/Template/StateBalances/overview.ctp b/src/Template/StateBalances/overview.ctp index ca8548ff4..cb5741050 100644 --- a/src/Template/StateBalances/overview.ctp +++ b/src/Template/StateBalances/overview.ctp @@ -20,20 +20,6 @@ $this->assign('header', $header); //var_dump($transactions); ?> -
-
-
-
-

-

element('printGradido', ['number' => $balance]) ?>

- 0) : ?> -

Html->link($this->element('printGDT', ['number' => $gdtSum]), ['action' => 'overview_gdt'], ['escape' => false]) ?> ()

- -
-
-
-
- 0) : ?>