diff --git a/app/controller/admin.php b/app/controller/admin.php
index d27feec8d592854b56a01a4c2ec6a90c493d0200..81c00a44e4454cbb36c40f2358a1b5dfebed637c 100644
--- a/app/controller/admin.php
+++ b/app/controller/admin.php
@@ -100,6 +100,12 @@ class Admin extends Controller
$f3->clear('SESSION.error');
}
+ public function logout($f3, $args)
+ {
+ $f3->clear('SESSION');
+ $f3->reroute('/');
+ }
+
public static function hash_password($password)
{
@@ -246,6 +252,13 @@ class Admin extends Controller
$f3->reroute("/admin/users/".$result['user_id']);
}
+ public function regenerate_pdf($f3, $args)
+ {
+ $f3->get('container')['command_handler']->handle(new DonationResetPdfCommand($f3->get('POST.id')));
+ $f3->push('SESSION.message', 'Régénération effectuée avec succès.');
+ $f3->reroute("/admin/");
+ }
+
public function support($f3, $args)
{
$id = '';
@@ -425,16 +438,16 @@ class Admin extends Controller
switch ($quoi) {
case 'hoodie':
- $needed = 250;
+ $needed = 314;
break;
case 'pishirt':
- $needed = 100;
+ $needed = 128;
break;
case 'pibag':
- $needed = 50;
+ $needed = 64;
break;
case 'piplome':
- $needed = 30;
+ $needed = 42;
break;
}
if ($user['cumul'] >= $needed) {
diff --git a/app/controller/bank.php b/app/controller/bank.php
index badff2adfb1001cf447d0cb9c5b94e18d1a9cf3a..6025e46a779de5ae8ac9ad018c7b049e4e3d77f3 100644
--- a/app/controller/bank.php
+++ b/app/controller/bank.php
@@ -161,7 +161,7 @@ class Bank extends Controller
$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['somme']));
}
- $result = $db->query("SELECT cumul FROM users WHERE id='".$don['user_id']."'");
+ $result = $db->query("SELECT cumul FROM users WHERE id='".$user['id']."'");
$cumul = $result->fetch(\PDO::FETCH_ASSOC);
$cumul = $cumul['cumul'];
$cb_log->write("Nouveau cumul: ".$cumul);
@@ -202,12 +202,7 @@ Toute l'équipe de La Quadrature du Net
")."\n\n";
// Création de l'url d'administration
- $admin_url = "https://don.laquadrature.net/perso";
- foreach ($f3->get('languages') as $key => $language) {
- if ($lang==$language[1]) {
- $admin_url = "https://".$language[0].$f3->get('dev').".laquadrature.net/perso";
- }
- }
+ $admin_url = "https://".$f3->get('dev').".laquadrature.net/perso";
// Remplacement des variables par leurs valeurs
$fields = array(
diff --git a/app/controller/campaign.php b/app/controller/campaign.php
index 8e924e3dc2013cd8997918f294672b218fbced3d..45e19ce9fabb3d9baba68110e86e2276230d0db7 100644
--- a/app/controller/campaign.php
+++ b/app/controller/campaign.php
@@ -130,7 +130,10 @@ class Campaign extends Controller
$f3->error("403");
}
- $user_id = $db->lastInsertId();
+ $user = $f3->get('container')['user_finder']->findByEmail(\Utils::asl($email));
+ $user_id = $user['id'];
+ $user_log = new \Log('user.log');
+ $user_log->write("ID ". $user_id. "\n");
}
}
$sql = "INSERT INTO dons SET
diff --git a/app/controller/perso.php b/app/controller/perso.php
index 7e7f4426d0ff03f02acfd9275fb4881c9b61afe0..f5d3410becc28c87c6edc95a0134aefb1ddb1ff5 100644
--- a/app/controller/perso.php
+++ b/app/controller/perso.php
@@ -324,16 +324,16 @@ class Perso extends Controller
$taille_h = intval($f3->get('taille_h'));
switch ($quoi) {
case 'piplome':
- $valeur = 30;
+ $valeur = 42;
break;
case 'pibag':
- $valeur = 50;
+ $valeur = 64;
break;
case 'pishirt':
- $valeur = 100;
+ $valeur = 128;
break;
case 'hoodie':
- $valeur = 250;
+ $valeur = 314;
break;
}
diff --git a/app/routes.ini b/app/routes.ini
index 02d84cc13fc3e9a4292b4a761daeafd099276c26..aad511791d3359fc6c6bc098db8ff9e0b75db2c2 100644
--- a/app/routes.ini
+++ b/app/routes.ini
@@ -24,11 +24,13 @@ GET /cron/piplome/@id=Controller\Cron->piplome
; Pages d'administration
GET|POST @admin:/admin=Controller\Admin->show
+GET|POST @admin_logout:/admin/logout=Controller\Admin->logout
GET @add_support:/admin/support/add=Controller\Admin->support
GET @edit_support:/admin/support/edit/@id=Controller\Admin->support
POST @modify_support:/admin/support/edit=Controller\Admin->support
GET @invalidate_support:/admin/support/invalidate/@id=Controller\Admin->invalidate
GET @validate_support:/admin/support/validate/@id=Controller\Admin->validate
+GET @regenerate_pdf:/admin/support/regenerate_pdf/@id=Controller\Admin->regenerate_pdf
GET @recompute_total:/admin/recompute/total=Controller\Admin->recompute_total
GET @recompute_cumul:/admin/recompute/cumul=Controller\Admin->recompute_cumul
diff --git a/app/view/backend/cbs.html b/app/view/backend/cbs.html
index c5e5645763582cbd6f65f78a328f0c74b1e8681e..5a8ec141522f2325560be17245051cdfc03915f8 100644
--- a/app/view/backend/cbs.html
+++ b/app/view/backend/cbs.html
@@ -37,7 +37,6 @@
</select>
<input type="button" value="Action" onclick="checkbox_command()" />
</form>
-<check if="{{ @row_count }}"><b>{{ @row_count }} résultats</b> => </check>{{ @query }}
<br />
<table cellspacing="0" cellpadding="0">
<theader>
diff --git a/app/view/backend/contreparties.html b/app/view/backend/contreparties.html
index b77647ddcbbce4991dc849e4facb3168e52f66f7..84ace0e9c2afdfd09359af28b4d01e2650fa2665 100644
--- a/app/view/backend/contreparties.html
+++ b/app/view/backend/contreparties.html
@@ -38,7 +38,6 @@
<input type="button" value="Export CSV" onclick="export_csv()" />
</form>
-<check if="{{ @row_count }}"><b>{{ @row_count }} résultats</b> => </check>{{ @query }}
<br />
<table cellspacing="0" cellpadding="0">
<theader>
diff --git a/app/view/backend/dons.html b/app/view/backend/dons.html
index 27f60c53f5a1b3e0c80d2d1979338d8096a25577..9d4dd9bce501868d923777498e083afcc2426129 100644
--- a/app/view/backend/dons.html
+++ b/app/view/backend/dons.html
@@ -88,7 +88,7 @@
<false>
<a href="{{ 'invalidate_support', 'id='.@row.id | alias }}">Invalider</a>
-
- <a href="{{ 'validate_support', 'id='.@row.id | alias }}">PDF</a>
+ <a href="{{ 'regenerate_pdf', 'id='.@row.id | alias }}">Regénérer le PDF</a>
</false>
</check>
</td>
diff --git a/app/view/backend/toolbar.html b/app/view/backend/toolbar.html
index 081fe00630ffcec0f9e2e2c7f22854c73e36e2de..a38eb6e2d648aeb2bea7c465022e9c5fdacf4119 100644
--- a/app/view/backend/toolbar.html
+++ b/app/view/backend/toolbar.html
@@ -9,5 +9,6 @@
<li><a href="{{ 'users' | alias }}">Gestion des utilisateurs</a></li>
<li><a href="{{ 'stats' | alias }}">Statistiques</a></li>
<li><a href="{{ 'admin_accounts' | alias }}">Administrateurs</a></li>
+ <li><a href="{{ 'admin_logout' | alias }}">Déconnexion</a></li>
</ul>
</section>
diff --git a/app/view/campaign/faq.html b/app/view/campaign/faq.html
index eb1289bbe5d82895f9700953d90c775eaac03501..5edaba54673f578a46d2305281063e0250ccb3b8 100644
--- a/app/view/campaign/faq.html
+++ b/app/view/campaign/faq.html
@@ -1,3 +1,16 @@
+<script type="text/javascript">
+ function toggle() {
+ var currentUrl = document.URL;
+ var urlParts = currentUrl.split('#');
+ var element = (urlParts.length > 1) ? urlParts[1] : null;
+ if(element){
+ var elm = document.getElementById(element);
+ elm.click();
+ elm.scrollIntoView();
+ }
+ }
+ window.onload = toggle;
+</script>
<section class="container-fluid text-block sky-blue" id="questions">
<div class="page-header text-center">
<h1><span>{{ _("Foire aux questions ?") }}<span></h1>
@@ -5,10 +18,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action1" type="checkbox">
+ <input id="recu" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action1">
+ <label for="recu">
{{ _("Est-ce que je peux avoir un reçu de don ?") }}
<span class="panel-caret pull-right"></span>
</label>
@@ -23,10 +36,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action2" type="checkbox">
+ <input id="rescrit" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action2">
+ <label for="rescrit">
{{ _("Est-ce que les dons à La Quadrature donnent droit à une déduction fiscale ?") }}
<span class="panel-caret pull-right"></span></label>
</h4>
@@ -39,10 +52,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action3" type="checkbox">
+ <input id="modifier-don" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action3">{{ _("J'ai mis en place un don mensuel, comment le modifier ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="modifier-don">{{ _("J'ai mis en place un don mensuel, comment le modifier ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -54,10 +67,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action4" type="checkbox">
+ <input id="arret-don" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action4">{{ _("Comment arrêter mon don mensuel ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="arret-don">{{ _("Comment arrêter mon don mensuel ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -70,10 +83,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action5" type="checkbox">
+ <input id="cumul" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action5">{{ _("Est-ce que je peux cumuler mes dons à La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="cumul">{{ _("Est-ce que je peux cumuler mes dons à La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -84,10 +97,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action6" type="checkbox">
+ <input id="changer-mail" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action6">{{ _("Comment changer mon e-mail de donateur·trice ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="changer-mail">{{ _("Comment changer mon e-mail de donateur·trice ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -100,10 +113,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action7" type="checkbox">
+ <input id="don-cheque" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action7">{{ _("Puis-je faire un don par chèque ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-cheque">{{ _("Puis-je faire un don par chèque ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -117,10 +130,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action8" type="checkbox">
+ <input id="don-virement" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action8">{{ _("Puis-je faire un don par virement ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-virement">{{ _("Puis-je faire un don par virement ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -134,10 +147,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action9" type="checkbox">
+ <input id="don-bitcoin" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action9">{{ _("Puis-je faire un don via BitCoin ou d'autres crypto-monnaies ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-bitcoin">{{ _("Puis-je faire un don via BitCoin ou d'autres crypto-monnaies ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -148,10 +161,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action10" type="checkbox">
+ <input id="don-paypal" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action10">{{ _("Puis-je faire un don via Paypal ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-paypal">{{ _("Puis-je faire un don via Paypal ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -163,10 +176,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action12" type="checkbox">
+ <input id="achat-contrepartie" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action12">{{ _("Peut-on vous soutenir en achetant des t-shirts de La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="achat-contrepartie">{{ _("Peut-on vous soutenir en achetant des t-shirts de La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -178,10 +191,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action13" type="checkbox">
+ <input id="demande-contrepartie" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action13">{{ _("Comment faire pour demander mes contreparties ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="demande-contrepartie">{{ _("Comment faire pour demander mes contreparties ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -190,12 +203,12 @@
</div>
</div>
</div>
-
+
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action17" type="checkbox">
+ <input id="livraison" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action17">{{ _("Quand recevrai-je mon t-shirt ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="livraison">{{ _("Quand recevrai-je mon t-shirt ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -207,10 +220,10 @@
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action14" type="checkbox">
+ <input id="don-fdnn" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action14">{{ _("J'avais déjà établi un don régulier via FDNN, est-ce-que je dois faire quelque chose ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-fdnn">{{ _("J'avais déjà établi un don régulier via FDNN, est-ce-que je dois faire quelque chose ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -221,10 +234,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action15" type="checkbox">
+ <input id="don-entreprise" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action15">{{ _("Mon entreprise peut-elle faire un don ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="don-entreprise">{{ _("Mon entreprise peut-elle faire un don ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
@@ -234,23 +247,23 @@
<li>{{ _("La part du budget annuel de LQdN apportée par des entreprises donnant chacune 1 000 euros ou plus une année donnée ne peut dépasser 20% du budget de cette année.") }}</li>
<li>{{ _("Les dons annuels émanant d'une entreprise ne peuvent dépasser 10 000 euros. Pour l'application de cette règle une filiale contrôlée par une entreprise est considérée comme en faisant partie.") }}</li>
<li>{{ _("Le CA se réserve le droit de refuser tout don d'entreprise dépassant 1 000 euros s'il considère que son acceptation est susceptible de nuire à l'objet social de l'Association ou à son indépendance.") }}</li>
- </ul>
+ </ul>
{{ _("» <br> Les dons d'entreprise donnent lieu à un reçu de don utilisable en tant que document comptable. Si vous souhaitez nous faire un don supérieur à 1 000 euros, contactez-nous d'abord : contact@laquadrature.net.") }}</p>
</div>
</div>
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
- <input id="action16" type="checkbox">
+ <input id="financement-lqdn" type="checkbox">
<div class="panel-heading">
<h4>
- <label for="action16">{{ _("Qui finance La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
+ <label for="financement-lqdn">{{ _("Qui finance La Quadrature du Net ?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
- <div class="panel-body white-pure">
- <p>{{ _("La Quadrature du Net est financée à 70 % par des dons individuels : vos dons ! Nous acceptons aussi les dons d'entreprise, mais tous les dons supérieurs à 1 000 € sont soumis à l'approbation des membres de l'association (voir plus haut).") }}<br/>
- {{ _("Les 30 % restants de notre budget correspondent à deux subventions accordées par l’Open Society Foundations (https://www.opensocietyfoundations.org/) et par la Fondation pour le Progrès de l'Homme (http://www.fph.ch/).") }}</p>
+ <div class="panel-body white-pure">
+ <p>{{ _("La Quadrature du Net est financée à 70 % par des dons individuels : vos dons ! Nous acceptons aussi les dons d'entreprise, mais tous les dons supérieurs à 1 000 € sont soumis à l'approbation des membres de l'association (voir plus haut).
+Les 30 % restants de notre budget correspondent à deux subventions accordées par l’Open Society Foundations (https://www.opensocietyfoundations.org/ et par la Fondation pour le Progrès de l'Homme (http://www.fph.ch/).") }}</p>
</div>
</div>
</div>
diff --git a/app/view/campaign/home.html b/app/view/campaign/home.html
index 782278fc809b2dc006e75b86628d9d1fc8853553..20391143dd426702b62b54a33297da1742b88421 100644
--- a/app/view/campaign/home.html
+++ b/app/view/campaign/home.html
@@ -61,7 +61,7 @@
<div class="modal-row">
<div class="form-inline form-accent col-md-7">
<label for="amount_other">{{ _("OU") }}</label>
- <input class="form-control" type="text" name="amount_other" value="" placeholder="80€">
+ <input class="form-control" type="text" name="amount_other" value="" placeholder="Montant libre">
</div>
<div class="form-inline col-md-4" id="monthly">
<input type="radio" class="radio" name="monthly" id="monthly1" value="true">
@@ -71,7 +71,7 @@
</div>
</div>
</fieldset>
- <p class="unmodal">{{ _("Vous pouvez donner par <b>carte bancaire</b>, <b>chèque</b>, <b>crypto-monnaie</b> ou <b>virement</b>.") }}</p>
+ <p class="unmodal">{{ _("Vous pouvez donner par <b>carte bancaire</b>, <b><a href=\"/faq#don-cheque\">chèque</a></b>, <b><a href=\"/faq#don-bitcoin\">crypto-monnaie</a></b> ou <b><a href=\"/faq#don-virement\">virement</a></b>.") }}</p>
<a class="btn btn-modal btn-lg unmodal" href="#step1"><em>{{ _("Faire un don") }}</em></a>
<check if="{{ @@SESSION.user }}">
<false>
diff --git a/app/view/footer.html b/app/view/footer.html
index 4f0133c036bd2adb4c6ae6f743d100713bcc1aa3..13d16ae36d0fbce2a6944c6f70d7cc7cae2a65d3 100644
--- a/app/view/footer.html
+++ b/app/view/footer.html
@@ -4,7 +4,7 @@
<p>{{ _("Site hébergé par <a href=\"https://laquadrature.net\">La Quadrature du Net</a>") }}</p>
</div>
<div class="col-md-4">
- <p>{{ _("Nous ne gardons que les données qui nous sont nécessaires à la gestion de votre don : le nom ou pseudo que vous nous renseignez ainsi que l'email.")}}</p>
+ <p>{{ _("Nous ne gardons que les données qui nous sont nécessaires à la gestion de votre don : le nom ou pseudo que vous nous fournissez ainsi que l'email.")}}</p>
</div>
<div class="col-md-4">
diff --git a/app/view/header.html b/app/view/header.html
index ee762f5441360f9fdea802f9a0a3508fec57e088..fe36718fe821f9b1df9c1b8c56c3995f949a7a55 100644
--- a/app/view/header.html
+++ b/app/view/header.html
@@ -3,7 +3,7 @@
<meta charset="utf-8" />
<meta name="author" content="La Quadrature du Net" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <link rel="icon" type="image/png" href="favicon.png" />
+ <link rel="icon" type="image/png" href="favicon.ico" />
<!-- Open graph -->
<meta property="og:title" content="{{ _('Soutenez La Quadrature du Net !') }}" />
diff --git a/app/view/user/infos.html b/app/view/user/infos.html
index e8e463209632ab98b5f69ede4c3471aad78b0018..d5db158c805949858704adf693eb3ff2304c208d 100644
--- a/app/view/user/infos.html
+++ b/app/view/user/infos.html
@@ -68,17 +68,17 @@
<input type="hidden" name="contrepartie" id="contrepartie" value="" />
<input type="button" class="big_button cntrprt" id="0" value="{{ _("Rien") }}" />
- <check if="{{ @infos.cumul>=30 }}">
- <input type="button" class="big_button cntrprt" id="30" value="30 €" />
+ <check if="{{ @infos.cumul>=42 }}">
+ <input type="button" class="big_button cntrprt" id="42" value="42 €" />
</check>
- <check if="{{ @infos.cumul>=50 }}">
- <input type="button" class="big_button cntrprt" id="50" value="50 €" />
+ <check if="{{ @infos.cumul>=64 }}">
+ <input type="button" class="big_button cntrprt" id="64" value="64 €" />
</check>
- <check if="{{ @infos.cumul>=100 }}">
- <input type="button" class="big_button cntrprt" id="100" value="100 €" />
+ <check if="{{ @infos.cumul>=128 }}">
+ <input type="button" class="big_button cntrprt" id="128" value="128 €" />
</check>
- <check if="{{ @infos.cumul>=250 }}">
- <input type="button" class="big_button cntrprt" id="250" value="250 €" />
+ <check if="{{ @infos.cumul>=314 }}">
+ <input type="button" class="big_button cntrprt" id="314" value="314 €" />
</check>
<div id="cadeaux">
</div>
diff --git a/app/view/user/perso.html b/app/view/user/perso.html
index 45d69d14de89cb503bb230749c9976664a5712b3..237194003249c06ec4a4d22b88ab9597e2de5f0d 100644
--- a/app/view/user/perso.html
+++ b/app/view/user/perso.html
@@ -145,13 +145,24 @@
<tr>
<td>{{ @don.datec }}</td>
<td>{{ @don.somme }}</td>
- <check if="{{ @don.status>=100 }}">
+ <check if="{{ @don.status==100 }}">
+ <true><td>{{ _("En attente de validation") }}</td></true>
+ </check>
+ <check if="{{ @don.status==101 }}">
+ <true><td>{{ _("Enregistré")}}</td></true>
+ </check>
+ <check if="{{ @don.status==102 }}">
<true><td>{{ _("Oui") }}</td></true>
+ </check>
+ <check if="{{ @don.status==104 }}">
+ <true><td>{{ _("Oui (en erreur)"}}</td></true>
<false><td>{{ _("Non") }}</td></false>
</check>
<td>
<check if="{{ @don.pdf == '' }}">
- <a href="/cron/piplome/{{ @don.id }}">{{ _("Générer") }}</a>
+ <true>
+ <a href="/cron/piplome/{{ @don.id }}">{{ _("Générer") }}</a>
+ </true>
<false>
<a href="{{ PIPLOME_URL }}{{ @don.pdf }}.pdf" target="_blank">{{ @pdfs[@don.pdf].decimale }}.pdf</a>
</false>
@@ -229,12 +240,12 @@
<form method="GET" action="{{ 'perso' | alias }}" name="contreparties">
<input type="hidden" name="validate" value="true">
<label></label>
- <check if="{{ @infos.cumul >= 30 }}">
+ <check if="{{ @infos.cumul >= 42 }}">
<div class="col-md-8 col-md-offset-2"><!-- piplome -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
- <input type="radio" name="quoi" id="quoi1" class="radio" checked <check if="{{ @infos.cumul < 30 }}">disabled</check> value="piplome">
+ <input type="radio" name="quoi" id="quoi1" class="radio" checked <check if="{{ @infos.cumul < 42 }}">disabled</check> value="piplome">
<label for="quoi1"></label>
</div>
<div class="col-md-3 text-center">
@@ -254,18 +265,18 @@
</div>
</div>
<div class="c-prixcontrepartie">
- <p>30 €</p>
+ <p>42 €</p>
</div>
</div>
</div>
</div><!-- piplome -->
</check>
- <check if="{{ @infos.cumul >= 50 }}">
+ <check if="{{ @infos.cumul >= 64 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
- <input type="radio" class="radio" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
+ <input type="radio" class="radio" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 64 }}">disabled</check> value="pibag">
<label for="quoi2"></label>
</div>
<div class="col-md-3 text-center">
@@ -282,18 +293,18 @@
</div>
</div>
<div class="c-prixcontrepartie">
- <p>50 €</p>
+ <p>64 €</p>
</div>
</div>
</div>
</div><!-- / Pibag -->
</check>
- <check if="{{ @infos.cumul >= 100 }}">
+ <check if="{{ @infos.cumul >= 128 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pishirt -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
- <input type="radio" class="radio" id="quoi3" name="quoi" <check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
+ <input type="radio" class="radio" id="quoi3" name="quoi" <check if="{{ @infos.cumul < 128 }}">disabled</check> value="pishirt">
<label for="quoi3"></label>
</div>
<div class="col-md-3 text-center">
@@ -319,18 +330,18 @@
</div>
</div>
<div class="c-prixcontrepartie">
- <p>100 €</p>
+ <p>128 €</p>
</div>
</div>
</div>
</div><!-- / Pishirt -->
</check>
- <check if="{{ @infos.cumul >= 250 }}">
+ <check if="{{ @infos.cumul >= 314 }}">
<div class="col-md-8 col-md-offset-2"><!-- Hoopi -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
- <input type="radio" class="radio" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoodie">
+ <input type="radio" class="radio" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 314 }}">disabled</check> value="hoodie">
<label for="quoi4"></label>
</div>
<div class="col-md-3 text-center">
@@ -356,7 +367,7 @@
</div>
</div>
<div class="c-prixcontrepartie">
- <p>250 €</p>
+ <p>314 €</p>
</div>
</div>
</div>
diff --git a/src/LQDN/Handler/UserHandler.php b/src/LQDN/Handler/UserHandler.php
index 8dd237b75cebbbf93b09b1b00d243c6a2a917271..00976519b23382df0fb8b96883be99a429317be1 100644
--- a/src/LQDN/Handler/UserHandler.php
+++ b/src/LQDN/Handler/UserHandler.php
@@ -116,7 +116,7 @@ class UserHandler
// quoi = 'pibag' somme = 50
// quoi = 'piplome' somme = 30
$spent = $this->connection->executeQuery(
- "SELECT sum(IF(quoi = 'hoodie',250,0)) + sum(IF(quoi = 'pishirt', 100, 0)) + sum(IF(quoi = 'pibag', 50, 0)) + sum(IF(quoi = 'piplome', 30, 0)) AS spent FROM contreparties WHERE user_id = :user_id AND id = parent",
+ "SELECT sum(IF(quoi = 'hoodie',314,0)) + sum(IF(quoi = 'pishirt', 128, 0)) + sum(IF(quoi = 'pibag', 64, 0)) + sum(IF(quoi = 'piplome', 32, 0)) AS spent FROM contreparties WHERE user_id = :user_id AND id = parent",
[ 'user_id' => $user_id]
)->fetchAll(\PDO::FETCH_COLUMN)[0];
$this->connection->executeUpdate('UPDATE users SET total = :total, cumul = :cumul WHERE id = :user_id', ['total' => (int) $total, 'cumul' => (int) $total - (int) $spent, 'user_id' => $user_id]);
diff --git a/tests/functional/Handler/DonationHandlerTest.php b/tests/functional/Handler/DonationHandlerTest.php
index d96f357745e2a4c655e9ace651d8e1ae75f4734d..b4aa7fa11ad701e6bbd87192a4f1d11bd945876f 100644
--- a/tests/functional/Handler/DonationHandlerTest.php
+++ b/tests/functional/Handler/DonationHandlerTest.php
@@ -36,7 +36,7 @@ class DonationHandlerTest extends FunctionalTest
public function testDonationCreateCommand()
{
- $this->container['command_handler']->handle(new DonationCreateCommand(1, 1, date("Y-m-d H:M:s"), 50, 0, 0));
+ $this->container['command_handler']->handle(new DonationCreateCommand(1, 1, date("Y-m-d H:i:s"), 50, 0, 0));
}
diff --git a/tests/functional/Handler/UserHandlerTest.php b/tests/functional/Handler/UserHandlerTest.php
index 61c6b9695fa0bfebd2e7ab4869c9d2964b7348f9..639ab6d1d880e1a482b30e8369617093dda6d9c3 100644
--- a/tests/functional/Handler/UserHandlerTest.php
+++ b/tests/functional/Handler/UserHandlerTest.php
@@ -15,9 +15,9 @@ class UserHandlerTest extends FunctionalTest
{
$this->container['command_handler']->handle(new AdminUpdateTotalUsersCommand());
$this->assertSame(1000, (int) $this->getUser(1)['total']);
- $this->assertSame(900, (int) $this->getUser(1)['cumul']);
+ $this->assertSame(872 , (int) $this->getUser(1)['cumul']);
$this->assertSame(1000, (int) $this->getUser(2)['total']);
- $this->assertSame(750, (int) $this->getUser(2)['cumul']);
+ $this->assertSame(686, (int) $this->getUser(2)['cumul']);
}
public function testUserUpdateFromAdmin()
diff --git a/www/favicon.png b/www/favicon.ico
similarity index 100%
rename from www/favicon.png
rename to www/favicon.ico
diff --git a/www/static/css/admin.css b/www/static/css/admin.css
index dd5f2a3a3a9f88738b80459761f97b59415b3db9..83786adf2176d118339c44bd817089a0e3d5e531 100644
--- a/www/static/css/admin.css
+++ b/www/static/css/admin.css
@@ -26,7 +26,7 @@ text-align: center;
li {
display: inline-block;
-padding: 0px 2em;
+padding: 0px 1.5em;
font-weight: bold;
}