X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment%2Fmoney.inc.php;h=e05238505882366503c22812179bbb0c2d90c4c3;hb=a81ee98706ff11231e6d708270e2fb1c97775650;hp=65cdf6a9ff3dc95f814b133475b811c229176c38;hpb=ebd515f95f03f8a87f9b846d65e179b39a535222;p=platal.git

diff --git a/modules/payment/money.inc.php b/modules/payment/money.inc.php
index 65cdf6a..e052385 100644
--- a/modules/payment/money.inc.php
+++ b/modules/payment/money.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -28,9 +28,9 @@ class Payment
     var $url;
     var $flags;
     var $mail;
-    var $montant_min;
-    var $montant_max;
-    var $montant_def;
+    var $amount_min;
+    var $amount_max;
+    var $amount_def;
     var $asso_id;
 
     var $api = null;
@@ -42,14 +42,14 @@ class Payment
     {
         global $globals;
         $r   = $ref==-1 ? $globals->money->mpay_def_id : $ref;
-        $res = XDB::query("SELECT  id, text, url, flags, mail, montant_min, montant_max, montant_def, asso_id
-                             FROM  {$globals->money->mpay_tprefix}paiements WHERE id={?}", $r);
+        $res = XDB::query("SELECT  id, text, url, flags, mail, amount_min, amount_max, amount_def, asso_id
+                             FROM  payments WHERE id={?}", $r);
         list($this->id, $this->text, $this->url, $flags, $this->mail,
-             $this->montant_min, $this->montant_max, $this->montant_def, $this->asso_id) = $res->fetchOneRow();
+             $this->amount_min, $this->amount_max, $this->amount_def, $this->asso_id) = $res->fetchOneRow();
 
-        $this->montant_min = (float)$this->montant_min;
-        $this->montant_max = (float)$this->montant_max;
-        $this->flags       = new Flagset($flags);
+        $this->amount_min = (float)$this->amount_min;
+        $this->amount_max = (float)$this->amount_max;
+        $this->flags       = new PlFlagSet($flags);
     }
 
     // }}}
@@ -58,10 +58,10 @@ class Payment
     function check($value)
     {
         $v = (float)strtr($value, ',', '.');
-        if ($this->montant_min > $v) {
-            return "Montant inférieur au minimum autorisé ({$this->montant_min}).";
-        } elseif ($v > $this->montant_max) {
-            return "Montant supérieur au maximum autorisé ({$this->montant_max}).";
+        if ($this->amount_min > $v) {
+            return "Montant inférieur au minimum autorisé ({$this->amount_min}).";
+        } elseif ($v > $this->amount_max) {
+            return "Montant supérieur au maximum autorisé ({$this->amount_max}).";
         } else {
             return true;
         }
@@ -88,9 +88,9 @@ class Payment
     {
         if ($this->asso_id) {
             $res = XDB::query("SELECT  e.eid, a.diminutif
-                                 FROM  groupex.evenements AS e
-                           INNER JOIN  groupex.asso AS a ON (e.asso_id = a.id)
-                            LEFT JOIN  groupex.evenements_participants AS p ON (p.eid = e.eid AND p.uid = {?})
+                                 FROM  group_events AS e
+                           INNER JOIN  groups AS a ON (e.asso_id = a.id)
+                            LEFT JOIN  group_event_participants AS p ON (p.eid = e.eid AND p.uid = {?})
                                 WHERE  e.paiement_id = {?} AND p.uid IS NULL", S::i('uid'), $this->id);
             if ($res->numRows()) {
                 return $res->fetchOneAssoc();
@@ -118,7 +118,7 @@ class PayMethod
     {
         global $globals;
         $i   = $id==-1 ? $globals->money->mpay_def_meth : $id;
-        $res = XDB::query("SELECT id,text,include FROM {$globals->money->mpay_tprefix}methodes WHERE id={?}", $i);
+        $res = XDB::query("SELECT id,text,include FROM payment_methods WHERE id={?}", $i);
         list($this->id, $this->text, $this->inc) = $res->fetchOneRow();
     }