Prints last marketing date on the validation page for a marketing proposal

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1202 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php
index c9692f2..91b61b2 100644 (file)
--- a/include/validations/marketing.inc.php
+++ b/include/validations/marketing.inc.php
@@ -31,6 +31,7 @@ class MarkReq extends Validate
     var $m_nom;
     var $m_prenom;
     var $m_promo;
+    var $m_relance;
 
     var $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le 
     demandeur marque sa propre adresse mail, refuser dans tous les cas.
@@ -45,8 +46,14 @@ class MarkReq extends Validate
         $this->m_email = $email;
         $this->perso   = $perso;
 
-        $res = XDB::query('SELECT nom, prenom, promo FROM auth_user_md5 WHERE user_id = {?}', $mark_id);
-        list ($this->m_nom, $this->m_prenom, $this->m_promo) = $res->fetchOneRow(); 
+        $res = XDB::query('SELECT  u.nom, u.prenom, u.promo,
+                                   IF(MAX(m.last)>p.relance, MAX(m.last), p.relance)
+                             FROM  auth_user_md5      AS u
+                        LEFT JOIN  register_pending   AS p ON p.uid = u.user_id
+                        LEFT JOIN  register_marketing AS m ON m.uid = u.user_id
+                            WHERE  user_id = {?}
+                         GROUP BY  u.user_id', $mark_id);
+        list ($this->m_nom, $this->m_prenom, $this->m_promo, $this->m_relance) = $res->fetchOneRow(); 
     }
 
     // }}}

diff --git a/templates/include/form.valid.mark.tpl b/templates/include/form.valid.mark.tpl
index ae49508..81d6abc 100644 (file)
--- a/templates/include/form.valid.mark.tpl
+++ b/templates/include/form.valid.mark.tpl
@@ -20,6 +20,14 @@
 {*                                                                        *}
 {**************************************************************************}
 
+{if $valid->m_relance neq '0000-00-00'}
+{if $valid->m_relance neq ''} {* provided for backward compatibility, may disappear in the future *}
+  <tr class="pair">
+    <td class="titre">Dernière relance le :</td>
+    <td>{$valid->m_relance}</td>
+  </tr>
+{/if}
+{/if}
 <tr class="pair">
   <td class="titre">Marketing sur</td>
   <td><a href='marketing/private/{$valid->m_id}'>{$valid->m_prenom} {$valid->m_nom} ({$valid->m_promo})</a></td>