From c860774b1a6705e4e065d072deeef18dcac7d404 Mon Sep 17 00:00:00 2001 From: Nicolas Iooss Date: Sun, 9 Mar 2014 20:46:47 +0100 Subject: [PATCH] Revert the last two commits There has been a strange transient bug which is now fixed (don't know how) This reverts commit 2d394628dc35b7da99a73128df15ad980e69197c and 6c615821baef0daad2d1d8d7ef988be146da58e3. --- modules/xnetevents.php | 248 +++++++++++++++------------------- modules/xnetevents/xnetevents.inc.php | 208 ++++++++++++++++++++++++++-- templates/xnetevents/index.tpl | 27 ++-- templates/xnetevents/subscribe.tpl | 60 ++++---- 4 files changed, 353 insertions(+), 190 deletions(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index a9d4d1c..ba8fec5 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -40,6 +40,8 @@ class XnetEventsModule extends PLModule global $globals; $page->changeTpl('xnetevents/index.tpl'); + $this->load('xnetevents.inc.php'); + $action = null; $archive = ($archive == 'archive' && may_update()); @@ -151,77 +153,49 @@ class XnetEventsModule extends PLModule SET event_order = {?} WHERE id = {?}", $order, $globals->asso('id')); - } else { - $order = XDB::fetchOneCell("SELECT event_order FROM groups - WHERE id = {?}", - $globals->asso('id')); - } - if ($order == 'desc') { - $evenements = XDB::iterator('SELECT e.*, LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, - IF(e.deadline_inscription, - e.deadline_inscription >= LEFT(NOW(), 10), - 1) AS inscr_open, - e.deadline_inscription, - MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid - FROM group_events AS e - LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) - WHERE asso_id = {?} AND archive = {?} - GROUP BY e.eid - ORDER BY inscr_open DESC, debut DESC', - S::i('uid'), $globals->asso('id'), $archive ? 1 : 0); - } else { - $evenements = XDB::iterator('SELECT e.*, LEFT(e.debut, 10) AS first_day, LEFT(e.fin, 10) AS last_day, - IF(e.deadline_inscription, - e.deadline_inscription >= LEFT(NOW(), 10), - 1) AS inscr_open, - e.deadline_inscription, - MAX(ep.nb) IS NOT NULL AS inscrit, MAX(ep.paid) AS paid - FROM group_events AS e - LEFT JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) - WHERE asso_id = {?} AND archive = {?} - GROUP BY e.eid - ORDER BY inscr_open DESC, debut ASC', - S::i('uid'), $globals->asso('id'), $archive ? 1 : 0); } + $order = get_event_order($globals->asso('id')); + $evts = get_events($globals->asso('id'), $order); $page->assign('order', $order); - $evts = array(); $undisplayed_events = 0; - $this->load('xnetevents.inc.php'); - - while ($e = $evenements->next()) { + foreach ($evts as $eid => &$e) { if (!is_member() && !may_update() && !$e['accept_nonmembre']) { $undisplayed_events ++; continue; } $e['show_participants'] = ($e['show_participants'] && (is_member() || may_update())); - $e['moments'] = XDB::fetchAllAssoc('SELECT titre, details, montant, ei.item_id, nb, ep.paid - FROM group_event_items AS ei - LEFT JOIN group_event_participants AS ep - ON (ep.eid = ei.eid AND ep.item_id = ei.item_id AND ep.uid = {?}) - WHERE ei.eid = {?}', - S::i('uid'), $e['eid']); - + $e['items'] = get_event_items($eid); $e['topay'] = 0; $e['paid'] = 0; - foreach ($e['moments'] as $m) { - $e['topay'] += $m['nb'] * $m['montant']; - $e['paid'] += $m['paid']; + $sub = get_event_subscription($eid, S::i('uid')); + if (empty($sub)) { + $e['inscrit'] = false; + } else { + $e['inscrit'] = true; + foreach ($e['items'] as $item_id => $m) { + if (isset($sub[$item_id])) { + $e['topay'] += $sub[$item_id]['nb'] * $m['montant']; + $e['paid'] += $sub[$item_id]['paid']; + } + } } + $e['sub'] = $sub; - $montant = XDB::fetchOneCell( - "SELECT SUM(amount) as sum_amount - FROM payment_transactions AS t - WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); - $e['paid'] += $montant; + $telepaid = get_event_telepaid($eid, S::i('uid')); + $e['paid'] += $telepaid; - make_event_date($e); + $e['date'] = make_event_date($e['debut'], $e['fin']); + if ($e['deadline_inscription'] == null || strtotime($e['deadline_inscription']) >= time()) { + $e['inscr_open'] = true; + } else { + $e['inscr_open'] = false; + } if (Env::has('updated') && $e['eid'] == Env::i('updated')) { $page->assign('updated', $e); } - $evts[] = $e; } $page->assign('evenements', $evts); @@ -233,12 +207,17 @@ class XnetEventsModule extends PLModule $this->load('xnetevents.inc.php'); $page->changeTpl('xnetevents/subscribe.tpl'); - $evt = get_event_detail($eid); + $evt = get_event($eid); if (is_null($evt)) { return PL_NOT_FOUND; } - if ($evt === false) { - global $globals, $platal; + + global $globals; + + if (!$evt['inscr_open']) { + $page->kill('Les inscriptions pour cet événement sont closes'); + } + if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { $url = $globals->asso('sub_url'); if (empty($url)) { $url = $platal->ns . 'subscribe'; @@ -247,107 +226,100 @@ class XnetEventsModule extends PLModule '. Pour devenir membre, rends-toi sur la page de demande d\'inscripton.'); } - if (!$evt['inscr_open']) { - $page->kill('Les inscriptions pour cet événement sont closes'); - } - if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { - $page->kill('Cet événement est fermé aux non-membres du groupe'); - } - - global $globals; $res = XDB::query("SELECT stamp FROM requests WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($evt['eid'], $globals->asso('id'))); + PayReq::same_event($eid, $globals->asso('id'))); $page->assign('validation', $res->numRows()); - $page->assign('event', $evt); - - if (!Post::has('submit')) { - return; - } else { - S::assert_xsrf_token(); - } - $moments = Post::v('moment', array()); - $pers = Post::v('personnes', array()); - $subs = array(); + $page->assign('eid', $eid); + $page->assign('event', $evt); - foreach ($moments as $j => $v) { - $subs[$j] = intval($v); + $items = get_event_items($eid); + $subs = get_event_subscription($eid, S::v('uid')); - // retrieve other field when more than one person - if ($subs[$j] == 2) { - if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { - $page->trigError("Tu dois choisir un nombre d'invités correct !"); - return; + if (Post::has('submit')) { + S::assert_xsrf_token(); + $moments = Post::v('moment', array()); + $pers = Post::v('personnes', array()); + $old_subs = $subs; + $subs = array(); + + foreach ($moments as $j => $v) { + $subs[$j] = intval($v); + + // retrieve other field when more than one person + if ($subs[$j] == 2) { + if (!isset($pers[$j]) || !is_numeric($pers[$j]) || $pers[$j] < 0) { + $page->trigError("Tu dois choisir un nombre d'invités correct !"); + return; + } + $subs[$j] = $pers[$j]; } - $subs[$j] = $pers[$j]; } - } - - // impossible to unsubscribe if you already paid sthing - if (!array_sum($subs) && $evt['paid'] != 0) { - $page->trigError("Impossible de te désinscrire complètement " . - "parce que tu as fait un paiement par " . - "chèque ou par liquide. Contacte un " . - "administrateur du groupe si tu es sûr de " . - "ne pas venir."); - return; - } - // update actual inscriptions - $updated = false; - $total = 0; - $paid = $evt['paid'] ? $evt['paid'] : 0; - $telepaid = $evt['telepaid'] ? $evt['telepaid'] : 0; - $paid_inserted = false; - foreach ($subs as $j => $nb) { - if ($nb >= 0) { - XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}) - ON DUPLICATE KEY UPDATE nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)', - $eid, S::v('uid'), $j, $nb, (Env::has('notify_payment') ? 'notify_payment' : ''), - ((!$paid_inserted) ? $paid - $telepaid : 0)); - $updated = $eid; - $paid_inserted = true; - } else { - XDB::execute( - "DELETE FROM group_event_participants - WHERE eid = {?} AND uid = {?} AND item_id = {?}", - $eid, S::v("uid"), $j); - $updated = $eid; + // count what the user must pay, and what he manually paid + $manual_paid = 0; + foreach ($items as $item_id => $item) { + if (array_key_exists($item_id, $old_subs)) { + $manual_paid += $old_subs[$item_id]['paid']; + } } - $total += $nb; - } - if ($updated !== false) { - $evt = get_event_detail($eid); - if ($evt['topay'] > 0) { - $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès, tu peux payer ta participation en cliquant ci-dessous'); + // impossible to unsubscribe if you already paid sthing + if (!array_sum($subs) && $manual_paid != 0) { + $page->trigError("Impossible de te désinscrire complètement " . + "parce que tu as fait un paiement par " . + "chèque ou par liquide. Contacte un " . + "administrateur du groupe si tu es sûr de " . + "ne pas venir."); + $updated = false; } else { - $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); + // update actual inscriptions + $updated = subscribe(S::v('uid'), $eid, $subs); } - subscribe_lists_event(S::i('uid'), $evt['short_name'], ($total > 0 ? 1 : 0), 0); + if ($updated) { + $evt = get_event_detail($eid); + if ($evt['topay'] > 0) { + $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès, tu peux payer ta participation en cliquant ci-dessous'); + } else { + $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); + } - if ($evt['subscription_notification'] != 'nobody') { - $mailer = new PlMailer('xnetevents/subscription-notif.mail.tpl'); - if ($evt['subscription_notification'] != 'creator') { - $admins = $globals->asso()->iterAdmins(); - while ($admin = $admins->next()) { - $mailer->addTo($admin); + if ($evt['subscription_notification'] != 'nobody') { + $mailer = new PlMailer('xnetevents/subscription-notif.mail.tpl'); + if ($evt['subscription_notification'] != 'creator') { + $admins = $globals->asso()->iterAdmins(); + while ($admin = $admins->next()) { + $mailer->addTo($admin); + } } + if ($evt['subscription_notification'] != 'animator') { + $mailer->addTo($evt['organizer']); + } + $mailer->assign('group', $globals->asso('nom')); + $mailer->assign('event', $evt['intitule']); + $mailer->assign('subs', $subs); + $mailer->assign('moments', $evt['moments']); + $mailer->assign('name', S::user()->fullName('promo')); + $mailer->send(); } - if ($evt['subscription_notification'] != 'animator') { - $mailer->addTo($evt['organizer']); - } - $mailer->assign('group', $globals->asso('nom')); - $mailer->assign('event', $evt['intitule']); - $mailer->assign('subs', $subs); - $mailer->assign('moments', $evt['moments']); - $mailer->assign('name', S::user()->fullName('promo')); - $mailer->send(); } } - $page->assign('event', get_event_detail($eid)); + $subs = get_event_subscription($eid, S::v('uid')); + // count what the user must pay + $topay = 0; + $manually_paid = 0; + foreach ($items as $item_id => $item) { + if (array_key_exists($item_id, $subs)) { + $topay += $item['montant']*$subs[$item_id]['nb']; + $manually_paid += $subs[$item_id]['paid']; + } + } + $paid = $manually_paid + get_event_telepaid($eid, S::v('uid')); + $page->assign('moments', $items); + $page->assign('subs', $subs); + $page->assign('topay', $topay); + $page->assign('paid', $paid); } function handler_csv($page, $eid = null, $item_id = null) diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 594f0aa..558686b 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -19,6 +19,113 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ +// {{{ function get_event_order() +/* get the order to paste the events + * @param $asso_id: group's id + */ +function get_event_order($asso_id) +{ + $order = XDB::fetchOneCell('SELECT g.event_order + FROM groups as g + WHERE id = {?}', + $asso_id); + return $order; +} +// }}} + +// {{{ function get_events() +/* get the events of the given group ordered by the standard order for the group + * @param $asso_id: group's id + * @param $order: order to paste the events (asc or desc) + */ +function get_events($asso_id, $order) +{ + if ($order != 'asc' && $order != 'desc') { + $order = 'desc'; + } + $evts = XDB::fetchAllAssoc('eid', "SELECT ge.eid, ge.uid, ge.intitule, ge.debut, ge.fin, ge.show_participants, ge.deadline_inscription, ge.accept_nonmembre, ge.paiement_id + FROM group_events as ge + WHERE asso_id = {?} + ORDER BY ge.debut $order", + $asso_id); + return $evts; +} +// }}} + +// {{{ function get_event() (detail, for subs page only for now) +/* get event details + * @param $eid: event's id + */ +function get_event($eid) +{ + $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre, ge.paiement_id + FROM group_events as ge + WHERE eid = {?}', + $eid); + if (!is_null($evt['deadline_inscription']) && strtotime($evt['deadline_inscription']) < time()) { + $evt['inscr_open'] = false; + } else { + $evt['inscr_open'] = true; + } + $evt['organizer'] = User::getSilent($evt['uid'])->profile(); + $evt['date'] = make_event_date($evt['debut'], $evt['fin']); + + return $evt; +} +// }}} + +// {{{ function get_event_items() +/** get items of the given event + * + * @param $eid : event's id + * + */ +function get_event_items($eid) +{ + $evt = XDB::fetchAllAssoc('item_id', 'SELECT gei.item_id, gei.titre, gei.details, gei.montant + FROM group_event_items as gei + WHERE eid = {?}', + $eid); + return $evt; +} +// }}} + +// {{{ function get_event_subscription() +/* get all participations if uid is not specified, only the user's participation if uid specified + * @param $eid: event's id + * @param $uid: user's id + */ +function get_event_subscription($eid, $uid = null) +{ + if (!is_null($uid)) { + $where = ' and gep.uid = '.$uid; + } + else { + $where = ''; + } + $sub = XDB::fetchAllAssoc('item_id','SELECT gep.item_id, gep.nb, gep.paid FROM group_event_participants as gep + WHERE gep.eid = {?}'.$where, + $eid); + return $sub; +} +// }}} + +// {{{ function get_event_telepaid() +/* get the total payments made by a user for an event + * @param $eid: event's id + * @param $uid: user's id + */ +function get_event_telepaid($eid, $uid) +{ + $telepaid = XDB::fetchOneCell('SELECT SUM(pt.amount) + FROM payment_transactions AS pt + LEFT JOIN group_events as ge ON (ge.paiement_id = pt.ref) + WHERE ge.eid = {?} AND pt.uid = {?}', + $eid, $uid); + return $telepaid; +} +// }}} + // {{{ function get_event_detail() function get_event_detail($eid, $item_id = false, $asso_id = null) @@ -96,7 +203,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) $evt['paid'] += $montant; $evt['organizer'] = User::getSilent($evt['uid']); - make_event_date($evt); + $evt['date'] = make_event_date($evt['debut'], $evt['fin']); $evt['show_participants'] = ($evt['show_participants'] && $GLOBALS['IS_XNET_SITE'] && (is_member() || may_update())); @@ -166,6 +273,90 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit = } // }}} +// {{{ function subscribe() +/** set or update the user's subscription + * + * @param $uid: user's id + * @param $eid: event's id + * @param $subs: user's new subscription + * + */ +function subscribe($uid, $eid, $subs = array()) +{ + global $globals; + // get items + $items = get_event_items($eid); + // get previous subscription + $old_subs = get_event_subscription($eid, $uid); + $participate = false; + $updated = false; + // TODO : change the way to deal with manual payment + $paid = 0; + foreach ($old_subs as $item_id => $s) { + $paid += $s['paid']; + } + $paid_updated = false; + // for each item of the event + foreach ($items as $item_id => $details) { + // check if there is an old subscription + if (array_key_exists($item_id, $old_subs)) { + echo 'prev exists '; + // compares new and old subscription + if ($old_subs[$item_id]['nb'] != $subs[$item_id]) { + echo 'different '; + if ($subs[$item_id] != 0) { + echo "je m'inscris "; + XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}) + ON DUPLICATE KEY UPDATE nb = VALUES(nb), flags = VALUES(flags), paid = VALUES(paid)', + $eid, $uid, $item_id, $subs[$item_id],(Env::has('notify_payment') ? 'notify_payment' : 0), (!$paid_updated ? $paid : 0)); + $participate = true; + $paid_updated = true; + } else { // we do not store non-subscription to event items + echo "je me desinscris "; + XDB::execute('DELETE FROM group_event_participants + WHERE eid = {?} AND uid = {?} AND item_id = {?}', + $eid, $uid, $item_id); + } + $updated = true; + } + } else { // if no old subscription + echo 'no prev '; + if ($subs[$item_id] != 0) { + echo 'subscribe '; + XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) + VALUES ({?}, {?}, {?}, {?}, {?}, {?})', + $eid, $uid, $item_id, $subs[$item_id], '', 0); + $participate = true; + $updated = true; + } + } + } + // item 0 stores whether the user participates globally or not, if he has to be notified when payment is created and his manual payment + /* + if (array_key_exists(0, $old_subs)) { + XDB::execute('UPDATE group_event_participants + SET nb = {?} + WHERE eid = {?}, uid = {?}, item_id = 0', + ($participate ? 1 : 0), $eid, $uid); + } else { + XDB::execute('INSERT INTO group_event_participants (eid, uid, item_id, nb, flags, paid) + VALUES ({?}, {?}, {?}, {?}, {?}, {?})', + $eid, $uid, 0, ($participate ? 1 : 0), (Env::has('notify_payment') ? 'notify_payment' : ''), 0); + } + */ + // if subscription is updated, we have to update the event aliases + if ($updated) { + echo "inscription mise a jour "; + $short_name = get_event_detail($eid)['short_name']; + subscribe_lists_event($uid, $short_name, ($participate ? 1 : -1), 0); + } + return $updated; +} +// }}} + +// TODO : correct this function to be compatible with subscribe() (use $eid, remove useless argument) +// TODO : correct other calls // {{{ function subscribe_lists_event() /** Subscribes user to various event related mailing lists. * @@ -324,13 +515,14 @@ function event_change_shortname($page, $eid, $old, $new) // }}} // {{{ function make_event_date() -function make_event_date(&$e) +function make_event_date($debut, $fin) { - $start = strtotime($e['debut']); - $end = strtotime($e['fin']); - $first_day = $e['first_day']; - $last_day = $e['last_day']; - + $start = strtotime($debut); + $end = strtotime($fin); +// $first_day = $e['first_day']; +// $last_day = $e['last_day']; + $first_day = strftime("%d %B %Y", $start); + $last_day = strftime("%d %B %Y", $end); $date = ""; if ($start && $end != $start) { if ($first_day == $last_day) { @@ -343,7 +535,7 @@ function make_event_date(&$e) } else { $date .= "le " . strftime("%d %B %Y à %H:%M", $start); } - $e['date'] = $date; + return $date; } // }}} diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl index 833db76..962fdaa 100644 --- a/templates/xnetevents/index.tpl +++ b/templates/xnetevents/index.tpl @@ -47,7 +47,7 @@ {if $archive}Archives {else}[Archives] {/if} -{if $updated} +{if t($updated) && $updated}

La modification de l'inscription a été prise en compte ! {if $updated.topay > $updated.paid} @@ -70,15 +70,14 @@ {/if} {/if} -{foreach from=$evenements item=e} - +{foreach from=$evenements key=eid item=e}
- + {icon name=calendar_view_day title="Événement iCal"} {$e.intitule} @@ -87,11 +86,11 @@ {/if} {if $is_admin}
- [ + [ modifier {icon name=date_edit title="Édition de l'événement"}]   - [ + [ {if !$archive} archiver {icon name=package_add title="Archivage"}] @@ -100,7 +99,7 @@ {icon name=package_delete title="Désarchivage"}] {/if}   - [ supprimer {icon name=delete title='Suppression'}] @@ -123,7 +122,7 @@
Informations : {if $is_admin || $e.show_participants} - + consulter la liste des participants {icon name=group title="Liste des participants"}
@@ -140,18 +139,18 @@
État inscription : {if $e.inscr_open} - + {/if} {if !$e.inscrit} Non inscrit
{else} - {foreach from=$e.moments item=m} - {if !$m.nb} + {foreach from=$e.items key=item_id item=m} + {if !t($e.sub.$item_id) || !$e.sub.$item_id.nb} Tu ne viendras pas {else} - Tu as inscrit {$m.nb} personne{if $m.nb > 1}s{/if} + Tu as inscrit {$e.sub.$item_id.nb} personne{if $e.sub.$item_id.nb > 1}s{/if} {/if} à {$m.titre}.
{/foreach} {/if} @@ -166,7 +165,7 @@ {else} Tu as déjà payé les {$e.paid|replace:'.':','} € de ton inscription. {/if} - {if $e.paiement_id && $e.paid < $e.topay} + {if t($e.paiement_id) && $e.paid < $e.topay} [ Payer en ligne] {/if} @@ -179,7 +178,7 @@
- + Gérer mon inscription et voir les détails de l'événement. diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl index 0fcbe11..20ec3d4 100644 --- a/templates/xnetevents/subscribe.tpl +++ b/templates/xnetevents/subscribe.tpl @@ -27,9 +27,8 @@

- {assign var=profile value=$event.organizer->profile()} Cet événement a lieu {$event.date} et a été proposé par - + {$event.organizer->fullName('promo')} .

@@ -38,20 +37,20 @@ {$event.descriptif|nl2br}

-{if $admin || $event.show_participants} +{if $is_admin || $event.show_participants}

Tu peux - + consulter la liste des participants {icon name=group title="Liste des participants"} déjà inscrits.

{/if} -
+ {xsrf_token_field} - {foreach from=$event.moments item=m} + {foreach from=$moments key=item_id item=m} {if $m.details} @@ -63,22 +62,23 @@ @@ -88,22 +88,22 @@ -- 2.1.4
{$m.titre} ({$m.montant} €)
{if $event.inscr_open} -
- {if $event.noinvite} - + {assign var=nb value=$subs.$item_id.nb} +
+ {if $event.accept_nonmembre} + {else} - - + + {/if} {else} - {if !$m.nb} + {if !$nb} Je ne viendrai pas. {else} - J'ai inscrit {$m.nb} personne{if $m.nb > 1}s{/if}. + J'ai inscrit {$nb} personne{if $nb > 1}s{/if}. {/if} {/if}
À payer
- {if $event.topay} -
- {if $event.paid eq 0} - Tu dois payer {$event.topay|replace:'.':','} €. - {elseif $event.paid < $event.topay} - Tu dois encore payer {math equation="a-b" a=$event.topay b=$event.paid|replace:'.':','} € - (tu as déjà payé {$event.paid|replace:'.':','} €). + {if $topay} +
+ {if $paid eq 0} + Tu dois payer {$topay|replace:'.':','} €. + {elseif $paid < $topay} + Tu dois encore payer {math equation="a-b" a=$topay b=$paid|replace:'.':','} € + (tu as déjà payé {$paid|replace:'.':','} €). {else} - Tu as déjà payé {$event.paid|replace:'.':','} € pour ton inscription. + Tu as déjà payé {$paid|replace:'.':','} € pour ton inscription. {/if}
- {if $event.paiement_id && $event.paid < $event.topay} - + {if $event.paiement_id && $paid < $topay} + {icon name=money} Payer en ligne - {elseif $validation && $event.paid < $event.topay} + {elseif $validation && $paid < $topay}
Le télépaiement pour cet événement est en instance de validation :
@@ -111,8 +111,8 @@
{else} Rien à payer - {if $event.paid > 0} - (tu as déjà payé {$event.paid|replace:'.':','} €). + {if $paid > 0} + (tu as déjà payé {$paid|replace:'.':','} €). {/if}. {/if}