Merge commit 'origin/master' into fusionax

[platal.git] / modules / payment / money / paypal.inc.php

diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php
index 8b4060e..a32d05c 100644 (file)
--- a/modules/payment/money/paypal.inc.php
+++ b/modules/payment/money/paypal.inc.php
@@ -75,7 +75,7 @@ class PayPal
         $info_client = Array(
             'first_name' => S::v('prenom'),
             'last_name'  => $name,
-            'email'      => S::v('bestalias').'@' . $globals->mail->domain);
+            'email'      => S::user()->bestEmail());
 
         $res = XDB::query(
             "SELECT a.adr1 AS address1, a.adr2 AS address2,
@@ -90,7 +90,6 @@ class PayPal
         $this->infos['client'] = array_map('replace_accent', array_merge($info_client, $res->fetchOneAssoc()));
 
         // on constuit la reference de la transaction
-        require_once 'xorg.misc.inc.php';
         $prefix = ($pay->flags->hasflag('unique')) ? str_pad("",15,"0") : rand_url_id();
         $fullref = substr("$prefix-xorg-{$pay->id}",-15);