From d04c6ce9e7c9a6562f7cd5d5cdb85770e22aa6b6 Mon Sep 17 00:00:00 2001 From: Vojtech Pithart Date: Thu, 30 Jan 2025 01:52:38 -0700 Subject: [PATCH] Fix na druzstvo ve funkci activateAccount --- app/model/AccountActivation.php | 34 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/app/model/AccountActivation.php b/app/model/AccountActivation.php index 7ef680fe..72f11fda 100644 --- a/app/model/AccountActivation.php +++ b/app/model/AccountActivation.php @@ -24,20 +24,14 @@ public function __construct(Parameters $parameters, PrichoziPlatba $platba, Uziv public function activateAccount($loggedUser, $id) { $uzivatel = $this->uzivatel->getUzivatel($id); if ($uzivatel) { - $stavUctu = $uzivatel->related('UzivatelskeKonto.Uzivatel_id')->sum('castka'); - - if ($uzivatel->money_aktivni == 0 - && $uzivatel->money_deaktivace == 0 - && ($stavUctu - $uzivatel->kauce_mobil) >= $this->parameters->getVyseClenskehoPrispevku()) { - $this->uzivatel->update($uzivatel->id, array('money_aktivni' => 1)); - - $this->uzivatelskeKonto->insert(array('Uzivatel_id' => $uzivatel->id, - 'TypPohybuNaUctu_id' => 8, - 'castka' => -($this->parameters->getVyseClenskehoPrispevku()), - 'datum' => new Nette\Utils\DateTime(), - 'poznamka' => 'Aktivace od ['.$loggedUser->getIdentity()->getId().']', - 'zmenu_provedl' => $loggedUser->getIdentity()->getId())); - } + $this->uzivatel->update($uzivatel->id, array('money_aktivni' => 1)); + $this->uzivatelskeKonto->insert(array('Uzivatel_id' => $uzivatel->id, + 'TypPohybuNaUctu_id' => 8, + 'druzstvo' => 1, + 'castka' => -($this->parameters->getVyseClenskehoPrispevku()), + 'datum' => new Nette\Utils\DateTime(), + 'poznamka' => 'Aktivace od ['.$loggedUser->getIdentity()->getId().']', + 'zmenu_provedl' => $loggedUser->getIdentity()->getId())); return true; } return false; @@ -46,15 +40,12 @@ public function activateAccount($loggedUser, $id) { public function reactivateAccount($loggedUser, $id) { $uzivatel = $this->uzivatel->getUzivatel($id); if ($uzivatel) { - $stavUctu = $uzivatel->related('UzivatelskeKonto.Uzivatel_id')->sum('castka'); - - if ($uzivatel->money_aktivni == 0 - && $uzivatel->money_deaktivace == 1 - && ($stavUctu - $uzivatel->kauce_mobil) >= $this->parameters->getVyseClenskehoPrispevku()) { + if ($uzivatel->money_aktivni == 0 && $uzivatel->money_deaktivace == 1) { $this->uzivatel->update($uzivatel->id, array('money_aktivni' => 1,'money_deaktivace' => 0)); $this->uzivatelskeKonto->insert(array('Uzivatel_id' => $uzivatel->id, 'TypPohybuNaUctu_id' => 8, + 'druzstvo' => 1, 'castka' => -($this->parameters->getVyseClenskehoPrispevku()), 'datum' => new Nette\Utils\DateTime(), 'poznamka' => 'Reaktivace od ['.$loggedUser->getIdentity()->getId().']', @@ -62,12 +53,12 @@ public function reactivateAccount($loggedUser, $id) { return 'Účet byl reaktivován.'; } - if ($uzivatel->money_aktivni == 1 - && $uzivatel->money_deaktivace == 1) { + if ($uzivatel->money_aktivni == 1 && $uzivatel->money_deaktivace == 1) { $this->uzivatel->update($uzivatel->id, array('money_deaktivace' => 0)); $this->uzivatelskeKonto->insert(array('Uzivatel_id' => $uzivatel->id, 'TypPohybuNaUctu_id' => 9, + 'druzstvo' => 1, 'datum' => new Nette\Utils\DateTime(), 'poznamka' => 'Zruseni Deaktivace od ['.$loggedUser->getIdentity()->getId().']', 'zmenu_provedl' => $loggedUser->getIdentity()->getId())); @@ -85,6 +76,7 @@ public function deactivateAccount($loggedUser, $id) { $this->uzivatelskeKonto->insert(array('Uzivatel_id' => $uzivatel->id, 'TypPohybuNaUctu_id' => 6, + 'druzstvo' => 1, 'datum' => new Nette\Utils\DateTime(), 'poznamka' => 'Deaktivace od ['.$loggedUser->getIdentity()->getId().']', 'zmenu_provedl' => $loggedUser->getIdentity()->getId()));