From: Florent Bruneau Date: Fri, 21 Dec 2007 21:02:46 +0000 (+0100) Subject: Show payment summary in event admin page. X-Git-Tag: xorg/0.9.16~183 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=e01ebe656976c6f8ea54ab9b5be44cc839d29bb1;p=platal.git Show payment summary in event admin page. Signed-off-by: Florent Bruneau --- diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 1cc6633..4b9c4cf 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -562,7 +562,7 @@ class XnetEventsModule extends PLModule $evt = get_event_detail($eid, $item_id); } - $page->assign('evt', $evt); + $page->assign_by_ref('evt', $evt); $page->assign('tout', is_null($item_id)); if (count($evt['moments'])) { diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 9c0ad58..1fa24e5 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -110,7 +110,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) // }}} // {{{ function get_event_participants() -function get_event_participants($evt, $item_id, $tri, $limit = '') { +function get_event_participants(&$evt, $item_id, $tri, $limit = '') { global $globals; if (Env::has('initiale')) { @@ -155,6 +155,10 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') { $tab = array(); $user = 0; + $evt['adminpaid'] = 0; + $evt['telepaid'] = 0; + $evt['topay'] = 0; + $evt['paid'] = 0; while ($u = $res->next()) { if ($u['nb'] == 0) { continue; @@ -169,8 +173,8 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') { $pay_id, $u['uid']); $montants = $res_->fetchColumn(); foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, "EUR")), ",", "."); - $u['paid'] += trim($p); + $p = strtr(substr($m, 0, strpos($m, "EUR")), ",", "."); + $u['paid'] += trim($p); } } $u['telepayment'] = $u['paid'] - $u['adminpaid']; @@ -185,6 +189,10 @@ function get_event_participants($evt, $item_id, $tri, $limit = '') { $u['montant'] += $i['montant']*$i['nb']; } $tab[] = $u; + $evt['telepaid'] += $u['telepayment']; + $evt['adminpaid'] += $u['adminpaid']; + $evt['paid'] += $u['paid']; + $evt['topay'] += $u['montant']; } return $tab; } diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl index f1ca9d9..975951a 100644 --- a/templates/xnetevents/admin.tpl +++ b/templates/xnetevents/admin.tpl @@ -178,6 +178,18 @@ Ils ont payé mais ont oublié de s'inscrire : {/if} {/foreach} + {if $is_admin && $evt.money} + + {assign var=cols value=$moments|@count} + Total + {$evt.topay}€ + {if $evt.paiement_id} + {$evt.telepaid|default:0}€ + {$evt.adminpaid|default:0}€ + {/if} + {$evt.paid}€ + + {/if}