Reconcilation tool is now working, and generates the list of bank transfers to do.

diff --git a/modules/payment.php b/modules/payment.php
index 7f290e1..ef724db 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -117,8 +117,10 @@ class PaymentModule extends PLModule
             'admin/payments'             => $this->make_hook('admin',         AUTH_MDP,    'admin'),
             'admin/payments/methods'     => $this->make_hook('adm_methods',   AUTH_MDP,    'admin'),
             'admin/payments/transactions'=> $this->make_hook('adm_transactions', AUTH_MDP, 'admin'),
-            'admin/payments/reconcile'   => $this->make_hook('adm_reconcile', AUTH_MDP,    'admin'),
-            'admin/payments/bankaccounts'=> $this->make_hook('adm_bankaccounts', AUTH_MDP, 'admin'),
+            'admin/reconcile'            => $this->make_hook('adm_reconcile', AUTH_MDP,    'admin'),
+            'admin/reconcile/importlogs' => $this->make_hook('adm_importlogs', AUTH_MDP,    'admin'),
+            'admin/reconcile/transfers'  => $this->make_hook('adm_transfers', AUTH_MDP,    'admin'),
+            'admin/reconcile/bankaccounts'=> $this->make_hook('adm_bankaccounts', AUTH_MDP, 'admin'),
         );
     }
 
@@ -624,14 +626,73 @@ class PaymentModule extends PLModule
         $page->setTitle('Administration - Paiements - Réconciliations');
         $page->changeTpl('payment/reconcile.tpl');
         $page->assign('step', $step);
+               $list = true;
         
