From: Florent Bruneau Date: Fri, 21 Dec 2007 21:10:11 +0000 (+0100) Subject: Show payment details in CSV (Closes #728) X-Git-Tag: xorg/0.9.16~182 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=478f7c3a760622fdecc20f892c704775a5edcfd2;p=platal.git Show payment details in CSV (Closes #728) Signed-off-by: Florent Bruneau --- diff --git a/ChangeLog b/ChangeLog index c4dacd7..632c65a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ Bug/Wish: - #741: Mentor search in advanced search -FRU * XnetEvent: + - #728: Update CSV -FRU - #743: Don't show a warning when subscriber has no forlife -FRU * XnetGrp: diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 4b9c4cf..93474a6 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -284,6 +284,7 @@ class XnetEventsModule extends PLModule $page->assign('admin', $admin); $page->assign('moments', $evt['moments']); $page->assign('money', $evt['money']); + $page->assign('telepayment', $evt['paiement_id']); $page->assign('tout', !Env::v('item_id', false)); } diff --git a/templates/xnetevents/csv.tpl b/templates/xnetevents/csv.tpl index c1e3fc1..705426e 100644 --- a/templates/xnetevents/csv.tpl +++ b/templates/xnetevents/csv.tpl @@ -19,13 +19,15 @@ {* 59 Temple Place, Suite 330; Boston, MA 02111-1307 USA *} {* *} {**************************************************************************} -Nom;Prénom;Promotion{if $tout}{foreach from=$moments item=m};{$m.titre}{/foreach}{if $admin && $money};À payer;Payé{/if}{else};Nombre{/if} +Nom;Prénom;Promotion{if $tout}{foreach from=$moments item=m};{$m.titre}{/foreach}{if $admin && $money};À payer;{if +$telepayment}Télépaiement;Liquide/Chèque;{/if}Payé{/if}{else};Nombre{/if} {if $participants} {foreach from=$participants item=m} ; -{$m.nom};{$m.prenom};{$m.promo}{if $tout}{foreach from=$moments item=i};{$m[$i.item_id]}{/foreach}{if $admin && $money};{$m.montant};{$m.paid}{/if}{else};{$m.nb}{/if} +{$m.nom};{$m.prenom};{$m.promo}{if $tout}{foreach from=$moments item=i};{$m[$i.item_id]}{/foreach}{if $admin && +$money};{$m.montant};{if $telepayment}{$m.telepayment};{$m.adminpaid};{/if}{$m.paid}{/if}{else};{$m.nb}{/if} {/foreach} ;