Displays users donations (Closes #192).

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/ChangeLog b/ChangeLog
index 23dfbb2..fb1a927 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ VERSION 1.1.2                                                         XX XX XXXX
 
 Bug/Wish:
 
+    * Paiement:
+        - #192: Displays users donations                                   -JAC
+
     * Search:
         - #1285: Autocompletes on internal words in university search      -JAC
 

diff --git a/modules/payment.php b/modules/payment.php
index 4926187..40d5d12 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -172,6 +172,27 @@ class PaymentModule extends PLModule
             if ($res->total()) {
                 $page->assign('transactions', $res);
             }
+
+            if ($pay->flags->hasflag('donation')) {
+                $donations = XDB::fetchAllAssoc('SELECT  IF(p.display,
+                                                            IF(ap.pid IS NOT NULL, CONCAT(a.full_name, \' (\', pd.promo, \')\'), a.full_name),
+                                                            \'XXXX\') AS name, p.amount
+                                                   FROM  payment_transactions AS p
+                                             INNER JOIN  accounts             AS a  ON (a.uid = p.uid)
+                                              LEFT JOIN  account_profiles     AS ap ON (a.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms))
+                                              LEFT JOIN  profile_display      AS pd ON (ap.pid = pd.pid)
+                                                  WHERE  p.ref = {?}
+                                               ORDER BY  LENGTH(p.amount) DESC, p.amount DESC, name',
+                                                $ref);
+                $sum = 0;
+                foreach ($donations as $d) {
+                    $amount = $d['amount'];
+                    $sum += trim(strtr(substr($amount, 0, strpos($amount, 'EUR')), ',', '.'));
+                }
+
+                $page->assign('donations', $donations);
+                $page->assign('sum', strtr($sum, '.', ','));
+            }
         }
 
         $val = floor($val) . '.' . substr(floor(($val - floor($val)) * 100 + 100), 1);

diff --git a/templates/payment/index.tpl b/templates/payment/index.tpl
index 18b55b9..1b40c17 100644 (file)
--- a/templates/payment/index.tpl
+++ b/templates/payment/index.tpl
@@ -174,6 +174,26 @@ function payment_submit(form)
 </table>
 {/if}
 
+{if t($donation)}
+{if !t($donations)}
+<p class="descr">Aucun don n'a encore été recueilli.</p>
+{else}
+<p class="descr">Les dons suivants ont déjà été recueillis (pour un total de {$sum} &euro;)&nbsp;:</p>
+<table class="bicol">
+  <tr>
+    <th>Nom</th>
+    <th>Montant</th>
+  </tr>
+  {foreach from=$donations item=d}
+  <tr class="{cycle values="pair,impair"}">
+    <td>{$d.name}</td>
+    <td class="center">{$d.amount|replace:'EUR':'&euro;'}</td>
+  </tr>
+  {/foreach}
+</table>
+{/if}
+{/if}
+
 {/if}