From 8bac35d8a8062f623c09853232422107f4c4621b Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Thu, 15 Nov 2007 13:18:21 +0100 Subject: [PATCH] Another payment computation bug. Signed-off-by: Florent Bruneau --- modules/xnetevents.php | 4 +++- modules/xnetevents/xnetevents.inc.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/xnetevents.php b/modules/xnetevents.php index 67cf352..d90b44d 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -231,12 +231,14 @@ class XnetEventsModule extends PLModule $updated = false; $total = 0; $paid = $evt['paid'] ? $evt['paid'] : 0; + $telepaid= $evt['telepaid'] ? $evt['telepaid'] : 0; foreach ($subs as $j => $nb) { if ($nb >= 0) { XDB::execute( "REPLACE INTO groupex.evenements_participants VALUES ({?}, {?}, {?}, {?}, {?}, {?})", - $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', $paid); + $eid, S::v('uid'), $j, $nb, Env::has('notify_payment') ? 'notify_payment' : '', + $j == 1 ? $paid - $telepaid : 0); $updated = $eid; } else { XDB::execute( diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 774eeac..cb3aba5 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -97,9 +97,11 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) WHERE ref = {?} AND uid = {?}", $evt['paiement_id'], S::v('uid')); $montants = $req->fetchColumn(); + $evt['telepaid'] = 0; foreach ($montants as $m) { $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); $evt['paid'] += trim($p); + $evt['telepaid'] += trim($p); } return $evt; -- 2.1.4