Merge branch 'master' of [email protected]:DoliCloud/SellYourSaas.git

DoliCloud · Jan 16, 2024 · f2335d6 · f2335d6
2 parents b13f347 + dafa3c0
commit f2335d6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/myaccount/index.php b/myaccount/index.php
@@ -2263,7 +2263,8 @@
 		$duration_unit = $tmparray['duration_unit'];
 		$date_start = dol_now();
 		$date_end = dol_time_plus_duree($now, $duration_value, $duration_unit) - 1;
-		$descriptionlines = "Websiteref = ".$website->ref;
+		$descriptionlines = "WebsiteRef=".$website->ref.", ";
+		$descriptionlines .= "WebsiteDomainName=".$domainnamewebsite;
 		$foundlinecontract = 0;
 		foreach ($object->lines as $key => $line) {
 			if ($line->description == $descriptionlines && $line->fk_product == $productid) {

diff --git a/myaccount/tpl/instances.tpl.php b/myaccount/tpl/instances.tpl.php
@@ -798,12 +798,33 @@
 					print '<span class="bold">'.$langs->trans("OptionWebsite").'&nbsp;</span>';
 					print '<select style="width:60%" id="websiteidoption" name="websiteidoption">';
 					print '<option value="">&nbsp;</option>';
+					$contractlines = $contract->lines;
+					$arraywebsitesenabled = array();
+					foreach ($contractlines as $line) {
+						if ($line->fk_product == getDolGlobalInt("SELLYOURSAAS_PRODUCT_ID_FOR_WEBSITE_DEPLOYMENT")) {
+							$desc = $line->description;
+							$tmpdesc = explode(", ", $desc);
+							$websiteref = explode("WebsiteRef=", $tmpdesc[0])[1];
+							$websitecustomurl = explode("WebsiteDomainName=", $tmpdesc[1])[1];
+							$arraywebsitesenabled[$websiteref] = $websitecustomurl;
+						}
+					}
 					foreach ($listofwebsitestoactivate as $website) {
+						$isalreadyactivated = 0;
+						if (isset($arraywebsitesenabled[$website->ref])) {
+							$isalreadyactivated = 1;
+						}
 						print '<option value="'.$website->id.'" '.(GETPOST("websiteidoption", "int") == $website->id ? "selected" : "");
+						if ($isalreadyactivated) {
+							print " disabled";
+						}
 						if ($website->status != $websitestatic::STATUS_VALIDATED) {
 							print " disabled";
 						}
 						print '>'.$website->ref;
+						if ($isalreadyactivated) {
+							print ' - '.$arraywebsitesenabled[$website->ref];
+						}
 						if ($website->status != $websitestatic::STATUS_VALIDATED) {
 							print ' - '.$langs->trans("Disabled");
 						}