Clean code to avoid warning property does not exists

Author: eldy

myaccount/index.php

@@ -306,7 +306,7 @@
 }
 
 // Define if the thirdparty is a reseller
-$mythirdpartyaccount->isareseller = 0;
+$mythirdpartyaccount->isareseller = 0;		// TODO Use $mythirdpartyaccount->context['isareseller']
 if (getDolGlobalInt('SELLYOURSAAS_DEFAULT_RESELLER_CATEG') > 0) {
 	$categorie=new Categorie($db);
 	$categorie->fetch(getDolGlobalString('SELLYOURSAAS_DEFAULT_RESELLER_CATEG'));
@@ -316,22 +316,22 @@
 }
 
 // Define if the thirdparty is a module provider
-$mythirdpartyaccount->isamoduleprovider = array();
+$mythirdpartyaccount->context['isamoduleprovider'] = array();		// TODO Use $mythirdpartyaccount->context['isamoduleprovider']
 if (getDolGlobalInt('SELLYOURSAAS_ALLOW_MODULE_PROVIDER_PROGRAM') > 0) {
-	// TODO Read if there is some product prices in supplier tab of the thirdparty. If yes it is a module provider and we have the list of provided modules
-	//$mythirdpartyaccount->isamoduleprovider = array('aa', 'bbb');
 	$sql = "SELECT p.rowid FROM ".MAIN_DB_PREFIX."product as p";
 	$sql.= " JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
 	$sql.= " ON pfp.fk_product = p.rowid";
-	$sql.= " WHERE pfp.fk_soc = ".$mythirdpartyaccount->id;
+	$sql.= " WHERE pfp.fk_soc = ".((int) $mythirdpartyaccount->id);
+
 	$resql=$db->query($sql);
+
 	if ($resql) {
 		$num_rows = $db->num_rows($resql);
 		$i = 0;
 		while ($i < $num_rows) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
-				$mythirdpartyaccount->isamoduleprovider[] = $obj->rowid;
+				$mythirdpartyaccount->context['isamoduleprovider'][$obj->rowid] = $obj->rowid;
 			}
 			$i++;
 		}
@@ -423,13 +423,13 @@
 
 $listofcontractidmodulesupplier = array();
 // Load list of child instance for module supplier
-if (!empty($mythirdpartyaccount->isamoduleprovider) && in_array($mode, array('mymodulecustomerinstances', 'mymodulecustomerbilling'))) {
+if (!empty($mythirdpartyaccount->context['isamoduleprovider']) && in_array($mode, array('mymodulecustomerinstances', 'mymodulecustomerbilling'))) {
 	$sql = 'SELECT DISTINCT c.rowid';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
 	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as d ON d.fk_contrat = c.rowid';
 	$sql.= ', '.MAIN_DB_PREFIX.'product as p';
 	$sql.= " WHERE d.fk_product = p.rowid";
-	$sql.= " AND d.fk_product IN (".(implode(",", $mythirdpartyaccount->isamoduleprovider)).")";
+	$sql.= " AND d.fk_product IN (".(implode(",", $mythirdpartyaccount->context['isamoduleprovider'])).")";
 	$sql.= " AND d.statut = 4";
 
 	if ($search_instance_name) {
@@ -2461,7 +2461,7 @@
 	';
 }
 
-if (count($mythirdpartyaccount->isamoduleprovider) > 0) {
+if (count($mythirdpartyaccount->context['isamoduleprovider']) > 0) {
 	print '
 	<li class="nav-item'.(($mode == 'mymodulecustomerinstances' || $mode == 'mymodulecustomerbilling') ? ' active' : '').' dropdown">
         <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-suitcase"></i> '.$langs->trans("ModuleProviderArea").'</a>

myaccount/tpl/mymodulecustomerbilling.tpl.php

@@ -263,7 +263,7 @@
 		$sql.= ' WHERE fd.fk_facture = f.rowid';
 		$sql.= ' AND fd.fk_product = p.rowid';
 		$sql.= ' AND fpf.fk_product = p.rowid';
-		$sql.= ' AND fd.fk_product IN ('.implode(",", $mythirdpartyaccount->isamoduleprovider).')';
+		$sql.= ' AND fd.fk_product IN ('.implode(",", $mythirdpartyaccount->context['isamoduleprovider']).')';
 
 		$sql.=$db->order($sortfield2, $sortorder2);
 
@@ -407,7 +407,7 @@
 		//$sql.=' WHERE fe.reseller IN ('.join(',', $listofcustomeridreseller).')';
 		$sql.= ', '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql.= ' WHERE fd.fk_facture = f.rowid';
-		$sql.=' AND fd.fk_product IN ('.implode(",", $mythirdpartyaccount->isamoduleprovider).')';
+		$sql.=' AND fd.fk_product IN ('.implode(",", $mythirdpartyaccount->context['isamoduleprovider']).')';
 		$sql.=' AND fk_statut <> '.Facture::STATUS_DRAFT;
 		$sql.=' AND paye = 1';
 

myaccount/tpl/mymodulecustomerinstances.tpl.php

@@ -294,7 +294,7 @@
 				} else {
 					$total_ht = 0;
 					foreach ($templateinvoice->lines as $key => $templateline) {
-						if (in_array($templateline->fk_product, $mythirdpartyaccount->isamoduleprovider)) {
+						if (in_array($templateline->fk_product, $mythirdpartyaccount->context['isamoduleprovider'])) {
 							$total_ht += $templateline->total_ht;
 						}
 					}
@@ -351,15 +351,15 @@
 						            <div class="areaforresources" style="padding-bottom: 12px;">';
 		foreach ($contract->lines as $keyline => $line) {
 			//var_dump($line);
-			if ($line->fk_product > 0 && !in_array($line->fk_product, $mythirdpartyaccount->isamoduleprovider)) {
+			if ($line->fk_product > 0 && !in_array($line->fk_product, $mythirdpartyaccount->context['isamoduleprovider'])) {
 				continue;
 			}
 
 			print '<div class="resource inline-block boxresource">';
 			$resourceformula='';
 			$tmpproduct = new Product($db);
 			if ($line->fk_product > 0) {
-				
+
 				$tmpproduct->fetch($line->fk_product);
 
 				$maxHeight=40;