X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetevents.php;h=a9d4d1ca3a6945678c78ade7626965fb95098d11;hb=ad47a0aa4c6a13b4e4d051f7159641204707d11c;hp=8af4c898f95e25592ba157c0217f994f074e139a;hpb=76362eeb011de4f2cd7825f557643a72494475f9;p=platal.git diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 8af4c89..a9d4d1c 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ $this->make_hook('events', AUTH_MDP), - '%grp/events/sub' => $this->make_hook('sub', AUTH_MDP), - '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP, 'user', NO_HTTPS), - '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP, 'user', NO_HTTPS), - '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), - '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP, 'groupmember'), + '%grp/events' => $this->make_hook('events', AUTH_PASSWD, 'groups'), + '%grp/events/sub' => $this->make_hook('sub', AUTH_PASSWD, 'groups'), + '%grp/events/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/ical' => $this->make_hook('ical', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), + '%grp/events/admin' => $this->make_hook('admin', AUTH_PASSWD, 'groupmember'), ); } @@ -73,13 +73,23 @@ class XnetEventsModule extends PLModule if ($action == 'del') { // deletes the event mailing aliases if ($tmp[1]) { - foreach (array('-absents@', '-participants@', '-paye@', '-participants-non-paye@') as $v) { - XDB::execute("DELETE FROM virtual - WHERE type = 'evt' AND alias LIKE {?}", - $tmp[1] . $v . '%'); + require_once 'emails.inc.php'; + foreach (explode(',', $globals->xnet->event_lists) as $suffix) { + delete_list_alias($tmp[1] . $suffix, $globals->xnet->evts_domain, 'event'); } } + // archive le paiement associé si il existe + $pay_id = XDB::fetchOneCell("SELECT paiement_id + FROM group_events + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if (!$pay_id=='') { + XDB::execute("UPDATE payments + SET flags = 'old' + WHERE id = {?}", + $pay_id); + } // deletes the event items XDB::execute('DELETE FROM group_event_items WHERE eid = {?}', $eid); @@ -101,13 +111,32 @@ class XnetEventsModule extends PLModule } if ($action == 'archive') { + $pay_id = XDB::fetchOneCell("SELECT paiement_id + FROM group_events + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if (!$pay_id=='') { + XDB::execute("UPDATE payments + SET flags = 'old' + WHERE id = {?}", + $pay_id); + } XDB::execute("UPDATE group_events SET archive = 1 WHERE eid = {?} AND asso_id = {?}", - $eid, $globals->asso('id')); + $eid, $globals->asso('id')); } if ($action == 'unarchive') { + $pay_id = XDB::fetchOneCell("SELECT paiement_id FROM group_events + WHERE eid = {?} AND asso_id = {?}", + $eid, $globals->asso('id')); + if (!$pay_id=='') { + XDB::execute("UPDATE payments + SET flags = '' + WHERE id = {?}", + $pay_id); + } XDB::execute("UPDATE group_events SET archive = 0 WHERE eid = {?} AND asso_id = {?}", @@ -115,18 +144,46 @@ class XnetEventsModule extends PLModule } $page->assign('archive', $archive); - $evenements = XDB::iterator('SELECT e.*, LEFT(10, e.debut) AS first_day, LEFT(10, e.fin) 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); + + if (Post::has('order')) { + $order = Post::v('order'); + XDB::execute("UPDATE groups + 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); + } + $page->assign('order', $order); $evts = array(); $undisplayed_events = 0; @@ -147,21 +204,17 @@ class XnetEventsModule extends PLModule S::i('uid'), $e['eid']); $e['topay'] = 0; - $e['paid'] = $e['moments'][0]['paid']; + $e['paid'] = 0; foreach ($e['moments'] as $m) { $e['topay'] += $m['nb'] * $m['montant']; + $e['paid'] += $m['paid']; } - $query = XDB::query( - "SELECT amount + $montant = XDB::fetchOneCell( + "SELECT SUM(amount) as sum_amount FROM payment_transactions AS t WHERE ref = {?} AND uid = {?}", $e['paiement_id'], S::v('uid')); - $montants = $query->fetchColumn(); - - foreach ($montants as $m) { - $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); - $e['paid'] += trim($p); - } + $e['paid'] += $montant; make_event_date($e); @@ -222,13 +275,13 @@ class XnetEventsModule extends PLModule foreach ($moments as $j => $v) { $subs[$j] = intval($v); - // retreive ohter field when more than one person + // 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] = 1 + $pers[$j]; + $subs[$j] = $pers[$j]; } } @@ -243,18 +296,20 @@ class XnetEventsModule extends PLModule } // update actual inscriptions - $updated = false; - $total = 0; - $paid = $evt['paid'] ? $evt['paid'] : 0; - $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0; + $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' : ''), - ($j == 1 ? $paid - $telepaid : 0)); + ((!$paid_inserted) ? $paid - $telepaid : 0)); $updated = $eid; + $paid_inserted = true; } else { XDB::execute( "DELETE FROM group_event_participants @@ -265,8 +320,13 @@ class XnetEventsModule extends PLModule $total += $nb; } if ($updated !== false) { - $page->trigSuccess('Ton inscription à l\'événement a été mise à jour avec succès.'); - subscribe_lists_event(S::i('uid'), $evt, ($total > 0 ? 1 : 0), 0); + $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'); @@ -303,21 +363,62 @@ class XnetEventsModule extends PLModule return PL_NOT_FOUND; } - pl_cached_content_headers('text/x-csv', 1); + pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1); $page->changeTpl('xnetevents/csv.tpl', NO_SKIN); $admin = may_update(); - $tri = (Env::v('order') == 'alpha' ? UserFilter::sortByPromo() : UserFilter::sortByName()); + $all = !Env::v('item_id', false); - $page->assign('participants', - get_event_participants($evt, $item_id, $tri)); + $participants = get_event_participants($evt, $item_id, $tri); + $title = 'Nom;Prénom;Promotion;Email'; + if ($admin) { + $title .=';Société;Poste'; + } + if ($all) { + foreach ($evt['moments'] as $moment) { + $title .= ';' . $moment['titre']; + } + } + if ($admin && $evt['money']) { + $title .= ';À payer;'; + if ($evt['paiement_id']) { + $title .= 'Télépaiement;Liquide/Chèque;'; + } + $title .= 'Payé'; + } else { + $title .= ';Nombre'; + } + echo utf8_decode($title) . "\n"; + + if ($participants) { + foreach ($participants as $participant) { + $user = $participant['user']; + $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo() . ';' . $user->bestEmail(); + if ($admin && $user->hasProfile()) { + $line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description; + } else { + $line .= ';;'; + } + if ($all) { + foreach ($evt['moments'] as $moment) { + $line .= ';' . $participant[$moment['item_id']]; + } + } + if ($admin && $evt['money']) { + $line .= ';' . $participant['montant'] . ';'; + if ($evt['paiement_id']) { + $line .= $participant['telepayment'] . ';' . $participant['adminpaid'] . ';'; + } + $line .= $participant['paid']; + } else { + $line .= ';' . $participant['nb']; + } - $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)); + echo utf8_decode($line) . "\n"; + } + } + exit(); } function handler_ical($page, $eid = null) @@ -466,23 +567,25 @@ class XnetEventsModule extends PLModule // request for a new payment if (Post::v('paiement_id') == -1 && $money_defaut >= 0) { $p = new PayReq(S::user(), - Post::v('intitule')." - ".$globals->asso('nom'), + $globals->asso('nom')." - ".Post::v('intitule'), Post::v('site'), $money_defaut, Post::v('confirmation'), 0, 999, - $globals->asso('id'), $eid); + $globals->asso('id'), $eid, Post::v('payment_public') == 'yes'); if ($p->accept()) { $p->submit(); } else { - $page->assign('paiement_message', Post::v('confirmation')); - $page->assign('paiement_site', Post::v('site')); + $page->assign('payment_message', Post::v('confirmation')); + $page->assign('payment_site', Post::v('site')); + $page->assign('payment_public', Post::v('payment_public') == 'yes'); + $page->assign('error', true); $error = true; } } - // events with no sub-event: add a sub-event with no name + // events with no sub-event: add a sub-event with default name if ($nb_moments == 0) { XDB::execute("INSERT INTO group_event_items - VALUES ({?}, {?}, '', '', 0)", $eid, 1); + VALUES ({?}, {?}, 'Événement', '', 0)", $eid, 1); } if (!$error) { @@ -491,9 +594,10 @@ class XnetEventsModule extends PLModule } // get a list of all the payment for this asso - $res = XDB::iterator("SELECT id, text - FROM payments - WHERE asso_id = {?}", $globals->asso('id')); + $res = XDB::iterator("SELECT id, text + FROM payments + WHERE asso_id = {?} AND NOT FIND_IN_SET('old', flags)", + $globals->asso('id')); $paiements = array(); while ($a = $res->next()) $paiements[$a['id']] = $a['text']; { $page->assign('paiements', $paiements); @@ -512,7 +616,7 @@ class XnetEventsModule extends PLModule $res = XDB::query("SELECT stamp FROM requests WHERE type = 'paiements' AND data LIKE {?}", - PayReq::same_event($eid, $globals->asso('id'))); + PayReq::same_event($eid, $globals->asso('id'))); $stamp = $res->fetchOneCell(); if ($stamp) { $evt['paiement_id'] = -2; @@ -564,27 +668,42 @@ class XnetEventsModule extends PLModule $amount = strtr(Env::v('montant'), ',', '.'); XDB::execute("UPDATE group_event_participants SET paid = paid + {?} - WHERE uid = {?} AND eid = {?} AND item_id = 1", + WHERE uid = {?} AND eid = {?} AND nb > 0 + ORDER BY item_id ASC + LIMIT 1", $amount, $member->uid, $evt['eid']); - subscribe_lists_event($member->uid, $evt, 1, $amount); + subscribe_lists_event($member->uid, $evt['short_name'], 1, $amount); } // change the number of personns coming with a participant if (Env::v('adm') == 'nbs' && $member) { - $res = XDB::query("SELECT paid + $res = XDB::query("SELECT SUM(paid) FROM group_event_participants WHERE uid = {?} AND eid = {?}", $member->uid, $evt['eid']); - $paid = intval($res->fetchOneCell()); + $paid = $res->fetchOneCell(); + + // Ensure we have an integer + if ($paid == null) { + $paid = 0; + } + $nbs = Post::v('nb', array()); + $paid_inserted = false; foreach ($nbs as $id => $nb) { $nb = max(intval($nb), 0); + if (!$paid_inserted && $nb > 0) { + $item_paid = $paid; + $paid_inserted = true; + } else { + $item_paid = 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)', - $evt['eid'], $member->uid, $id, $nb, '', ($id == 1 ? $paid : 0)); + $evt['eid'], $member->uid, $id, $nb, '', $item_paid); } $res = XDB::query('SELECT COUNT(uid) AS cnt, SUM(nb) AS nb @@ -593,15 +712,15 @@ class XnetEventsModule extends PLModule GROUP BY uid', $member->uid, $evt['eid']); $u = $res->fetchOneAssoc(); - if ($u['cnt'] == 1 && $paid == 0 && Post::v('cancel')) { + if ($paid == 0 && Post::v('cancel')) { XDB::execute("DELETE FROM group_event_participants WHERE uid = {?} AND eid = {?}", $member->uid, $evt['eid']); $u = 0; - subscribe_lists_event($member->uid, $evt, -1, $paid); + subscribe_lists_event($member->uid, $evt['short_name'], -1, $paid); } else { $u = $u['cnt'] ? $u['nb'] : null; - subscribe_lists_event($member->uid, $evt, ($u > 0 ? 1 : 0), $paid); + subscribe_lists_event($member->uid, $evt['short_name'], ($u > 0 ? 1 : 0), $paid); } } @@ -636,8 +755,10 @@ class XnetEventsModule extends PLModule GROUP BY p.uid', $evt['eid']); $ofs = Env::i('offset'); - $tot = (is_null($evt['nb_tot']) ? $evt['nb'] : $evt['nb_tot']); - $nbp = ceil($tot / NB_PER_PAGE); + $part = get_event_participants($evt, $item_id, UserFilter::sortByName(), + NB_PER_PAGE, $ofs * NB_PER_PAGE); + + $nbp = ceil($evt['user_count'] / NB_PER_PAGE); if ($nbp > 1) { $links = array(); if ($ofs) { @@ -653,11 +774,9 @@ class XnetEventsModule extends PLModule } $page->assign('absents', $absents); - $page->assign('participants', - get_event_participants($evt, $item_id, UserFilter::sortByName(), - NB_PER_PAGE, $ofs * NB_PER_PAGE)); + $page->assign('participants', $part); } } -// 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: ?>