From 8f0346782abfa38f6cfa9110c221c63b4960e135 Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 20 Dec 2018 15:23:51 +0100 Subject: [PATCH 1/2] Updating the history --- app/controller/perso.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controller/perso.php b/app/controller/perso.php index ada08ea..ca2e079 100644 --- a/app/controller/perso.php +++ b/app/controller/perso.php @@ -67,8 +67,8 @@ class Perso extends Controller // Chargement des dons de l'utilisateur $db = $f3->get('DB'); $dons = $f3->get('container')['donation_finder']->findByUserId((int) $f3->get('SESSION.id')); - $dons = array_filter($dons, function ($id) { - return in_array((int) $id, [1, 4, 102]); + $dons = array_filter($dons, function ($don) { + return in_array((int) $don['status'], [1, 4]); }); $f3->set('dons', $dons); } @@ -77,12 +77,11 @@ class Perso extends Controller { // Chargement des abonnements de l'utilisateur $db = $f3->get('DB'); - $result = $db->query("SELECT datec, somme, status, id, pdf, identifier FROM dons WHERE user_id='".$f3->get('infos.id')."' AND status IN (101) ORDER BY datec ASC"); - $data = array(); - foreach ($result->fetchAll(\PDO::FETCH_ASSOC) as $row) { - $data[] = $row; - } - $f3->set('dons_recurrents', $data); + $dons = $f3->get('container')['donation_finder']->findByUserId((int) $f3->get('SESSION.id')); + $dons = array_filter($dons, function ($don) { + return in_array((int) $don['status'], [101, 102]); + }); + $f3->set('dons_recurrents', $dons); } public function login($f3, $args) -- GitLab From 55459c4728ab4f9cfd985a2cc8b8c0ba94d34d8b Mon Sep 17 00:00:00 2001 From: Okhin Date: Thu, 20 Dec 2018 15:40:22 +0100 Subject: [PATCH 2/2] Fond a copy pasta that incremented twice total and never cumul --- app/controller/admin.php | 4 ++-- app/controller/bank.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controller/admin.php b/app/controller/admin.php index 4761781..821a225 100644 --- a/app/controller/admin.php +++ b/app/controller/admin.php @@ -177,7 +177,7 @@ class Admin extends Controller $status = 1; } $total = $user_amount['total'] + $result['somme']; - $cumul = $user_amount['total'] + $result['somme']; + $cumul = $user_amount['cumul'] + $result['somme']; } if ($error != '') { $f3->push('SESSION.error', $error); @@ -225,7 +225,7 @@ class Admin extends Controller $status = 0; } $total = $user_amount['total'] - $result['somme']; - $cumul = $user_amount['total'] - $result['somme']; + $cumul = $user_amount['cumul'] - $result['somme']; if ($cumul < 0) { $error = "Impossible d'invalider, une contrepartie a été demandée"; } diff --git a/app/controller/bank.php b/app/controller/bank.php index 5cc0c0f..badff2a 100644 --- a/app/controller/bank.php +++ b/app/controller/bank.php @@ -159,7 +159,7 @@ class Bank extends Controller if ($status!=101) { $cb_log->write("Ajout de ".$don['somme']); $f3->get('container')['command_handler']->handle(new UserUpdateTotalCommand($user['id'], (int) $user['total'] + $don['somme'])); - $f3->get('container')['command_handler']->handle(new UserUpdateCumulCommand($user['id'], (int) $user['cumul'] + $don['cumul'])); + $f3->get('container')['command_handler']->handle(new UserUpdateCumulCommand($user['id'], (int) $user['cumul'] + $don['somme'])); } $result = $db->query("SELECT cumul FROM users WHERE id='".$don['user_id']."'"); $cumul = $result->fetch(\PDO::FETCH_ASSOC); -- GitLab