X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=76abf6cad048df6a64c45fcf9681d80dfd509a39;hb=1aff3b59c0f46dafe3396c1123a252645805e233;hp=fd64cf1aa406ec95bdf7eff298cb26c4f1ecab09;hpb=a507867b187fd7621599e80a15724e670e737628;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index fd64cf1..76abf6c 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ 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, $archive); $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) @@ -739,7 +711,7 @@ class XnetEventsModule extends PLModule XDB::fetchAllAssoc('SELECT t.uid, t.amount FROM payment_transactions AS t LEFT JOIN group_event_participants AS ep ON(ep.uid = t.uid AND ep.eid = {?}) - WHERE t.ref = {?} AND ep.uid IS NULL', + WHERE t.status = "confirmed" AND t.ref = {?} AND ep.uid IS NULL', $evt['eid'], $evt['paiement_id']), 'uid', 'user'); $page->assign('oublis', count($infos)); @@ -778,5 +750,5 @@ class XnetEventsModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>