bug 374, ergo de l'inscription aux evenements

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

diff --git a/ChangeLog b/ChangeLog
index 98d9b82..cb0a04d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ Bug/Wish:
         - #511: Migrate ML subscription when changing email of a non-X.    -FRU
 
     * Xnet/Events:
+        - #374: Modify ergonomy of inscription to events (again).          -Car
         - #490: Events can be opened to non-members.                       -FRU
         - #514: Improve visibility of open events.                         -FRU
         - #523: Organizer does not change when editing an event.           -FRU

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 4aa57ee..281b5e6 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -117,7 +117,7 @@ class XnetEventsModule extends PLModule
                            WHERE eid = {?} AND asso_id = {?}",
                          $eid, $globals->asso('id'));
         }
-
+        
         $page->assign('archive', $archive);
         $page->assign('admin', may_update());
 
@@ -166,9 +166,12 @@ class XnetEventsModule extends PLModule
                 $e['paid'] += trim($p);
             }
 
+            if (Env::has('updated') && $e['eid'] == Env::i('updated')) {
+                $page->assign('updated', $e);
+            }
             $evts[] = $e;
         }
-
+        
         $page->assign('evenements', $evts);
         $page->assign('is_member', is_member());
     }
@@ -227,22 +230,25 @@ class XnetEventsModule extends PLModule
         }
 
         // update actual inscriptions
+        $updated = false;
         foreach ($subs as $j => $nb) {
             if ($nb > 0) {
                 XDB::execute(
                     "REPLACE INTO  groupex.evenements_participants
                            VALUES  ({?}, {?}, {?}, {?}, {?})",
                     $eid, S::v('uid'), $j, $nb, $evt['paid']);
-                $page->assign('updated', true);
+                $updated = $eid;
             } else {
                 XDB::execute(
                     "DELETE FROM  groupex.evenements_participants
                            WHERE  eid = {?} AND uid = {?} AND item_id = {?}",
                     $eid, S::v("uid"), $j);            
-                $page->assign('updated', true);
+                $updated = $eid;
             }
         }
-
+        if ($updated !== false) { 
+               pl_redirect('events?updated='.$updated);
+        }
         $page->assign('event', get_event_detail($eid));
     }
 

diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl
index 8d4a363..ca5c415 100644 (file)
--- a/templates/xnetevents/index.tpl
+++ b/templates/xnetevents/index.tpl
@@ -29,6 +29,22 @@
   {if $archive}Archives {else}[<a href="{$platal->ns}events/archive">Archives</a>] {/if}
 </h1>
 
+{if $updated}
+<p class='error'>
+  La modification de l'inscription a été prise en compte !
+  {if $updated.topay}
+    <br/>N'oublie pas de payer {$updated.topay|replace:'.':','}&nbsp;&euro;
+    {if $updated.paid > 0}
+    (tu as déjà payé {$updated.paid|replace:'.':','}&nbsp;&euro;)
+    {/if}
+    {if $updated.paiement_id}
+    [<a href="https://www.polytechnique.org/payment/{$updated.paiement_id}?montant={$updated.topay}">
+    Payer en ligne</a>]
+    {/if}
+  {/if}
+</p>
+{/if}
+
 {if !$archive}
 <p class="center">
   [<a href="{$platal->ns}events/edit">Annoncer un nouvel événement</a>]

diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl
index e928209..ded6c03 100644 (file)
--- a/templates/xnetevents/subscribe.tpl
+++ b/templates/xnetevents/subscribe.tpl
@@ -22,12 +22,6 @@
 
 <h1>{$asso.nom} : Evénement {$event.intitule}</h1>
 
-{if $updated}
-<p class='error'>
-  La modification de l'inscription a été prise en compte !
-</p>
-{/if}
-
 <p>
   [<a href="{$platal->ns}events">Revenir à la liste des événements</a>]
 </p>