X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=6cd2b14397f90daad9ed4b86dc9b396502f69b36;hb=787bb3d745141f2f85bd947ad7dd775d2c63f908;hp=b4d3b69981fafcbf7621f33b115edb816ebe63b6;hpb=924231449d16c87d373b7cce27efcf787ee3dcbc;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index b4d3b69..6cd2b14 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -1,6 +1,6 @@ addTo("telepaiement@polytechnique.org"); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)"); + $mymail = new PlMailer(); + $mymail->addTo($globals->money->email); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->setSubject("erreur lors d'un télépaiement (CyberPaiement)"); $mymail->setTxtBody("\n\n".var_export($_REQUEST,true)); $mymail->send(); exit; } /* sort en affichant une erreur */ -function paypal_erreur($text, $send=true) { +function paypal_erreur($text, $send=true) +{ global $page, $erreur; if ($erreur) return; $erreur = $text; if (!$send) return; - $mymail = new HermesMailer(); - $mymail->addTo("telepaiement@polytechnique.org"); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->setSubject("erreur lors d'un télépaiement (PayPal)"); + $mymail = new PlMailer(); + $mymail->addTo($globals->money->email); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->setSubject("erreur lors d'un télépaiement (PayPal)"); $mymail->setTxtBody("\n\n".var_export($_REQUEST,true)); $mymail->send(); @@ -58,7 +59,7 @@ function luhn($nombre) { return $sum % 10; } -/* calcule la clé d'acceptation a partir de 5 champs */ +/* calcule la clé d'acceptation a partir de 5 champs */ function cle_accept($d1,$d2,$d3,$d4,$d5) { $m1 = luhn($d1.$d5); @@ -77,9 +78,14 @@ class PaymentModule extends PLModule { return array( 'payment' => $this->make_hook('payment', AUTH_MDP), - 'payment/cyber_return' => $this->make_hook('cyber_return', AUTH_PUB), - 'payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUB), + 'payment/cyber_return' => $this->make_hook('cyber_return', AUTH_PUBLIC), + 'payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC), + '%grp/paiement' => $this->make_hook('xnet_payment', AUTH_MDP, 'groupmember'), + '%grp/payment' => $this->make_hook('xnet_payment', AUTH_MDP, 'groupmember'), + '%grp/payment/cyber_return' => $this->make_hook('cyber_return', AUTH_PUBLIC), + '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC), 'admin/payments' => $this->make_hook('admin', AUTH_MDP, 'admin'), + ); } @@ -88,10 +94,22 @@ class PaymentModule extends PLModule global $globals; require_once 'profil.func.inc.php' ; - require_once 'money.inc.php' ; + require_once dirname(__FILE__).'/payment/money.inc.php' ; + if (!empty($GLOBALS['IS_XNET_SITE'])) { + if (!$globals->asso('id')) { + return PL_NOT_FOUND; + } + $res = XDB::query("SELECT asso_id + FROM paiement.paiements + WHERE asso_id = {?} AND id = {?}", + $globals->asso('id'), $ref); + if (!$res->numRows()) { + return PL_FORBIDDEN; + } + } $page->changeTpl('payment/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Télépaiements'); + $page->assign('xorg_title','Polytechnique.org - Télépaiements'); // initialisation $op = Env::v('op', 'select'); @@ -99,7 +117,7 @@ class PaymentModule extends PLModule $pay = new Payment($ref); if($pay->flags->hasflag('old')){ - $page->trig("La transaction selectionnée est périmée."); + $page->trig("La transaction selectionnée est périmée."); $pay = new Payment(); } $val = Env::v('montant') != 0 ? Env::v('montant') : $pay->montant_def; @@ -113,16 +131,17 @@ class PaymentModule extends PLModule $pay->prepareform($pay); } else { $res = XDB::iterator("SELECT timestamp, montant - FROM paiement.transactions - WHERE uid = {?} AND ref = {?} - ORDER BY timestamp DESC", - S::v('uid', -1), $ref); + FROM paiement.transactions + WHERE uid = {?} AND ref = {?} + ORDER BY timestamp DESC", + S::v('uid', -1), $ref); if ($res->total()) $page->assign('transactions', $res); } $val = floor($val).".".substr(floor(($val - floor($val))*100+100),1); $page->assign('montant',$val); + $page->assign('comment',Env::v('comment')); $page->assign('meth', $meth); $page->assign('pay', $pay); @@ -133,27 +152,25 @@ class PaymentModule extends PLModule function handler_cyber_return(&$page, $uid = null) { - require_once 'diogenes/diogenes.hermes.inc.php'; - /* reference banque (numero de transaction) */ - $champ901 = clean_request('CHAMP901'); + $champ901 = Env::s('CHAMP901'); /* cle d'acceptation */ - $champ905 = clean_request('CHAMP905'); + $champ905 = Env::s('CHAMP905'); /* code retour */ - $champ906 = clean_request('CHAMP906'); + $champ906 = Env::s('CHAMP906'); /* email renvoye par la banque */ - $champ104 = clean_request('CHAMP104'); + $champ104 = Env::s('CHAMP104'); /* reference complete de la commande */ - $champ200 = clean_request('CHAMP200'); + $champ200 = Env::s('CHAMP200'); /* montant de la transaction */ - $champ201 = clean_request('CHAMP201'); + $champ201 = Env::s('CHAMP201'); /* devise */ - $champ202 = clean_request('CHAMP202'); + $champ202 = Env::s('CHAMP202'); $montant = "$champ201 $champ202"; /* on extrait les informations sur l'utilisateur */ $res = XDB::query(" - SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme') + SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags) FROM auth_user_md5 AS a INNER JOIN aliases AS l ON (a.user_id=l.id AND type!='homonyme') WHERE a.user_id={?}", $uid); @@ -164,54 +181,55 @@ class PaymentModule extends PLModule /* on extrait la reference de la commande */ if (!ereg('-xorg-([0-9]+)$',$champ200,$matches)) { - cb_erreur("référence de commande invalide"); + cb_erreur("référence de commande invalide"); } echo ($ref = $matches[1]); - $res = XDB::query("SELECT mail,text,confirmation - FROM paiement.paiements WHERE id={?}", $ref); + $res = XDB::query("SELECT mail,text,confirmation + FROM paiement.paiements + WHERE id={?}", $ref); if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { - cb_erreur("référence de commande inconnue"); + cb_erreur("référence de commande inconnue"); } /* on extrait le code de retour */ if ($champ906 != "0000") { $res = XDB::query("SELECT rcb.text,c.id,c.text - FROM paiement.codeRCB AS rcb - LEFT JOIN paiement.codeC AS c ON rcb.codeC=c.id - WHERE rcb.id='$champ906'"); + FROM paiement.codeRCB AS rcb + LEFT JOIN paiement.codeC AS c ON rcb.codeC=c.id + WHERE rcb.id='$champ906'"); if (list($rcb_text, $c_id, $c_text) = $res->fetchOneRow()) { cb_erreur("erreur lors du paiement : $c_text ($c_id)"); - } else{ + } else{ cb_erreur("erreur inconnue lors du paiement"); } } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle) - VALUES ({?},{?},{?},{?},{?},{?})", - $champ901, $uid, $ref, $champ200, $montant, $champ905); + XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) + VALUES ({?},{?},{?},{?},{?},{?},{?})", + $champ901, $uid, $ref, $champ200, $montant, $champ905,Env::v('comment')); /* on genere le mail de confirmation */ $conf_text = str_replace("",$prenom,$conf_text); $conf_text = str_replace("",$nom,$conf_text); $conf_text = str_replace("",$promo,$conf_text); $conf_text = str_replace("",$montant,$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $mymail = new HermesMailer(); + $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); + $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>'); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); - $mymail->setTxtBody($conf_text); - $mymail->send(); + $mymail->setWikiBody($conf_text); + $mymail->send(S::v('mail_fmt') == 'html'); - /* on envoie les details de la transaction à telepaiement@ */ - $mymail = new HermesMailer(); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->addTo("telepaiement@polytechnique.org"); + /* on envoie les details de la transaction à telepaiement@ */ + $mymail = new PlMailer(); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->addTo($globals->money->email); $mymail->setSubject($conf_title); $msg = "utilisateur : $prenom $nom ($uid)\n". "mail : $forlife@polytechnique.org\n\n". @@ -228,22 +246,21 @@ class PaymentModule extends PLModule function handler_paypal_return(&$page, $uid = null) { $page->changeTpl('payment/retour_paypal.tpl'); - require_once 'diogenes/diogenes.hermes.inc.php'; /* reference banque (numero de transaction) */ - $no_transaction = clean_request('tx'); + $no_transaction = Env::s('tx'); /* token a renvoyer pour avoir plus d'information */ - $clef = clean_request('sig'); + $clef = Env::s('sig'); /* code retour */ - $status = clean_request('st'); + $status = Env::s('st'); /* raison */ - $reason = ($status == 'Pending')?clean_request('pending_reason'):clean_request('reason_code'); + $reason = ($status == 'Pending')? Env::s('pending_reason'): Env::s('reason_code'); /* reference complete de la commande */ - $fullref = clean_request('cm'); + $fullref = Env::s('cm'); /* montant de la transaction */ - $montant_nb = clean_request('amt'); + $montant_nb = Env::s('amt'); /* devise */ - $montant_dev = clean_request('cc'); + $montant_dev = Env::s('cc'); $montant = "$montant_nb $montant_dev"; /* on extrait le code de retour */ @@ -251,12 +268,12 @@ class PaymentModule extends PLModule if ($status) paypal_erreur("erreur lors du paiement : $status - $reason"); else - paypal_erreur("Paiement annulé", false); + paypal_erreur("Paiement annulé", false); } /* on extrait les informations sur l'utilisateur */ $res = XDB::query(" - SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme') + SELECT a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags) FROM auth_user_md5 AS a INNER JOIN aliases AS l ON (a.user_id=l.id AND type!='homonyme') WHERE a.user_id={?}", $uid); @@ -266,41 +283,42 @@ class PaymentModule extends PLModule /* on extrait la reference de la commande */ if (!ereg('-xorg-([0-9]+)$',$fullref,$matches)) { - paypal_erreur("référence de commande invalide"); + paypal_erreur("référence de commande invalide"); } $ref = $matches[1]; $res = XDB::query("SELECT mail,text,confirmation - FROM paiement.paiements WHERE id={?}", $ref); + FROM paiement.paiements + WHERE id={?}", $ref); if (!list($conf_mail,$conf_title,$conf_text) = $res->fetchOneRow()) { - paypal_erreur("référence de commande inconnue"); + paypal_erreur("référence de commande inconnue"); } /* on fait l'insertion en base de donnees */ - XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle) - VALUES ({?},{?},{?},{?},{?},{?})", - $no_transaction, $uid, $ref, $fullref, $montant, $clef); + XDB::execute("INSERT INTO paiement.transactions (id,uid,ref,fullref,montant,cle,comment) + VALUES ({?},{?},{?},{?},{?},{?},{?})", + $no_transaction, $uid, $ref, $fullref, $montant, $clef, Env::v('comment')); /* on genere le mail de confirmation */ $conf_text = str_replace("",$prenom,$conf_text); $conf_text = str_replace("",$nom,$conf_text); $conf_text = str_replace("",$promo,$conf_text); $conf_text = str_replace("",$montant,$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); + $conf_text = str_replace("",$femme ? "Chère" : "Cher",$conf_text); - $mymail = new HermesMailer(); + $mymail = new PlMailer(); $mymail->setFrom($conf_mail); - $mymail->addTo("\"$prenom $nom\" <$forlife@polytechnique.org>"); + $mymail->addTo("\"$prenom $nom\" <$forlife@" . $globals->mail->domain . '>'); $mymail->addCc($conf_mail); $mymail->setSubject($conf_title); - $mymail->setTxtBody($conf_text); - $mymail->send(); + $mymail->setWikiBody($conf_text); + $mymail->send(S::v('mail_fmt') == 'html'); - /* on envoie les details de la transaction à telepaiement@ */ - $mymail = new HermesMailer(); - $mymail->setFrom("webmaster@polytechnique.org"); - $mymail->addTo("telepaiement@polytechnique.org"); + /* on envoie les details de la transaction à telepaiement@ */ + $mymail = new PlMailer(); + $mymail->setFrom("webmaster@" . $globals->mail->domain); + $mymail->addTo($globals->money->email); $mymail->setSubject($conf_title); $msg = "utilisateur : $prenom $nom ($uid)\n". "mail : $forlife@polytechnique.org\n\n". @@ -315,21 +333,128 @@ class PaymentModule extends PLModule $page->assign('texte', $conf_text); $page->assign('erreur', $erreur); } + + function handler_xnet_payment(&$page, $pid = null) + { + global $globals; + + if (!is_null($pid)) { + return $this->handler_payment($page, $pid); + } + $page->changeTpl('payment/xnet.tpl'); + + $res = XDB::query( + "SELECT id, text, url + FROM {$globals->money->mpay_tprefix}paiements + WHERE asso_id = {?} AND NOT FIND_IN_SET('old', flags) + ORDER BY id DESC", $globals->asso('id')); + $tit = $res->fetchAllAssoc(); + $page->assign('titres', $tit); + + $order = Env::v('order', 'timestamp'); + $orders = array('timestamp', 'nom', 'promo', 'montant', 'comment'); + if (!in_array($order, $orders)) { + $order = 'timestamp'; + } elseif ($order == 'comment') { + $order = 't.comment'; + } + $inv_order = Env::v('order_inv', 0); + $page->assign('order', $order); + $page->assign('order_inv', !$inv_order); + + if ($order == 'timestamp') { + $inv_order = !$inv_order; + } + + if ($inv_order) { + $inv_order = ' DESC'; + } else { + $inv_order = ''; + } + if ($order == 'montant') { + $order = 'LENGTH(montant) '.$inv_order.', montant'; + } + + $orderby = 'ORDER BY '.$order.$inv_order; + if ($order != 'nom') { + $orderby .= ', nom'; $inv_order = ''; + } + $orderby .= ', prenom'.$inv_order; + if ($order != 'timestamp') { + $orderby .= ', timestamp DESC'; + } + + $trans = array(); + $event = array(); + foreach($tit as $foo) { + $pid = $foo['id']; + if (may_update()) { + $res = XDB::query("SELECT IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom, + u.prenom, u.promo, a.alias, timestamp AS `date`, t.comment, montant + FROM {$globals->money->mpay_tprefix}transactions AS t + INNER JOIN auth_user_md5 AS u ON ( t.uid = u.user_id ) + INNER JOIN aliases AS a ON ( t.uid = a.id AND a.type='a_vie' ) + WHERE ref = {?} ".$orderby, $pid); + $trans[$pid] = $res->fetchAllAssoc(); + $sum = 0; + foreach ($trans[$pid] as $i => $t) { + $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.'); + $trans[$pid][$i]['montant'] = str_replace('EUR', '€', $t['montant']); + } + $trans[$pid][] = array('nom' => 'somme totale', + 'montant' => strtr($sum, '.', ',').' €'); + } + $res = XDB::iterRow("SELECT e.eid, e.short_name, e.intitule, ep.nb, ei.montant, ep.paid + FROM groupex.evenements AS e + LEFT JOIN groupex.evenements_participants AS ep ON (ep.eid = e.eid AND uid = {?}) + INNER JOIN groupex.evenements_items AS ei ON (ep.eid = ei.eid AND ep.item_id = ei.item_id) + WHERE e.paiement_id = {?}", + S::v('uid'), $pid); + $event[$pid] = array(); + $event[$pid]['paid'] = 0; + if ($res->total()) { + $event[$pid]['topay'] = 0; + while(list($eid, $shortname, $title, $nb, $montant, $paid) = $res->next()) { + $event[$pid]['topay'] += ($nb * $montant); + $event[$pid]['eid'] = $eid; + $event[$pid]['shortname'] = $shortname; + $event[$pid]['title'] = $title; + $event[$pid]['ins'] = !is_null($nb); + $event[$pid]['paid'] = $paid; + } + } + $res = XDB::query("SELECT montant + FROM {$globals->money->mpay_tprefix}transactions AS t + WHERE ref = {?} AND uid = {?}", $pid, S::v('uid')); + $montants = $res->fetchColumn(); + + foreach ($montants as $m) { + $p = strtr(substr($m, 0, strpos($m, 'EUR')), ',', '.'); + $event[$pid]['paid'] += trim($p); + } + } + $page->assign('trans', $trans); + $page->assign('event', $event); + } + function handler_admin(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Paiements'); - $page->assign('title', 'Gestion des télépaiements'); + $page->assign('title', 'Gestion des télépaiements'); $table_editor = new PLTableEditor('admin/payments','paiement.paiements','id'); $table_editor->add_join_table('paiement.transactions','ref',true); - $table_editor->describe('text','intitulé',true); + $table_editor->add_sort_field('flags'); + $table_editor->add_sort_field('id', true, true); + $table_editor->on_delete("UPDATE paiement.paiements SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé"); + $table_editor->describe('text','intitulé',true); $table_editor->describe('url','site web',false); - $table_editor->describe('montant_def','montant par défaut',false); + $table_editor->describe('montant_def','montant par défaut',false); $table_editor->describe('montant_min','montant minimum',false); $table_editor->describe('montant_max','montant maximum',false); $table_editor->describe('mail','email contact',true); $table_editor->describe('confirmation','message confirmation',false); $table_editor->apply($page, $action, $id); - } + } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>