***************************************************************************/
/* sort en affichant une erreur */
-function cb_erreur($text) {
+function cb_erreur($text, $conf_title="") {
global $globals;
- echo "Error.\n";
+ echo "Error: ".$text."\n";
$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));
+ $content = "raison de l'erreur : " . $text . "\n";
+ if ($conf_title != "") {
+ $content = $content."paiement : ".$conf_title."\n";
+ }
+ $content = $content . "dump de REQUEST :\n" . var_export($_REQUEST, true);
+ $mymail->setTxtBody($content);
$mymail->send();
echo "Notification sent.\n";
exit;
$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->setTxtBody("raison de l'erreur : ".$text."\n".
+ "paiement : $conf_title \n\n".
+ "dump de REQUEST :\n".
+ var_export($_REQUEST,true));
$mymail->send();
Platal::page()->trigError($text);
$page->kill('La transaction selectionnée est périmée.');
}
+ if (Env::has('montant')) {
+ $pay->amount_def = Env::v('montant');
+ }
$val = (Post::v('amount') != 0) ? Post::v('amount') : $pay->amount_def;
if (($error = $pay->check($val)) !== true) {
/* on extrait le code de retour */
if (Env::v('vads_result') != '00') {
- cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')');
+ cb_erreur('erreur lors du paiement : ?? (' . Env::v('vads_result') . ')', $conf_title);
}
/* on fait l'insertion en base de donnees */
$trans = array();
$event = array();
if (may_update()) {
- static $orders = array('timestamp' => 'p', 'directory_name' => 'a', 'promo' => 'pd', 'comment' => 'p', 'amount' => 'p');
+ static $orders = array('ts_confirmed' => 'p', 'directory_name' => 'a', 'promo' => 'pd', 'comment' => 'p', 'amount' => 'p');
if (Get::has('order_id') && Get::has('order') && array_key_exists(Get::v('order'), $orders)) {
$order_id = Get::i('order_id');
$users = User::getBulkUsersWithUIDs($res, 'uid', 'user');
$sum = 0;
- pl_cached_content_headers('text/x-csv', 1);
+ pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1);
$csv = fopen('php://output', 'w');
- fputcsv($csv, array('Date', 'Nom', 'Prénom', 'Sexe', 'Promotion', 'Email', 'Commentaire', 'Montant'), ';');
+ fputcsv($csv, array('Date', 'Nom', utf8_decode('Prénom'), 'Sexe', 'Promotion', 'Email', 'Commentaire', 'Montant'), ';');
foreach ($users as $item) {
$user = $item['user'];
$sum += $item['amount'];
- fputcsv($csv, array(format_datetime($item['date'], '%d/%m/%y'), $user->lastName(), $user->firstName(),
+ fputcsv($csv, array(format_datetime($item['date'], '%d/%m/%y'), utf8_decode($user->lastName()), utf8_decode($user->firstName()),
($user->isFemale()) ? 'F' : 'M', $user->promo(), $user->ForlifeEmail(),
- $item['comment'], strtr($item['amount'],'.',',').' €' ), ';');
+ utf8_decode($item['comment']), strtr($item['amount'], '.', ',') . ' EUR' ), ';');
}
- fputcsv($csv, array(date('d/m/y'), 'Total', '', '', '' , '', '', strtr($sum,'.',',').' €'), ';');
+ fputcsv($csv, array(date('d/m/y'), 'Total', '', '', '' , '', '', strtr($sum, '.', ',') . ' EUR'), ';');
fclose($csv);
exit;
$table_editor->describe('amount_max', 'montant maximum', false, true);
$table_editor->describe('mail', 'email contact', true);
$table_editor->describe('confirmation', 'message confirmation', false, true);
-
+ $table_editor->describe('rib_id', 'RIB', false, true);
// adds a column with the start date of the linked event if there is one
$table_editor->add_option_table('group_events', 'group_events.paiement_id = t.id');
- $table_editor->add_option_field('group_events.debut', 'related_event', 'évènement', 'timestamp');
+ $table_editor->add_option_field('group_events.archive', 'related_event', 'évènement archivé ?', 'tinyint');
+ // adds a column with the linked rib if there is one
+ $table_editor->add_option_table('payment_bankaccounts', 'payment_bankaccounts.id = t.rib_id');
+ $table_editor->add_option_field('payment_bankaccounts.owner', 'linked_rib_owner', 'rib associé', 'varchar');
$table_editor->apply($page, $action, $id);
}
$recongp['id']);
$recongp['recons'] = $res->fetchAllAssoc();
- $res = XDB::query('SELECT id, payment_id, amount, account_id, message, date
- FROM payment_transfers
+ $res = XDB::query('SELECT t.id, t.payment_id, t.amount, b.owner, t.message, t.date
+ FROM payment_transfers AS t
+ LEFT JOIN payment_bankaccounts AS b ON (t.account_id=b.id)
WHERE recongroup_id = {?}',
$recongp['id']);
$recongp['transfers'] = $res->fetchAllAssoc();
// create transfers
XDB::execute('INSERT INTO payment_transfers
- SELECT NULL, {?}, t.ref, SUM(t.amount+t.commission), NULL, p.text, NULL
+ SELECT NULL, {?}, t.ref, SUM(t.amount+t.commission), p.rib_id, p.text, NULL
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)
static public function compute_systempay_commission($line, $key, $relation) {
static $EEE_countries = array(
- 'France', 'Allemagne', 'Autriche', 'Belgique', 'Bulgarie', 'Chypre',
+ 'France', 'Allemagne', 'Autriche', 'Belgique', 'Bulgarie', 'Chypre', 'Suisse',
'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'
projects / platal.git / blobdiff