From: Nicolas Iooss Date: Sun, 9 Mar 2014 17:31:29 +0000 (+0100) Subject: Revert "Rewrites xnetevents subscription page." X-Git-Tag: xorg/1.1.13~15^2~16 X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=6c615821baef0daad2d1d8d7ef988be146da58e3 Revert "Rewrites xnetevents subscription page." This reverts commit a624ad230e565adfc3edde098b802cabc8f31880. Administration links don't work on the production website --- diff --git a/modules/xnetevents.php b/modules/xnetevents.php index ba8fec5..38e4a28 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -207,17 +207,12 @@ class XnetEventsModule extends PLModule $this->load('xnetevents.inc.php'); $page->changeTpl('xnetevents/subscribe.tpl'); - $evt = get_event($eid); + $evt = get_event_detail($eid); if (is_null($evt)) { return PL_NOT_FOUND; } - - global $globals; - - if (!$evt['inscr_open']) { - $page->kill('Les inscriptions pour cet événement sont closes'); - } - if (!$evt['accept_nonmembre'] && !is_member() && !may_update()) { + if ($evt === false) { + global $globals, $platal; $url = $globals->asso('sub_url'); if (empty($url)) { $url = $platal->ns . 'subscribe'; @@ -226,100 +221,107 @@ 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($eid, $globals->asso('id'))); + PayReq::same_event($evt['eid'], $globals->asso('id'))); $page->assign('validation', $res->numRows()); - - $page->assign('eid', $eid); $page->assign('event', $evt); - $items = get_event_items($eid); - $subs = get_event_subscription($eid, S::v('uid')); - - if (Post::has('submit')) { + if (!Post::has('submit')) { + return; + } else { 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]; + } + + $moments = Post::v('moment', array()); + $pers = Post::v('personnes', array()); + $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]; } + } - // 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']; - } + // 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; } - // 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; + $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'); } else { - // update actual inscriptions - $updated = subscribe(S::v('uid'), $eid, $subs); + $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); } - 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.'); - } + subscribe_lists_event(S::i('uid'), $evt['short_name'], ($total > 0 ? 1 : 0), 0); - 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(); } } - $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); + $page->assign('event', get_event_detail($eid)); } function handler_csv($page, $eid = null, $item_id = null) diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 558686b..7dd1ae1 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -43,7 +43,7 @@ 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 + $evts = XDB::fetchAllAssoc('eid', "SELECT ge.eid, ge.uid, ge.intitule, ge.debut, ge.fin, ge.show_participants, ge.deadline_inscription, ge.accept_nonmembre FROM group_events as ge WHERE asso_id = {?} ORDER BY ge.debut $order", @@ -58,7 +58,7 @@ function get_events($asso_id, $order) */ 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 + $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre FROM group_events as ge WHERE eid = {?}', $eid); @@ -273,90 +273,6 @@ 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. * diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl index 20ec3d4..0fcbe11 100644 --- a/templates/xnetevents/subscribe.tpl +++ b/templates/xnetevents/subscribe.tpl @@ -27,8 +27,9 @@

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

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

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