application added
authorKilian Saffran <ksaffran@dks.lu>
Thu, 21 Feb 2019 20:44:15 +0000 (21:44 +0100)
committerKilian Saffran <ksaffran@dks.lu>
Thu, 21 Feb 2019 20:44:15 +0000 (21:44 +0100)
lib/processdata.php
tmpl/pages/profile/applications.php
tmpl/pages/profile/payement.php [new file with mode: 0644]
tmpl/pages/profile/profile.php

index 458f55c..1fb3bca 100644 (file)
         return;
     }
 
+    function process_getdata($gdt){
+        global $baseurl,$p,$db,$user;
+        if (isset($gdt["action"])){
+            switch ($gdt['action']){
+                case 'logout':
+                    $db->dbexec("delete from usersession where sessionid='".$user["sessionid"]."';");
+                    $user=array();
+                    setcookie("juridig","");
+                    $p='home';
+                    break;
+                case 'edit':
+                    break;
+                case 'delete':
+                    break;
+            }
+        }
+        if (isset($gdt["activate"])){
+            switch ($gdt['activate']){
+                case 'rendezvous':
+                    $expiredate = date('Y-m-d',strtotime('+21 days'));
+                    if (!(strpos($user['service_valid'],'rendezvous') > 0) && !(strpos($user['service_expired'],'rendezvous') > 0)){
+                        $db->dbexec("INSERT INTO userservices (id_user,service,expiration) VALUES (".$user['id'].",'rendezvous',date('".$expiredate."'))");
+                        $user = getsessiondata($user['sessionid']);
+                    }
+                    
+                    break;
+            }
+        }
+        
+    }
+
     function register_user($pdt){
         global $db,$msg,$p;
         //do we have already an account for this user?
         return $retuser;
     }
 
-    function process_getdata($gdt){
-        global $baseurl,$p,$db,$user;
-        $action = $gdt["action"];
-        if ($action == "logout"){
-            $db->dbexec("delete from usersession where sessionid='".$user["sessionid"]."';");
-            $user=array();
-            setcookie("juridig","");
-            $p='home';
-            #header("location:".$_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$baseurl.'/'.$p);
-        }  else if  ($action == "edit") {
-
-        } else if  ($action == "delete") {
-            
-        }
-    }
+    
 
     function getsessiondata($sessid){
         global $db;
-        $sql = "SELECT us.*,ses.sessionid from usersession ses LEFT JOIN users us on (ses.id_user=us.id) where ses.sessionid='".$sessid."';";
+        $sql = "SELECT us.*,ses.sessionid,
+        GROUP_CONCAT(CASE WHEN srv.expiration >= CURRENT_DATE then srv.service else null end) as service_valid,
+        GROUP_CONCAT(CASE WHEN srv.expiration < CURRENT_DATE then srv.service else null end) as service_expired 
+        from usersession ses 
+        LEFT JOIN users us on (ses.id_user=us.id) 
+        left join userservices srv on (srv.id_user=us.id) 
+        where ses.sessionid='".$sessid."';";
         $sesuser = $db->dbquery($sql);
         return $sesuser;
     }
index 6c6611b..f02307b 100644 (file)
@@ -1,23 +1,54 @@
+<?php
+    $sql = "select ua.app,srv.autorenew,ua.name,ua.price,ua.evaluation,ua.activated,srv.service,srv.expiration,ua.description,ua.icon from userapps ua left join userservices srv on (ua.app=srv.service and srv.id_user=".$user['id'].");";
+    $userapps = $db->dbqueryall($sql);
+    $today = date('Y-m-d'); 
+    $torenewstart = date('Y-m-d',strtotime("-14 days"))
+?>
 <div class="row">
     <div class="col-sm-12">
+    
+    <?php
+   
+        foreach($userapps as $app => $appdata){
+            if (($appdata["activated"] == 1) || ($user["usergroup"] == "administrator")){
+    ?>
     <div class="card">
         <div class="card-body">
         <div class="row">
         <div class="col-sm-2">
-            <img title="Rendez-Vous" alt="rendez-Vous" src="<?php echo $baseurl; ?>/img/apple-icon-57x57.png"/>
-            <h6>Rendez-Vous</h6>
+            <img title="<?php echo $appdata["name"] ?>" alt="<?php echo $appdata["name"] ?>" src="<?php echo $baseurl.'/img/'.$appdata["icon"]; ?>"/>
+            <h6><?php echo $appdata["name"] ?></h6>
         </div>
         <div class="col-sm-8">
-            <p>Donner à vos mandataires et futur mandaires la posisibilité de demander un rendez-vous en ligne en quelques clicks!</p>
-            <button class="btn btn-success" onclick="location.href='/profile/applications?activate=rendezvous'">Activer Rendez-Vous</button>
-            <p><strong>Periode d'essaie:</strong> 3 semaines à partir de l'activation</p>
+            <p><?php echo $appdata["description"] ?></p>
+            <?php 
+                 if ($appdata["service"] == ""){
+                     ?>
+                    <button class="btn btn-success" onclick="location.href='/profile/applications?activate=rendezvous'">Activer <?php echo $appdata["name"] ?></button>
+                    <p><strong>Periode d'essaie:</strong> <?php echo $appdata["evaluation"] ?> semaines à partir de l'activation</p>
+            <?php     
+                 } else if ($appdata["expiration"] >= $today) {
+                     echo '<button class="btn btn-info" onclick="location.href=\''.$baseurl.'/profile/application?app='.$appdata['app'].'&autorenew='.(($appdata['autorenew']== 1)?'0':'1').'\';">'.(($appdata['autorenew']== 1)?'dé':'').'activer la prolongation automatique</button>';
+                     echo '<p><strong>Expire le: </strong>&nbsp;'.date("d.m.Y", strtotime($appdata['expiration'])).'</p>';
+                     
+                 } else {
+                    ?>
+                    <button class="btn btn-success" onclick="location.href='<?php echo $baseurl; ?>/profile/payement?app=<?php echo $appdata['app']; ?>'">Souscrire Rendez-Vous</button>
+                    <?php
+                    echo '<p><strong>Est expiré le: </strong>&nbsp;'.date("d.m.Y", strtotime($appdata['expiration'])).'</p>';
+                }
+            ?>
+            
         </div>
         <div class="col-sm-2">
-            <strong>Prix: 50&euro; HTVA / mois <br/><small>(payable par année)</small></strong><br/>
-            
+            <strong>Prix: <?php echo $appdata["price"] ?>&euro; HTVA / mois <br/><small>(payable par année)</small></strong><br/>
         </div>
         </div>
     </div>
 </div>
+<?php
+    } // end if
+} // end foreach
+?>
     </div>
 </div>
\ No newline at end of file
diff --git a/tmpl/pages/profile/payement.php b/tmpl/pages/profile/payement.php
new file mode 100644 (file)
index 0000000..69007d5
--- /dev/null
@@ -0,0 +1,3 @@
+<?php
+    
+?>
\ No newline at end of file
index 17403a9..ef6d539 100644 (file)
@@ -6,10 +6,10 @@
             $subpath = "";
         }
     }
-    $activatedapps = array();
-    if (($user['usergroup'] != 'client') && ($user['services'] != "")){
-        $activatedapps = explode(',',$user['services']);
-    }
+    // $activatedapps = array();
+    // if (($user['usergroup'] != 'client') && ($user['service'] != "")){
+    //     $activatedapps = explode(',',$user['services']);
+    // }
 ?>
 <div class="row">
 <div class="col-sm-2 sidebar">
                 ?>
                 <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/applications">Applications</a>
                 <?php
-                if (count($activatedapps) > 0 ){
+                if ((strlen($user["service_valid"]) > 0) || (strlen($user["service_exired"]) > 0)  ){
                     ?>
                         <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/invoices">Factures</a>
                     <?php
                 }
                 ?>
                 <div class="dropdown-divider"></div>
-                <?php foreach ($activatedapps as $app){
-                    if ($app == 'rendezvous'){ ?>
+                <?php 
+                    if (strpos($user["service_valid"],'rendezvous') >= 0 ){ ?>
                         <h6 class="dropdown-header">Rendez-Vous</h6>
                 <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/rendezvous/clientlist">Mes Clients</a>
                 <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/rendezvous/timesheetlist">Mes Horaires</a>
                 <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/rendezvous/exceptionlist">Mes Exceptions Horaires</a>
                   <?php  } 
-                } ?>
+                 ?>