From 432adaa47f600d8777e2860bc829815d588858d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 22 Nov 2020 21:13:11 +0100
Subject: [PATCH 1/2] Update don.class.php

---
 htdocs/don/class/don.class.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index e163f146678..042b22b3a1c 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -735,8 +735,7 @@ class Don extends CommonObject
 		{
 			if ($this->db->affected_rows($resql))
 			{
-				if (!$notrigger)
-				{
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('DON_VALIDATE', $user);
 					if ($result < 0) { $error++; }
@@ -748,8 +747,8 @@ class Don extends CommonObject
 			$this->error = $this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
+			$this->statut = 1;
 			$this->db->commit();
 			return 1;
 		} else {
@@ -777,10 +776,9 @@ class Don extends CommonObject
 		$sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
+				$this->statut = 2;
 				return 1;
 			} else {
 				return 0;
@@ -804,10 +802,9 @@ class Don extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
+				$this->statut = -1;
 				return 1;
 			} else {
 				return 0;
@@ -828,8 +825,7 @@ class Don extends CommonObject
 	public function reopen($user, $notrigger = 0)
 	{
 		// Protection
-		if ($this->statut != self::STATUS_CANCELED)
-		{
+		if ($this->statut != self::STATUS_CANCELED) {
 			return 0;
 		}
 

From 02e36c769468f88e07bc331f1cfd040e53688781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Sun, 22 Nov 2020 21:16:02 +0100
Subject: [PATCH 2/2] Update card.php

---
 htdocs/don/card.php | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index b5c58001d09..ff18883d22a 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2019  Thibault FOUCART        <support@ptibogxiv.net>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -224,8 +224,7 @@ if ($action == 'add')
 		}
 	}
 }
-if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
-{
+if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
 	$object->fetch($id);
 	$result = $object->delete($user);
 	if ($result > 0) {
@@ -236,42 +235,31 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
-if ($action == 'valid_promesse')
-{
+if ($action == 'valid_promesse') {
 	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0)
-	{
+	if ($object->valid_promesse($id, $user->id) >= 0) {
 		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
-
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+		$action = '';
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
-if ($action == 'set_cancel')
-{
+if ($action == 'set_cancel') {
 	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+	if ($object->set_cancel($id) >= 0) {
+		$action = '';
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
-if ($action == 'set_paid')
-{
+if ($action == 'set_paid') {
 	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
+	if ($object->set_paid($id, $modepayment) >= 0) {
+		$action = '';
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-} elseif ($action == 'classin' && $user->rights->don->creer)
-{
+} elseif ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }