X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fpayment.php;h=4fa064197d51f3fe55267edcd1230be997276b27;hb=4dcee20be6bd4ca928c54a6ae580f832b287777e;hp=183c72368c4349b90f0811ed11f556f457caba16;hpb=2746db102dbc8df1678f495d3bcacf4e01653f5c;p=platal.git diff --git a/modules/payment.php b/modules/payment.php index 183c723..4fa0641 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -1,6 +1,6 @@ $this->make_hook('adm_reconcile', AUTH_PASSWD, 'admin'), 'admin/reconcile/importlogs' => $this->make_hook('adm_importlogs', AUTH_PASSWD, 'admin'), 'admin/reconcile/transfers' => $this->make_hook('adm_transfers', AUTH_PASSWD, 'admin'), - 'admin/payments/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_PASSWD, 'admin'), + 'admin/payments/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_PASSWD, 'admin'), ); } @@ -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"); } @@ -428,22 +428,25 @@ class PaymentModule extends PLModule global $globals; $perms = S::v('perms'); - if (!(S::identified() && $perms->hasFlag('groupmember'))) { - if (is_null($pid)) { + if (is_null($pid)) { + if (!(S::identified() && $perms->hasFlag('groupadmin'))) { return PL_FORBIDDEN; } - $res = XDB::query("SELECT 1 - FROM group_events AS e - INNER JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) - WHERE e.paiement_id = {?} AND e.asso_id = {?}", - S::i('uid'), $pid, $globals->asso('id')); - $public = XDB::query("SELECT 1 - FROM payments AS p - INNER JOIN group_events AS g ON (g.paiement_id = p.id) - WHERE g.asso_id = {?} AND p.id = {?} AND FIND_IN_SET('public', p.flags)", - $globals->asso('id'), $pid); - if ($res->numRows() == 0 && $public->numRows() == 0) { - return PL_FORBIDDEN; + } else { + if (!(S::identified() && $perms->hasFlag('groupmember'))) { + $res = XDB::query("SELECT 1 + FROM group_events AS e + INNER JOIN group_event_participants AS ep ON (ep.eid = e.eid AND ep.uid = {?}) + WHERE e.paiement_id = {?} AND e.asso_id = {?}", + S::i('uid'), $pid, $globals->asso('id')); + $public = XDB::query("SELECT 1 + FROM payments AS p + INNER JOIN group_events AS g ON (g.paiement_id = p.id) + WHERE g.asso_id = {?} AND p.id = {?} AND FIND_IN_SET('public', p.flags)", + $globals->asso('id'), $pid); + if ($res->numRows() == 0 && $public->numRows() == 0) { + return PL_FORBIDDEN; + } } } @@ -576,7 +579,6 @@ class PaymentModule extends PLModule $page->setTitle('Administration - Paiements'); $page->assign('title', 'Gestion des télépaiements'); $table_editor = new PLTableEditor('admin/payments','payments','id'); - //$table_editor->add_join_table('payment_transactions','ref',true); => on ne supprime jamais une transaction $table_editor->add_sort_field('flags'); $table_editor->add_sort_field('id', true, true); $table_editor->on_delete("UPDATE payments SET flags = 'old' WHERE id = {?}", "Le paiement a été archivé"); @@ -594,6 +596,8 @@ class PaymentModule extends PLModule // 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'); + // adds a link to the table of all the transactions + $table_editor->addLink('id', "admin/payments/transactions/"); $table_editor->apply($page, $action, $id); } @@ -606,10 +610,17 @@ class PaymentModule extends PLModule if ($payment_id == null) $page->trigError("Aucun ID de paiement fourni."); - $table_editor = new PLTableEditor("admin/transactions/{$payment_id}",'payment_transactions','id'); + $table_editor = new PLTableEditor("admin/payments/transactions/{$payment_id}",'payment_transactions','id', true); $table_editor->set_where_clause(XDB::format('ref = {?}', $payment_id)); - $table_editor->apply($page, 'list', $id); // only the 'list' action is allowed - $page->assign('readonly', 'readonly'); // don't show modification features + $table_editor->add_sort_field('id', true); + $table_editor->describe('ts_initiated', 'ts_initiated', true, false); + $table_editor->describe('commission', 'commission', true, false); + $table_editor->describe('pkey', 'pkey', true, true); + $table_editor->describe('comment', 'comment', true, true); + $table_editor->describe('recon_id', 'recon_id', true, false); + $table_editor->describe('display', 'display', true, true); + $table_editor->apply($page, $action, $id); + $page->assign('addonly', 'addonly'); // don't show modification features, only add feature } function handler_adm_bankaccounts($page, $action = "list", $id = null) { @@ -621,14 +632,15 @@ class PaymentModule extends PLModule $table_editor->describe('asso_id', 'ID du groupe', false, true); $table_editor->describe('owner', 'titulaire', true); $table_editor->add_option_table('groups', 'groups.id = t.asso_id'); - $table_editor->add_option_field('groups.diminutif', 'group_name', 'groupe', 'varchar','account'); + $table_editor->add_option_field('groups.diminutif', 'group_name', 'groupe', 'varchar','iban'); - // check RIB key + /* check RIB key FIXME: the column format (and name) changed if ($action == 'update' && Post::has('account') && !check_rib(Post::v('account'))) { $page->trigError("Le RIB n'est pas valide"); $table_editor->apply($page, 'edit', $id); return; } + */ $table_editor->apply($page, $action, $id); } @@ -673,6 +685,7 @@ class PaymentModule extends PLModule $recongps = array(); + // récupère les réconciliations non groupées $res = XDB::query("SELECT r.id, short_name AS method, period_start, period_end, status, payment_count, sum_amounts, sum_commissions FROM payment_reconcilations AS r @@ -682,10 +695,12 @@ class PaymentModule extends PLModule foreach ($res->fetchAllAssoc() as $recon) $recongps[] = array('recons' => array($recon), 'transfers' => array()); + // ne récupère que les 18 derniers groupements $res = XDB::query("SELECT recongroup_id AS id FROM payment_reconcilations GROUP BY recongroup_id - ORDER BY MAX(period_end) DESC, MIN(period_start) DESC"); + ORDER BY MAX(period_end) DESC, MIN(period_start) DESC + LIMIT 18"); foreach ($res->fetchAllAssoc() as $recongp) { $res = XDB::query("SELECT r.id, short_name AS method, period_start, period_end, status, payment_count, sum_amounts, sum_commissions @@ -696,12 +711,26 @@ class PaymentModule extends PLModule $recongp['id']); $recongp['recons'] = $res->fetchAllAssoc(); - $res = XDB::query('SELECT t.id, t.payment_id, t.amount, b.owner, t.message, t.date + $res = XDB::query('SELECT t.id, t.payment_id, t.amount, 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(); + $transfers = $res->fetchAllAssoc(); + foreach ($transfers as $id => $t) { + if ($t['date'] == NULL) { // si le virement n'est pas fait, on va récupérer le rib associé au paiment + $ownertmp = XDB::fetchOneCell('SELECT b.owner + FROM payment_bankaccounts AS b + LEFT JOIN payments AS p ON (p.rib_id = b.id) + WHERE p.id = {?}', $t['payment_id']); + } else { // sinon on prend celui associé au virement + $ownertmp = XDB::fetchOneCell('SELECT b.owner + FROM payment_bankaccounts AS b + LEFT JOIN payment_transfers AS t ON (t.account_id = b.id) + WHERE t.id = {?}', $t['id']); + } + $transfers[$id]['owner'] = $ownertmp; + } + $recongp['transfers'] = $transfers; $recongps[] = $recongp; } @@ -901,11 +930,11 @@ class PaymentModule extends PLModule // create transfers XDB::execute('INSERT INTO payment_transfers - SELECT NULL, {?}, t.ref, SUM(t.amount+t.commission), p.rib_id, p.text, NULL + SELECT NULL, {?}, t.ref, SUM(t.amount+t.commission), NULL, 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) - WHERE t.recon_id IN {?} + WHERE t.recon_id IN {?} AND t.status = "confirmed" GROUP BY t.ref', $recongp_id, $recon_ids); @@ -928,9 +957,13 @@ class PaymentModule extends PLModule } elseif ($action == "confirm") { S::assert_xsrf_token(); + $account_id = XDB::fetchOneCell('SELECT rib_id + FROM payments AS p + LEFT JOIN payment_transfers AS t ON (t.payment_id = p.id) + WHERE t.id = {?}', $id); XDB::execute('UPDATE payment_transfers - SET date = NOW() - WHERE id = {?}', $id); + SET date = NOW(), account_id = {?} + WHERE id = {?}', $account_id, $id); $page->trigSuccess('Virement ' . $id . ' confirmé.'); $this->handler_adm_reconcile($page); @@ -972,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' @@ -985,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; } } @@ -994,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; @@ -1002,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: ?>