Fixes alternative payements given by admins in events (Closes #1577)

Signed-off-by: Brice Gelineau <brice.gelineau@polytechnique.org>

diff --git a/ChangeLog b/ChangeLog
index cd91140..886db4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Bug/Wish:
     * Search:
         - #1574: Correctly displays State corps                            -GLN
 
+    * XnetEvent:
+        - #1577: Fixes alternative payements given by admins               -GLN
+
 From 1.1.4 branch:
 
     * XnetEvent:

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 0dc18e3..f4c04ec 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -594,7 +594,9 @@ 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['short_name'], 1, $amount);
             }

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index dcc8d26..fe20a8e 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -79,7 +79,7 @@ function get_event_detail($eid, $item_id = false, $asso_id = null)
         if ($m['montant']) {
             $evt['money'] = true;
         }
-        $evt['paid']  = $m['paid'];
+        $evt['paid'] += $m['paid'];
         $evt['notify_payment'] = $evt['notify_payment'] || $m['notify_payment'];
     }