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

Author: eldy

admin/setup_other.php

@@ -591,6 +591,22 @@
 	}
 }
 
+print '<tr class="oddeven"><td>'.$langs->trans("SELLYOURSAAS_SUPPORT_TICKET_CREATE").'</td>';
+print '<td>';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('SELLYOURSAAS_SUPPORT_TICKET_CREATE', array(), null, 0, 0, 0);
+} else {
+	if (!getDolGlobalString('SELLYOURSAAS_SUPPORT_TICKET_CREATE')) {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_SUPPORT_TICKET_CREATE">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=SELLYOURSAAS_SUPPORT_TICKET_CREATE">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	}
+}
+print '</td>';
+print '<td><span class="opacitymedium small"></span></td>';
+print '</tr>';
+
+
 print '</table>';
 print '</div>';
 

langs/en_US/sellyoursaas.lang

@@ -969,3 +969,4 @@ ModulesToIgnoreForAutoUpgrade=Modules to ignore for auto-upgrade
 PleaseFillContactInfoFirst=Please fill your contact an dorganization information first
 GoToYourResellerMenuTogetInformation=Go to menu "%s" for more information
 AccessIsReservedTofinalCustomerOnly=Access is reserved to final customer only (ask him if yo need it)
+SELLYOURSAAS_SUPPORT_TICKET_CREATE=Enable automatic ticket creation when the contact form is used

langs/fr_FR/sellyoursaas.lang

@@ -965,3 +965,4 @@ SaveAndPay=Économisez et payez
 ModulesToIgnoreForAutoUpgrade=Modules à ignorer pour la mise à jour automatique
 PleaseFillContactInfoFirst=Veuillez d'abord remplir vos coordonnées.
 GoToYourResellerMenuTogetInformation=Accédez au menu « %s » pour plus d'informations.
+SELLYOURSAAS_SUPPORT_TICKET_CREATE=Activer la création automatique de tickets lorsque le formulaire de contact est utilisé

myaccount/index.php

@@ -110,6 +110,7 @@
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 //require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
@@ -904,6 +905,24 @@
 		if (is_object($tmpcontract)) {
 			$trackid = 'con'.$tmpcontract->id;
 		}
+		if (getDolGlobalInt("SELLYOURSAAS_SUPPORT_TICKET_CREATE")) {
+			$tickettocreate = new Ticket($db);
+			$tickettocreate->ref = $tickettocreate->getDefaultRef();
+			$tickettocreate->subject = $topic;
+			$tickettocreate->message = $content;
+			$tickettocreate->fk_soc = $mythirdpartyaccount->id;
+			$tickettocreate->socid = $mythirdpartyaccount->id;
+			$tickettocreate->origin_replyto = $replyto;
+			$tickettocreate->origin_email = $emailfrom;
+			$tickettocreate->ip = $ipaddress;
+			if (is_object($tmpcontract)) {
+				$tickettocreate->fk_contract = $tmpcontract->id;
+			}
+			$res = $tickettocreate->create($user);
+			if ($res > 0) {
+				$trackid = $tickettocreate->track_id;
+			}
+		}
 
 		// Send email
 		$cmailfile = new CMailFile($topic, $emailto, $emailfrom, $content, $arr_file, $arr_mime, $arr_name, '', '', 0, 1, '', '', $trackid, '', 'standard', $replyto);