Handle canceled payment transactions.

[platal.git] / modules / xnetevents / xnetevents.inc.php

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index 9dbded9..15e8125 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -57,9 +57,16 @@ function get_events($asso_id, $order, $archive)
 /* get event details
  * @param $eid: event's id
  */
-function get_event($eid)
+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
+    if (!is_numeric($eid)) {
+        $id = XDB::fetchOneCell("SELECT eid
+                                   FROM group_events
+                                  WHERE short_name = {?}",
+                                        $eid);
+        $eid = $id;
+    }
+    $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre, ge.noinvite, ge.paiement_id
                                          FROM group_events as ge
                                         WHERE eid = {?}',
                                         $eid);
@@ -68,7 +75,7 @@ function get_event($eid)
     } else {
         $evt['inscr_open'] = true;
     }
-    $evt['organizer'] = User::getSilent($evt['uid'])->profile();
+    $evt['organizer'] = User::getSilent($evt['uid']);
     $evt['date'] = make_event_date($evt['debut'], $evt['fin']);
 
     return $evt;
@@ -121,7 +128,7 @@ 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 = {?}', 
+                                   WHERE pt.status = "confirmed" AND ge.eid = {?} AND pt.uid = {?}',
                                          $eid, $uid);
     return $telepaid;
 }
@@ -198,7 +205,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
 
     $montant = XDB::fetchOneCell('SELECT  SUM(amount) AS sum_amount
                                     FROM  payment_transactions AS t
-                                   WHERE  ref = {?} AND uid = {?}',
+                                   WHERE  status = "confirmed" AND ref = {?} AND uid = {?}',
                                    $evt['paiement_id'], S::v('uid'));
     $evt['telepaid'] = $montant;
     $evt['paid'] += $montant;
@@ -251,7 +258,7 @@ function get_event_participants(&$evt, $item_id, array $tri = array(), $limit =
         if ($money && $pay_id) {
             $montant = XDB::fetchOneCell('SELECT  SUM(amount)
                                             FROM  payment_transactions AS t
-                                           WHERE  ref = {?} AND uid = {?}',
+                                           WHERE  status = "confirmed" AND ref = {?} AND uid = {?}',
                                          $pay_id, $uid);
             $u['paid'] += $montant;
         }
@@ -304,7 +311,6 @@ function subscribe($uid, $eid, $subs = array())
             // compares new and old subscription
             if ($old_subs[$item_id]['nb'] != $subs[$item_id]) {
                 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)',