Merge pull request #444 from Hystepik/fix-display-of-ticket-in-myaccount

Fix prevent ticket to be chown if ticket public interface disabled

Author: eldy

myaccount/index.php

@@ -913,7 +913,7 @@
 			$tickettocreate->fk_soc = $mythirdpartyaccount->id;
 			$tickettocreate->socid = $mythirdpartyaccount->id;
 			$tickettocreate->origin_replyto = $replyto;
-			$tickettocreate->origin_email = $emailfrom;
+			$tickettocreate->origin_email = $replyto;
 			$tickettocreate->ip = $ipaddress;
 			if (is_object($tmpcontract)) {
 				$tickettocreate->fk_contract = $tmpcontract->id;

myaccount/tpl/support.tpl.php

@@ -632,7 +632,7 @@ function groupticketchange(){
 			';
 }
 
-if (isModEnabled("ticket") && empty($sellyoursaassupporturl) && ($action != 'presend' || !GETPOST('supportchannel', 'alpha'))) {
+if (isModEnabled("ticket") && getDolGlobalInt("SELLYOURSAAS_SUPPORT_TICKET_CREATE") && empty($sellyoursaassupporturl) && ($action != 'presend' || !GETPOST('supportchannel', 'alpha'))) {
 	print '
     				<!-- BEGIN PAGE HEADER-->
     				<!-- BEGIN PAGE HEAD -->
@@ -642,8 +642,6 @@ function groupticketchange(){
 					<h1>'.$langs->trans("OldTickets").' <small>'.$langs->trans("OldTicketsDesc").'</small></h1>
     				</div>
     				<!-- END PAGE TITLE -->
-
-
     				</div>
     				<!-- END PAGE HEAD -->
     				<!-- END PAGE HEADER-->';
@@ -670,7 +668,7 @@ function groupticketchange(){
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
 	$staticticket = new Ticket($db);
 
-	$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.fk_statut";
+	$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.fk_statut, t.origin_email, t.track_id";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 	$sql .= " WHERE t.fk_soc = '".$db->escape($socid)."'";		// $socid is id of third party account
 	$sql .= $db->order('t.fk_statut', 'ASC');
@@ -688,7 +686,6 @@ function groupticketchange(){
 				$staticticket->id = $obj->rowid;
 				$staticticket->ref = $obj->ref;
 				$staticticket->track_id = $obj->track_id;
-				$staticticket->fk_statut = $obj->fk_statut;
 				$staticticket->status = $obj->fk_statut;
 				$staticticket->progress = $obj->progress;
 				$staticticket->subject = $obj->subject;
@@ -697,7 +694,7 @@ function groupticketchange(){
 
 				// Ref
 				print '<td class="nowraponall">';
-				print $staticticket->getNomUrl(1);
+				print img_object("", $staticticket->picto, 'class="paddingright"'). $staticticket->ref;
 				print "</td>\n";
 
 				// Creation date