Fix trans for free mode

Author: eldy

admin/setup_register_security.php

@@ -547,7 +547,7 @@
 print '<tr class="liste_titre"><td colspan="3">Security for communication from master to deployment servers (Deprecated. Use instead a different key on each deployment server)</td></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_REMOTE_ACTION_SIGNATURE_KEY").'</td>';
-print '<td>';
+print '<td class="nowraponall">';
 print '<input type="text" class="width300" name="SELLYOURSAAS_REMOTE_ACTION_SIGNATURE_KEY" id="SELLYOURSAAS_REMOTE_ACTION_SIGNATURE_KEY" value="'.getDolGlobalString('SELLYOURSAAS_REMOTE_ACTION_SIGNATURE_KEY').'">';
 if (!empty($conf->use_javascript_ajax)) {
 	// TODO Set the type of input in password and add a button "show"

backoffice/index.php

@@ -402,7 +402,16 @@
 print '<font size="+2">'.$totalresellers.'</font>';
 print '</td></tr>';
 print '<tr class="oddeven"><td class="wordwrap wordbreak">';
-$texthelp = $langs->trans("NbOfInstancesActivePayingDesc");
+
+$transkeyforactivepayinghelp = "NbOfInstancesActivePayingDesc";
+$transkeyfornbinstanceactivepaying = "NbOfInstancesActivePaying";
+$transkeyfornbinstanceactivepayingall = "NbOfInstancesActivePayingAll";
+if (getDolGlobalString('SELLYOURSAAS_ENABLE_FREE_PAYMENT_MODE')) {
+	$transkeyfornbinstanceactivepaying = "NbOfInstancesActiveFree";
+	$transkeyfornbinstanceactivepayingall = "NbOfInstancesActiveFreeAll";
+}
+
+$texthelp = $langs->trans($transkeyforactivepayinghelp);
 $stringlistofinstancespayingwithoutrecinvoice = '';
 $nboflistofinstancespayingwithoutrecinvoice = 0;
 if (!empty($rep) && is_array($rep['listofinstancespayingwithoutrecinvoice'])) {
@@ -412,15 +421,15 @@
 		$stringlistofinstancespayingwithoutrecinvoice .= ($stringlistofinstancespayingwithoutrecinvoice ? ', ' : '').$arrayofcontract['thirdparty_name'].' - '.$arrayofcontract['contract_ref']."\n";
 	}
 }
-print $form->textwithpicto($langs->trans("NbOfInstancesActivePaying"), $texthelp);
+print $form->textwithpicto($langs->trans($transkeyfornbinstanceactivepaying), $texthelp);
 if ($mode == 'refreshstats') {	// Info not saved into session (too large), so we show it only after a refresh
 	$texthelp = $langs->trans("NbOfInstancesActivePayingWithoutRecInvoice", $nboflistofinstancespayingwithoutrecinvoice);
 	if ($stringlistofinstancespayingwithoutrecinvoice) {
 		$texthelp .= '<br>';
 		$texthelp .= $stringlistofinstancespayingwithoutrecinvoice;
 	}
 }
-print ' | '.$form->textwithpicto($langs->trans("NbOfInstancesActivePayingAll"), $texthelp).' | '.$langs->trans("NbOfActiveInstances").' ';
+print ' | '.$form->textwithpicto($langs->trans($transkeyfornbinstanceactivepayingall), $texthelp).' | '.$langs->trans("NbOfActiveInstances").' ';
 print '</td><td align="right">';
 if (! empty($_SESSION['stats_totalusers'])) {
 	print '<font size="+2">'.$totalinstancespaying.' | '.$totalinstancespayingall.' | '.$totalinstances.'</font>';
@@ -501,7 +510,7 @@
 print '</div></div></div>';
 
 //$servicetouse='old';
-$servicetouse=strtolower($conf->global->SELLYOURSAAS_NAME);
+$servicetouse=strtolower(getDolGlobalString('SELLYOURSAAS_NAME'));
 $regs = array();
 
 // array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn))

langs/en_US/sellyoursaas.lang

@@ -28,6 +28,8 @@ NbOfCustomersActivePaying=Nb of active paying customers
 NbOfCustomers=Nb of customers
 NbOfInstancesActivePaying=Number of good standing paid instances
 NbOfInstancesActivePayingAll=Number of paying instances
+NbOfInstancesActiveFree=Number of good standing confirmed instances
+NbOfInstancesActiveFreeAll=Number of confirmed instances
 NbOfInstancesActivePayingDesc=Number of instances deployed with existing active recurring invoice, non expired and non suspended
 NbOfInstancesActivePayingWithoutRecInvoice=Note: %s instances(s) of paying customers have no enabled recurring invoice (instance suspended on customer request but not yet undeployed)
 NbOfInstancesPaying=Nb of non test instances