-        if (substr($step,0,4) != 'step') {
-            // clean up
-            unset($_SESSION['paymentrecon_method']);
-            unset($_SESSION['paymentrecon_data']);
-            unset($_SESSION['paymentrecon_id']);
-            
-        } elseif (isset($_SESSION['paymentrecon_data'])) {
+               // actions
+               if ($step == 'delete' && $param != null) {
+                       S::assert_xsrf_token();
+                       XDB::execute("DELETE FROM payment_reconcilations WHERE id={?}", $param);
+                       // FIXME: hardcoding !!!
+                       XDB::execute("UPDATE payment_transactions SET recon_id=NULL,commission=NULL WHERE recon_id={?} AND method_id=2", $param);
+                       XDB::execute("UPDATE payment_transactions SET recon_id=NULL WHERE recon_id={?} AND method_id=1", $param);
+                       $page->trigSuccess("L'entrée ".$param." a été supprimée.");
+               
+               } elseif ($step == 'edit') {
+                       $page->trigError("L'édition n'est pas implémentée.");
+                       
+               } elseif ($step == 'step5') {
+                       $page->trigSuccess("La réconciliation est terminée. Il est maintenant nécessaire de générer les virements.");
+        
+               }
+               
+               if($list) {
+                       // show list of reconciliations, with a "add" button
+                       $page->assign('title', "Réconciliation - Liste");
+            $page->assign('step', 'list');
+                       
+                       $recongps = array();
+       
+                       $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
+                                                       LEFT JOIN  payment_methods AS m ON r.method_id=m.id
+                                                               WHERE  recongroup_id IS NULL
+                                                        ORDER BY  period_end DESC, period_start DESC");
+                       foreach ($res->fetchAllAssoc() as $recon)
+                               $recongps[] = array('recons' => array($recon), 'transfers' => array());
+                       
+                       $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");
+                       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
+                                                                        FROM  payment_reconcilations AS r
+                                                               LEFT JOIN  payment_methods AS m ON r.method_id=m.id
+                                                                       WHERE  recongroup_id={?}
+                                                                ORDER BY  period_end DESC, period_start DESC",
+                                                                 $recongp['id']);
+                               $recongp['recons'] = $res->fetchAllAssoc();
+
+                               $res = XDB::query("SELECT  id, payment_id, amount, account_id, message, date
+                                                                        FROM  payment_transfers
+                                                                       WHERE  recongroup_id={?}",
+                                                                 $recongp['id']);
+                               $recongp['transfers'] = $res->fetchAllAssoc();
+                                               
+                               $recongps[] = $recongp;
+                       }
+                       $page->assign_by_ref('recongps', $recongps);
+               }
+    }
+    
+       function handler_adm_importlogs(&$page, $step, $param = null) {
+        $page->setTitle('Administration - Paiements - Réconciliations');
+        $page->changeTpl('payment/reconcile.tpl');
+        $page->assign('step', $step);
+        
+        if (isset($_SESSION['paymentrecon_data'])) {
             // create temporary table with imported data
             XDB::execute("CREATE TEMPORARY TABLE payment_tmp (
                             reference VARCHAR(255) PRIMARY KEY,
@@ -644,44 +705,16 @@ class PaymentModule extends PLModule
                               $i['reference'], $i['date'], $i['amount'], $i['commission']);
         }
         
-        if ($step == 'list' || $step == 'delete' || $step == 'edit' || $step == 'step5') {
-            // actions
-            if ($step == 'delete' && $param != null) {
-                S::assert_xsrf_token();
-                XDB::execute("DELETE FROM payment_reconcilations WHERE id={?}", $param);
-                // FIXME: hardcoding !!!
-                XDB::execute("UPDATE payment_transactions SET recon_id=NULL,commission=NULL WHERE recon_id={?} AND method_id=2", $param);
-                XDB::execute("UPDATE payment_transactions SET recon_id=NULL WHERE recon_id={?} AND method_id=1", $param);
-                $page->trigSuccess("L'entrée ".$param." a été supprimée.");
-            
-            } elseif ($step == 'edit') {
-                $page->trigError("L'édition n'est pas implémentée.");
-                
-            } elseif ($step == 'step5') {
-                $page->trigSuccess("La réconciliation est terminée. Il est maintenant nécessaire de générer les virements.");
-            }
-            
-            // show list of reconciliations, with a "add" button
-            $page->assign('title', "Réconciliation - Liste");
-            $table_editor = new PLTableEditor("admin/payments/reconcile",'payment_reconcilations','id');
-            $table_editor->describe('payment_count','transactions',true);
-            $table_editor->describe('period_start','from',true);
-            $table_editor->describe('period_end','to',true);
-            $table_editor->describe('sum_amounts','total (€)',true);
-            $table_editor->describe('sum_commissions','coms (€)',true);
-            $table_editor->describe('comments','comments',false);
-            $table_editor->apply($page, 'list');
-
-        } elseif ($step == 'new' || $step == 'massadd') {
-            pl_redirect("admin/payments/reconcile/step1");
-                      
-        } elseif ($step == 'step1') {
+        if ($step == 'step1') {
             $page->assign('title', "Étape 1");
+            unset($_SESSION['paymentrecon_method']);
+            unset($_SESSION['paymentrecon_data']);
+            unset($_SESSION['paymentrecon_id']);
                 
             // was a payment method choosen ?
             if ($param != null) {
                 $_SESSION['paymentrecon_method'] = (int)$param;
-                pl_redirect("admin/payments/reconcile/step2");
+                pl_redirect("admin/reconcile/importlogs/step2");
 
             } else {
             // ask to choose a payment method
@@ -695,13 +728,13 @@ class PaymentModule extends PLModule
             // import logs formated in CVS
             $fields = array('date','reference','amount','commission');
             $importer = new PaymentLogsImporter();
-            $importer->apply($page, 'admin/payments/reconcile/step2', $fields);
+            $importer->apply($page, 'admin/reconcile/importlogs/step2', $fields);
             
             // if import is finished
             $result = $importer->get_result();
             if($result != null) {
                 $_SESSION['paymentrecon_data'] = $result;
-                pl_redirect("admin/payments/reconcile/step3");
+                pl_redirect("admin/reconcile/importlogs/step3");
             }
             
         } elseif ($step == 'step3' ) {
@@ -742,7 +775,7 @@ class PaymentModule extends PLModule
                                       AND method_id={?} AND recon_id IS NULL AND status='confirmed'",
                              $_SESSION['paymentrecon_id'], $recon['method_id']);
                 
-                pl_redirect("admin/payments/reconcile/step4");                
+                pl_redirect("admin/reconcile/importlogs/step4");                
                 
             // show summary of the imported data + ask form start/end of reconcilation period
             } else {
@@ -774,7 +807,7 @@ class PaymentModule extends PLModule
                     $page->trigError("Le commentaire doit contenir au moins 3 caractères.");
                 } else {
                     XDB::execute("UPDATE payment_reconcilations SET status='transfering' WHERE id={?}", $_SESSION['paymentrecon_id']);
-                    pl_redirect('admin/payments/reconcile/step5');
+                    pl_redirect('admin/reconcile/step5');
                 }
                 
             } elseif (Post::has('savecomments')) {
@@ -822,14 +855,53 @@ class PaymentModule extends PLModule
             $only_database = $res->fetchAllAssoc();
             $page->assign_by_ref('only_database', $only_database);
             $page->assign('onlydb_count', count($only_database));
-                        
-        } else {
-            $page->trigError('Bad parameters.');
         }
-    }
-    
-    function handler_adm_transferts(&$page) {
-        // list/log all bank transferts and link them to individual transactions
+       }
+       
+    function handler_adm_transfers(&$page, $action = null, $id = null) {
+        // list/log all bank transfers and link them to individual transactions
+        
+               if (Post::has('generate')) {
+                       $recon_ids = array_keys(Post::v('recon_id'));
+                       
+                       // generate a new reconcilation group ID
+                       $res = XDB::query("SELECT MAX(recongroup_id)+1 FROM payment_reconcilations");
+                       $recongp_id = $res->fetchOneCell();
+                       if ($recongp_id == null) $recongp_id = 1;
+                       
+                       // add reconcilations to group
+                               // FIXME: should check if reconcilations are in good status
+                       XDB::execute("UPDATE payment_reconcilations SET recongroup_id={?}, status='closed'
+                                     WHERE id IN {?}",
+                                     $recongp_id, $recon_ids);
+                       
+                       // create transfers
+                       XDB::execute("INSERT INTO  payment_transfers
+                                                          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 {?}
+                                                        GROUP BY  t.ref",
+                                                         $recongp_id, $recon_ids);
+                       
+                       //$res = XDB::query("SELECT * FROM  payment_reconcilations WHERE id IN {?}", $recon_ids);
+                       //$recons = $res->fetchAllAssoc();
+                       
+                       $page->trigSuccess("Les virements ont été générés pour ".count($recon_ids)." réconciliations.");
+                       $this->handler_adm_reconcile($page);
+                       
+               } elseif ($action == "delgroup") {
+                       S::assert_xsrf_token();
+                       XDB::execute("UPDATE payment_reconcilations SET status='transfering', recongroup_id=NULL WHERE recongroup_id={?}", $id);
+                       XDB::execute("DELETE FROM payment_transfers WHERE recongroup_id={?} AND date IS NULL", $id);
+                       
+                       $page->trigSuccess("Les virements non réalisés ont été supprimé du groupe ".$id.".");
+                       $this->handler_adm_reconcile($page);
+                   
+               } else {
+                       pl_redirect("admin/reconcile");
+               }
     }
 }
 
