From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 5 Jan 2017 17:38:02 +0000 (+0000)
Subject: done #1072 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7f5681c4ddf4572ff1b8a82d1c4e81928544506d;p=cubeextranet.git

done #1072 @0.25
---

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 8b530336b..4ef6204ca 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1086,13 +1086,15 @@ class wsMaintenance {
 		$u = array();
 
 		$r = $core->con->select('SELECT * FROM utilisateurs');
+		$unsubscribe = array();
 		while ($r->fetch()) {
 			$u[$r->utilisateur_id] = $r->row();
+			$unsubscribe[$r->email] = true;
 		}
 
 		$r = $core->con->select("SELECT * FROM entreprises_ws WHERE revendeur='Cubedesigners' AND ws_grade<=4 AND ws_grade>0");
 		while ($r->fetch()) {
-			$e[$r->entreprise_id] = array('COUNTRY' => $r->pays, 'CONTACT' => date('m/d/Y', $r->date_creation), 'LASTACTION' => date('m/d/Y', $r->date_creation), 'COMPANY' => $r->nom, 'RESSELER' => ($r->ws_grade > 2) ? 1 : 0, 'FLUIDBOOKS' => 0, 'TURNOVER' => 0);
+			$e[$r->entreprise_id] = array('lastdate' => 0, 'COUNTRY' => $r->pays, 'CONTACT' => date('m/d/Y', $r->date_creation), 'LASTACTION' => date('m/d/Y', $r->date_creation), 'COMPANY' => $r->nom, 'RESSELER' => ($r->ws_grade > 2) ? 1 : 0, 'FLUIDBOOKS' => 0, 'TURNOVER' => 0);
 		}
 
 		$r = $core->con->select("SELECT * FROM entreprises_vue");
@@ -1106,7 +1108,8 @@ class wsMaintenance {
 		while ($rr->fetch()) {
 			$eid = $u[$rr->facturable_id]['entreprise'];
 			if (isset($e[$eid])) {
-				$e[$eid]['FLUIDBOOKS'] = $rr->nb;
+				$e[$eid]['FLUIDBOOKS'] += $rr->nb;
+				$e[$eid]['lastdate'] = max($e[$eid]['lastdate'], $rr->lastdate);
 				$e[$eid]['LASTACTION'] = date('m/d/Y', $rr->lastdate);
 			}
 		}
@@ -1120,11 +1123,19 @@ class wsMaintenance {
 				continue;
 			}
 
-			$batch[] = array_merge($e[$user['entreprise']], array('email' => $user['email'], 'LOCALE' => $user['lang'], 'FNAME' => $user['prenom'], 'LNAME' => $user['nom']));
+			$eu = $e[$user['entreprise']];
+			if (isset($eu['lastdate'])) {
+				unset($eu['lastdate']);
+			}
+
+			unset($unsubscribe[$user['email']]);
+
+			$batch[] = array_merge($eu, array('email' => $user['email'], 'LOCALE' => $user['lang'], 'FNAME' => $user['prenom'], 'LNAME' => $user['nom'], 'language' => $user['lang']));
 		}
 
 		$res = $api->batchSubscribe('69f69a2bb8', $batch);
-		echo '<pre>OK</pre>';
+		$runs = $api->batchUnsubscribe('69f69a2bb8', array_keys($unsubscribe));
+		echo '<pre>' . print_r($runs, true) . '</pre>';
 	}