projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
[platal.git]
/
modules
/
payment.php
diff --git
a/modules/payment.php
b/modules/payment.php
index
8f928a5
..
39f8193
100644
(file)
--- a/
modules/payment.php
+++ b/
modules/payment.php
@@
-334,13
+334,13
@@
class PaymentModule extends PLModule
echo "Paiement stored.\n";
// We check if it is an Xnet payment and then update the related ML.
echo "Paiement stored.\n";
// We check if it is an Xnet payment and then update the related ML.
- $res = XDB::query('SELECT eid
+ $res = XDB::query('SELECT eid
, asso_id
FROM group_events
WHERE paiement_id = {?}', $ref);
if ($res->numRows() == 1) {
FROM group_events
WHERE paiement_id = {?}', $ref);
if ($res->numRows() == 1) {
-
$eid = $res->fetchOneCell
();
+
list($eid, $asso_id) = $res->fetchOneRow
();
require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
require_once dirname(__FILE__) . '/xnetevents/xnetevents.inc.php';
- $evt = get_event_detail($eid);
+ $evt = get_event_detail($eid
, false, $asso_id
);
subscribe_lists_event($user->id(), $evt, 1, $amount, true);
}
subscribe_lists_event($user->id(), $evt, 1, $amount, true);
}
@@
-483,7
+483,7
@@
class PaymentModule extends PLModule
}
$res = XDB::query("SELECT 1
FROM group_events AS e
}
$res = XDB::query("SELECT 1
FROM group_events AS e
- INNER JOIN group_event_participants AS ep ON (ep.eid = e.eid AND uid = {?})
+ INNER JOIN group_event_participants AS ep ON (ep.eid = e.eid AND
e.
uid = {?})
WHERE e.paiement_id = {?} AND e.asso_id = {?}",
S::i('uid'), $pid, $globals->asso('id'));
if ($res->numRows() == 0) {
WHERE e.paiement_id = {?} AND e.asso_id = {?}",
S::i('uid'), $pid, $globals->asso('id'));
if ($res->numRows() == 0) {