@@ -847,7 +919,9 @@ class PaymentLogsImporter extends CSVImporter {
                $this->result = array();
                foreach ($this->data as $line) {
             $a = $this->makeAssoc($line, $insert_relation);
-            $a['date'] = preg_replace('/([0-9]{2})\/([0-9]{2})\/([0-9]{4}) .*/','\3-\2-\1', $a['date']);
+            $a['date'] = preg_replace('/([0-9]{2})\/([0-9]{2})\/([0-9]{4}).*/','\3-\2-\1', $a['date']);
+            $a['amount'] = str_replace(',','.',$a['amount']);
+            $a['commission'] = str_replace(',','.',$a['commission']);
                        $this->result[] = $a;
         }
        }
@@ -857,12 +931,17 @@ class PaymentLogsImporter extends CSVImporter {
        }
        
        static public function compute_systempay_commission($line, $key, $relation) {
+               static $EEE_countries = array('France','Allemagne','Autriche','Belgique','Bulgarie','Chypre',
+                       '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');
+               
                if($key!='commission' || !array_key_exists('carte',$line)) return null;
                $amount = self::getValue($line, 'amount', $relation['amount']);
-               if ($line['carte'] == 'CB')
-                   return 0.20 + round($amount*0.005, 2);
+               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.76;
        }
 
        static public function compute_payment_id($line, $key, $relation) {

diff --git a/templates/payment/reconcile.tpl b/templates/payment/reconcile.tpl
index 75a9d37..50b8c09 100644 (file)
--- a/templates/payment/reconcile.tpl
+++ b/templates/payment/reconcile.tpl
@@ -22,7 +22,101 @@
 
 <h1>Réconciliation - {$title}</h1>
 
-{if $step eq 'step1'}
+{if $step eq 'list'}
+
+<form method="POST" action="admin/reconcile/transfers">
+<table class="bicol">
+  <tr class="impair">
+    <th>&nbsp;</th><th>id</th><th>method</th><th>du</th><th>au</th><th>statut</th><th>transactions</th><th>total (€)</th><th>coms (€)</th><th>actions</th>
+  </tr>
+       <tr class="impair" style="border-top: 1px solid #A2C2E1">
+               <th>&nbsp;</th>
+               <th style="text-align: left" colspan="9">non régroupées</th>
+       </tr>
+  <tr class="pair">
+    <td>&nbsp;</td>
+    <td colspan="8"><strong><a href="admin/reconcile/importlogs/step1">Créer une nouvelle réconciliation</a></strong></td>
+    <td class="right"><a href="admin/reconcile/importlogs/step1">{icon name=add title='nouvelle réconciliation'}</a></td>
+  </tr>
+  {foreach from=$recongps item=recongp}
+         {assign var='sum1' value='0'}
+         {assign var='sum2' value='0'}
+         {assign var='sum3' value='0'}
+         {if $recongp.id}
+               <tr class="impair"><td colspan="10">&nbsp;</td></tr>
+               <tr class="impair" style="border-top: 1px solid #A2C2E1">
+                 <th>&nbsp;</th>
+                 <th style="text-align: left" colspan="8">groupe ID {$recongp.id}</th>
+                 <th style="text-align: right"><a href="admin/reconcile/transfers/delgroup/{$recongp.id}?token={xsrf_token}">{icon name=delete title='supprimer'}</a></th>
+               </tr>
+               {/if}
+         {foreach from=$recongp.recons item=recon}
+           {assign var='sum1' value=`$sum1+$recon.payment_count`}
+           {assign var='sum2' value=`$sum2+$recon.sum_amounts`}
+           {assign var='sum3' value=`$sum3+$recon.sum_commissions`}
+                 <tr class="pair">
+                       <td>
+                         {if $recon.status eq 'transfering'}
+                           <input type="checkbox" name="recon_id[{$recon.id}]" />
+                         {else}
+                           &nbsp;
+                         {/if}
+                       </td>
+                       <td>{$recon.id}</td>
+                       <td>{$recon.method}</td>
+                       <td>{$recon.period_start}</td>
+                       <td>{$recon.period_end}</td>
+                       <td>{$recon.status}</td>
+                       <td class="right">{$recon.payment_count}</td>
+                       <td class="right">{$recon.sum_amounts}</td>
+                       <td class="right">{$recon.sum_commissions}</td>
+                       <td class="right">{if $recongp.id}&nbsp;{else}<a href="admin/reconcile/delete/{$recon.id}?token={xsrf_token}">{icon name=delete title='supprimer'}</a>{/if}</td>
+                 </tr>
+         {/foreach}
+         {if $recongp.id}
+                       <tr class="impair">
+                               <td colspan="5">&nbsp;</td>
+                               <td class="right">total :</td>
+                               <td class="right">{$sum1}</td>
+                               <td class="right">{$sum2|string_format:"%.2f"}</td>
+                               <td class="right">{$sum3|string_format:"%.2f"}</td>
+                               <td>&nbsp;</td>
+                       </tr>
+                       <tr><td colspan="10">
+                               <table class="bicol">
+                               <tr>
+                                       <th>id</th><th>date</th><th>message</th><th>RIB</th><th>€</th><th>action</th>
+                               </tr>
+                               {assign var='sum' value='0'}
+                               {foreach from=$recongp.transfers item=transfer}
+                                       {assign var='sum' value=`$sum+$transfer.amount`}
+                                       <tr class="{cycle values="pair,impair"}">
+                                               <td>{$transfer.id}</td>
+                                               <td>{if $transfer.date}{$transfer.date}{else}à virer{/if}</td>
+                                               <td><small>{$transfer.message}</small></td>
+                                               <td>{$transfer.account}</td>
+                                               <td class="right">{$transfer.amount}</td>
+                                               <td>
+                                                 <a href="admin/reconcile/transfers/edit/{$transfer.id}?token={xsrf_token}">{icon name=page_edit title='Éditer'}</a>
+                                                 <a href="admin/reconcile/transfers/confirm/{$transfer.id}?token={xsrf_token}">{icon name=tick title='Confirmer la réalisation'}</a>
+                                               </td>
+                                       </tr>
+                               {/foreach}
+                               </table>
+                       </td></tr>
+                       <tr class="impair">
+                               <td colspan="6">&nbsp;</td>
+                               <td class="right">total :</td>
+                               <td colspan="2">{$sum|string_format:"%.2f"} - coms = {$sum-$sum3|string_format:"%.2f"}</td>
+                               <td>&nbsp;</td>
+                       </tr>
+         {/if}
+  {/foreach}
+</table>
+<p><input type="submit" name="generate" value="Grouper et créer les virements" /></p>
+</form>
+
+{elseif $step eq 'step1'}
 
 <table class="bicol">
   <tr class="impair">
@@ -31,7 +125,7 @@
   {foreach from=$methods item=method}
   <tr class="{cycle values="pair,impair"}">
     <td>
-      <a href="admin/payments/reconcile/step1/{$method.id}">{$method.text}</a>
+      <a href="admin/reconcile/importlogs/step1/{$method.id}">{$method.text}</a>
     </td>
   </tr>
   {/foreach}
@@ -122,15 +216,15 @@ total (excepted onlydb) : {$ok_count+$differ_count+$onlyim_count} (doit être é
        </tr>
 {foreach from=$differs item=i}
   <tr class="{cycle values="pair,impair"}">
-               <td>{$i.fullref}<br />{$i.reference}</td>
-               <td>{$i.method_id}<br />&nbsp;</td>
-               <td>{$i.ts_confirmed}<br />{$i.date}</td>
-               <td>{$i.amount}<br />{$i.amount2}</td>
-               <td>{$i.commission}<br />{$i.commission2}</td>
-               <td>{$i.status}<br />&nbsp;</td>
-               <td>{$i.recon_id}<br />&nbsp;</td>
-               <td><form method="POST">{xsrf_token_field}<input type="submit" name="force[{$i.id}]" value="Forcer" /></form></td>
-       </tr>
+       <td>{$i.fullref}<br />{$i.reference}</td>
+       <td>{$i.method_id}<br />&nbsp;</td>
+       <td>{$i.ts_confirmed}<br />{$i.date}</td>
+       <td>{$i.amount}<br />{$i.amount2}</td>
+       <td>{$i.commission}<br />{$i.commission2}</td>
+       <td>{$i.status}<br />&nbsp;</td>
+       <td>{$i.recon_id}<br />&nbsp;</td>
+       <td><form method="POST">{xsrf_token_field}<input type="submit" name="force[{$i.id}]" value="Forcer" /></form></td>
+  </tr>
 {/foreach}
 </table>
 {else}
@@ -213,6 +307,6 @@ TODO: listing
 
 {if $dontshowback}
 <p>
-<a href="admin/payments/reconcile">back</a>
+<a href="admin/reconcile">back</a>
 </p>
 {/if}

diff --git a/upgrade/1.0.1/13_payments.sql b/upgrade/1.0.1/13_payments.sql
index 590434e..12ab924 100644 (file)
--- a/upgrade/1.0.1/13_payments.sql
+++ b/upgrade/1.0.1/13_payments.sql
@@ -45,6 +45,7 @@ CREATE TABLE payment_reconcilations (
   method_id INTEGER NOT NULL,
   period_start DATE NOT NULL,
   period_end DATE NOT NULL,
+  recongroup_id INTEGER DEFAULT NULL,
   status ENUM('pending','transfering','closed') NOT NULL DEFAULT 'pending',
   payment_count INTEGER NOT NULL,
   sum_amounts DECIMAL(9,2) NOT NULL, # transaction amount, before taking the commission
@@ -73,17 +74,19 @@ ALTER TABLE payment_transactions ADD UNIQUE KEY fullref (fullref);
 ALTER TABLE payment_transactions DROP amount_tmp;
 
 CREATE TABLE payment_transfers (
-  id integer PRIMARY KEY auto_increment,
-  payment_id integer NOT NULL,
+  id INTEGER PRIMARY KEY auto_increment,
+  recongroup_id INTEGER NOT NULL,
+  payment_id INTEGER NOT NULL,
   amount DECIMAL(9,2) NOT NULL,
+  account_id INTEGER DEFAULT NULL,
   message VARCHAR(255) NOT NULL,
-  date DATE # NULL = not done
+  date DATE DEFAULT NULL # NULL = not done
 ) ENGINE=InnoDB, CHARSET=utf8;
 
-CREATE TABLE payment_recon_transfer (
-  recon_id INTEGER NOT NULL,
-  transfer_id INTEGER NOT NULL,
-  PRIMARY KEY (recon_id,transfer_id)
-) ENGINE=InnoDB, CHARSET=utf8;
+ALTER TABLE payment_methods ADD short_name VARCHAR(10) NOT NULL;
+ALTER TABLE payment_methods ADD flags SET('deferred_com') DEFAULT '';
+UPDATE payment_methods SET short_name='paypal', flags='' WHERE id=1;
+UPDATE payment_methods SET short_name='bplc2', flags='deferred_com' WHERE id=2;
 
 -- vim:set syntax=mysql:
+