Commit 42f5dfd1 authored by okhin's avatar okhin 🚴

Merge branch '87-dashboard-contreparties-non-fonctionne' into 'preprod'

Resolve "Dashboard contreparties non fonctionne"

Closes #87

See merge request !100
parents 7737df76 ec721c52
Pipeline #2380 passed with stages
in 1 minute and 36 seconds
...@@ -386,7 +386,6 @@ class Admin extends Controller ...@@ -386,7 +386,6 @@ class Admin extends Controller
$f3->set('counterparts_import', ''); $f3->set('counterparts_import', '');
$total = array("hoodie" => 0, "pishirt" => 0, "pibag" => 0, "piplome" => 0); $total = array("hoodie" => 0, "pishirt" => 0, "pibag" => 0, "piplome" => 0);
if ($f3->get('VERB') == 'POST') { if ($f3->get('VERB') == 'POST') {
$separator = ';'; $separator = ';';
// Si on a un POST sur cette page, c'est que l'on a un csv à parser // Si on a un POST sur cette page, c'est que l'on a un csv à parser
...@@ -553,6 +552,7 @@ class Admin extends Controller ...@@ -553,6 +552,7 @@ class Admin extends Controller
c.taille as taille, c.taille as taille,
c.status as status, c.status as status,
c.user_id as user_id, c.user_id as user_id,
c.parent as parent,
u.email as email, u.email as email,
u.pseudo as pseudo, u.pseudo as pseudo,
u.commentaire as commentaire, u.commentaire as commentaire,
...@@ -622,7 +622,7 @@ class Admin extends Controller ...@@ -622,7 +622,7 @@ class Admin extends Controller
if ($row['quoi']=='piplome') { if ($row['quoi']=='piplome') {
$pdf = $db->query("SELECT d.id AS id, $pdf = $db->query("SELECT d.id AS id,
a.nom AS pseudo, a.nom AS pseudo,
d.pdf AS pdf d.pdf AS pdf,
FROM dons d FROM dons d
JOIN adresses a ON a.id = d.adresse_id JOIN adresses a ON a.id = d.adresse_id
WHERE d.id='".$row['taille']."'"); WHERE d.id='".$row['taille']."'");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment