Commit b1bae66e authored by Guinness's avatar Guinness
Browse files

Merge branch 'preprod' into 'master'

Finish updating the values

See merge request !124
parents 9bdbb8ea 5e9916b3
...@@ -869,7 +869,7 @@ class Admin extends Controller ...@@ -869,7 +869,7 @@ class Admin extends Controller
$db->query( $db->query(
"DELETE FROM adresses "DELETE FROM adresses
WHERE id = $id" WHERE id = $id"
); );
} else { } else {
$result = $db->query("SELECT user_id FROM adresses WHERE id = $id"); $result = $db->query("SELECT user_id FROM adresses WHERE id = $id");
$result = $result->fetch(\PDO::FETCH_ASSOC); $result = $result->fetch(\PDO::FETCH_ASSOC);
......
...@@ -34,7 +34,7 @@ class Campaign extends Controller ...@@ -34,7 +34,7 @@ class Campaign extends Controller
FROM dons FROM dons
WHERE status IN (1, 4, 102) WHERE status IN (1, 4, 102)
AND datec > '".CAMPAIGN_START_DATE."'" AND datec > '".CAMPAIGN_START_DATE."'"
); );
$total_confirmed = intval($result->fetchColumn()); $total_confirmed = intval($result->fetchColumn());
$f3->set('total_confirmed', $total_confirmed); $f3->set('total_confirmed', $total_confirmed);
// Now, provisional. All reccuring pledge who have a datec in the last month (still active) // Now, provisional. All reccuring pledge who have a datec in the last month (still active)
......
...@@ -108,15 +108,15 @@ class Cron extends Controller ...@@ -108,15 +108,15 @@ class Cron extends Controller
str_replace( str_replace(
"%%DECIMALES%%", "%%DECIMALES%%",
$decimales, $decimales,
str_replace( str_replace(
"%%NOM%%", "%%NOM%%",
$pdf['nom'], $pdf['nom'],
str_replace( str_replace(
"%%MILLIER%%", "%%MILLIER%%",
$pdf['decimale'], $pdf['decimale'],
$template $template
) )
) )
) )
); );
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
<div class="modal-row"> <div class="modal-row">
<div class="radio-row"> <div class="radio-row">
<input type="radio" name="amount" id="amount1" value="11"> <input type="radio" name="amount" id="amount1" value="11">
<label for="amount1" class="text-center">10</label> <label for="amount1" class="text-center">11</label>
<input type="radio" name="amount" id="amount2" value="42"> <input type="radio" name="amount" id="amount2" value="42">
<label for="amount2" class="text-center">30</label> <label for="amount2" class="text-center">42</label>
<input type="radio" name="amount" id="amount3" value="64" checked> <input type="radio" name="amount" id="amount3" value="64" checked>
<label for="amount3" class="text-center">50</label> <label for="amount3" class="text-center">64</label>
<input type="radio" name="amount" id="amount4" value="128"> <input type="radio" name="amount" id="amount4" value="128">
<label for="amount4" class="text-center">100</label> <label for="amount4" class="text-center">128</label>
<input type="radio" name="amount" id="amount5" value="314"> <input type="radio" name="amount" id="amount5" value="314">
<label for="amount5" class="text-center">314€</label> <label for="amount5" class="text-center">314€</label>
</div> </div>
......
This diff is collapsed.
...@@ -830,8 +830,12 @@ msgstr "" ...@@ -830,8 +830,12 @@ msgstr ""
"to protect our financial freedom. Our financial regulations document defines " "to protect our financial freedom. Our financial regulations document defines "
"how:<br />As for companies, the following rules applies:" "how:<br />As for companies, the following rules applies:"
<<<<<<< Updated upstream
#: app/view/campaign/faq.html:234 #: app/view/campaign/faq.html:234
#, c-format #, c-format
=======
#: app/view/campaign/faq.html:235
>>>>>>> Stashed changes
msgid "" msgid ""
"La part du budget annuel de LQdN apportée par des entreprises donnant " "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 " "chacune 1 000 euros ou plus une année donnée ne peut dépasser 20% du budget "
...@@ -873,7 +877,11 @@ msgstr "" ...@@ -873,7 +877,11 @@ msgstr ""
msgid "Qui finance La Quadrature du Net&nbsp;?" msgid "Qui finance La Quadrature du Net&nbsp;?"
msgstr "Who's financing La Quadrature du Net?" msgstr "Who's financing La Quadrature du Net?"
<<<<<<< Updated upstream
#: app/view/campaign/faq.html:252 #: app/view/campaign/faq.html:252
=======
#: app/view/campaign/faq.html:253
>>>>>>> Stashed changes
msgid "" msgid ""
"La Quadrature du Net est financée à 70 % par des dons individuels : vos " "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 " "dons ! Nous acceptons aussi les dons d'entreprise, mais tous les dons "
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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