X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpayment.php;h=4fa064197d51f3fe55267edcd1230be997276b27;hb=4dcee20be6bd4ca928c54a6ae580f832b287777e;hp=b97b56926f5136f9ba3b65a0ecf2ac7f0e375c06;hpb=38813e10bde5b6729d38c51f239dc9362d8089d7;p=platal.git

diff --git a/modules/payment.php b/modules/payment.php
index b97b569..4fa0641 100644
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2013 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -251,7 +251,7 @@ class PaymentModule extends PLModule
         }
 
         /* on extrait la reference de la commande */
-        if (!ereg('-([0-9]+)$', Env::v('vads_order_id'), $matches)) {
+        if (!preg_match('/-([0-9]+)$/', Env::v('vads_order_id'), $matches)) {
             cb_erreur("référence de commande invalide");
         }
 
@@ -338,7 +338,7 @@ class PaymentModule extends PLModule
         /* raison */
         $reason = ($status == 'Pending') ? Env::s('pending_reason') : Env::s('reason_code');
         /* reference complete de la commande */
-        $fullref = Env::s('cm');
+        $fullref = str_replace('%2d','-',Env::s('cm'));
         /* montant de la transaction */
         $montant = Env::s('amt');
         /* devise */
@@ -362,7 +362,7 @@ class PaymentModule extends PLModule
         }
 
         /* on extrait la reference de la commande */
-        if (!ereg('-xorg-([0-9]+)$', $fullref, $matches)) {
+        if (!preg_match('/-xorg-([0-9]+)$/', $fullref, $matches)) {
             paypal_erreur("référence de commande invalide");
         }
 
@@ -934,7 +934,7 @@ class PaymentModule extends PLModule
                                  FROM  payment_transactions AS t
                             LEFT JOIN  payments             AS p ON (t.ref = p.id)
                             LEFT JOIN  groups               AS g ON (p.asso_id = g.id)
-                                WHERE  t.recon_id IN {?}
+                                WHERE  t.recon_id IN {?} AND t.status = "confirmed"
                              GROUP BY  t.ref',
                          $recongp_id, $recon_ids);
 
@@ -1005,7 +1005,7 @@ class PaymentLogsImporter extends CSVImporter {
 
     static public function compute_systempay_commission($line, $key, $relation) {
         static $EEE_countries = array(
-            'France', 'Allemagne', 'Autriche', 'Belgique', 'Bulgarie', 'Chypre', 'Suisse',
+            'France', 'Allemagne', 'Autriche', 'Belgique', 'Bulgarie', 'Chypre', 'Croatie',
             'Danemark', 'Espagne', 'Estonie', 'Finlande', 'Grèce', 'Hongrie', 'Irlande', 'Islande', 'Italie',
             'Lettonie', 'Liechtenstein', 'Lituanie', 'Luxembourg', 'Malte', 'Norvège', 'Pays-Bas', 'Pologne',
             'Portugal', 'Roumanie', 'Royaume-Uni', 'Slovaquie', 'Slovénie', 'Suède', 'République Tchèque'
@@ -1018,7 +1018,7 @@ class PaymentLogsImporter extends CSVImporter {
         if (in_array($line['pays carte'], $EEE_countries)) {
             return -0.20 - round($amount * 0.005, 2);
         } else {
-            return -0.20 - round($amount * 0.005, 2) - 0.76;
+            return -0.20 - round($amount * 0.005, 2) - 0.75;
         }
     }
 
@@ -1027,7 +1027,7 @@ class PaymentLogsImporter extends CSVImporter {
             return null;
         }
         $reference = self::getValue($line, 'reference', $relation['reference']);
-        if (ereg('-([0-9]+)$', $reference, $matches)) {
+        if (preg_match('/-([0-9]+)$/', $reference, $matches)) {
             return $matches[1];
         } else {
             return null;
@@ -1035,5 +1035,5 @@ class PaymentLogsImporter extends CSVImporter {
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>