Close #695: More details about payments for xnet events

 ChangeLog                             |    3 +++
 modules/xnetevents/xnetevents.inc.php |    6 ++++--
 templates/xnetevents/admin.tpl        |   32 +++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 11 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1874 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index 17e5fb2..5b18abb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@ Bug/Wish:
     * Xnet:
         - #694: Color of 'Promotion' groups                                -ALK
 
+    * XnetEvents:
+        - #695: More details about payments                                -Fru
+
 From 0.9.14 branch:
 
     * Payment:

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index f2acb44..1fbd64a 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -126,10 +126,10 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') {
                    IF(m.origine != 'X',m.sexe,FIND_IN_SET('femme', u.flags)) AS femme,
                    m.perms='admin' AS admin,
                    (m.origine = 'X') AS x,
-                          ep.uid, ep.paid, SUM(nb) AS nb 
+                  ep.uid, SUM(ep.paid) AS paid, SUM(nb) AS nb 
              FROM  groupex.evenements_participants AS ep
        INNER JOIN  groupex.evenements AS e ON (ep.eid = e.eid)
-           LEFT JOIN  groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id)
+       LEFT JOIN  groupex.membres AS m ON ( ep.uid = m.uid AND e.asso_id = m.asso_id)
         LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = ep.uid )
         LEFT JOIN  aliases         AS a ON ( a.id = ep.uid AND a.type='a_vie' )
             WHERE  ep.eid = {?} AND ep.nb > 0
@@ -148,6 +148,7 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') {
     $user = 0;
 
     while ($u = $res->next()) {
+        $u['adminpaid'] = $u['paid'];
         $u['montant'] = 0;
        if ($money && $pay_id) {
             $res_ = XDB::query(
@@ -161,6 +162,7 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') {
                     $u['paid'] += trim($p);
             }
        }
+        $u['telepayment'] = $u['paid'] - $u['adminpaid'];
         $res_ = XDB::iterator(
             "SELECT ep.nb, ep.item_id, ei.montant
                FROM groupex.evenements_participants AS ep

diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl
index 047c743..72d6ec1 100644 (file)
--- a/templates/xnetevents/admin.tpl
+++ b/templates/xnetevents/admin.tpl
@@ -100,25 +100,35 @@ Ils ont payé mais ont oublié de s'inscrire :
 
 <table summary="participants a l'evenement" class="{if $tout}large{else}tiny{/if}">
   <tr>
-    <th>Prénom NOM</th>
-    <th>Promo</th>
-    <th>Info</th>
+    {if $is_admin && $evt.paiement_id}
+      {assign var=height value='rowspan="2"'}
+    {/if}
+    <th {$height|smarty:nodefaults}>Prénom NOM</th>
+    <th {$height|smarty:nodefaults}>Promo</th>
+    <th {$height|smarty:nodefaults}>Info</th>
     {if $tout}
       {if $moments}
         {foreach from=$moments item=m}
-          <th>{$m.titre}</th>
+          <th {$height|smarty:nodefaults}>{$m.titre}</th>
         {/foreach}
       {else}
-        <th>Nombre</th>
+        <th {$height|smarty:nodefaults}>Nombre</th>
       {/if}
       {if $is_admin && $evt.money}
-        <th>Montant</th>
-        <th>Payé</th>
+        <th {$height|smarty:nodefaults}>Montant</th>
+        <th colspan="3">Payé</th>
       {/if}
     {else}
-    <th>Nombre</th>
+    <th {$height|smarty:nodefaults}>Nombre</th>
     {/if}
   </tr>
+  {if $is_admin && $evt.paiement_id}
+  <tr>
+    <th>Télépaiement</th>
+    <th>Autre</th>
+    <th>Total</th>
+  </tr>
+  {/if}
   {foreach from=$participants item=m}
   <tr>
     <td>
@@ -146,7 +156,11 @@ Ils ont payé mais ont oublié de s'inscrire :
       {/if}
       {if $is_admin && $evt.money}
         <td {if $m.montant > $m.paid}class="erreur"{/if}>{$m.montant}&euro;</td>
-        <td>{$m.paid}&euro;</td>
+        {if $evt.paiement_id}
+          <td>{$m.telepayment|default:0}&euro;</td>
+          <td>{$m.adminpaid|default:0}&euro;</td>
+        {/if}
+        <td {if $m.montant < $m.paid}class="erreur"{/if}>{$m.paid}&euro;</td>
       {/if}
     {else}
     <td>