'; - print '' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . ''; + if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || ! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) { + print '
'; + } + if (! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) + { + print '' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . ''; + } print '
'; } diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index 3c1c6c4306853..fdc92e70602dc 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -94,7 +94,7 @@ public function __construct($db) // Dependencies $this->hidden = false; // A condition to hide module - $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->depends = array('modAgenda'); // List of module class names as string that must be enabled if this module is enabled $this->requiredby = array(); // List of module ids to disable if this one is disabled $this->conflictwith = array(); // List of module class names as string this module is in conflict with $this->phpmin = array(5,4); // Minimum version of PHP required by module diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index ba6a65c7b3096..c739f8d5624aa 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -942,6 +942,7 @@ SearchIntoContracts=Contracts SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave +SearchIntoTickets=Tickets CommentLink=Comments NbComments=Number of comments CommentPage=Comments space diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index 235abd885b666..83786c55a877d 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -124,7 +124,7 @@ TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automaticall TicketNumberingModules=Tickets numbering module TicketNotifyTiersAtCreation=Notify third party at creation TicketGroup=Group -TicketsDisableCustomerEmail=Alsways disable emails when a ticket is created from public interface +TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface # # Index & list page # @@ -254,7 +254,7 @@ TicketPublicInfoCreateTicket=This form allows you to record a support ticket in TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request. TicketPublicMsgViewLogIn=Please enter ticket tracking ID TicketTrackId=Public Tracking ID -OneOfTicketTrackId=One of yours tracking ID +OneOfTicketTrackId=One of your tracking ID ErrorTicketNotFound=Ticket with tracking ID %s not found! Subject=Subject ViewTicket=View ticket @@ -264,6 +264,7 @@ TicketNewEmailSubjectAdmin=New ticket created TicketNewEmailBodyAdmin=
Ticket has just been created with ID #%s, see information:
SeeThisTicketIntomanagementInterface=See ticket in management interface TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled +ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email # notifications TicketNotificationEmailSubject=Ticket %s updated diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1b16fd7723960..6355c7e3e7fe1 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1903,11 +1903,11 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_ if (! is_object($form)) $form=new Form($db); $selected=-1; $usedbyinclude=1; + $arrayresult=null; include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) { - //$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1); $searchform.=$form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY)?1:0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1); } else diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 85605e2a97748..8cae415c6e1fb 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -370,10 +370,10 @@ function init_myfunc() $trackid='xxxx'.$object->id; include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php'; -if ($sall) +if ($search_all) { foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val); - print ''.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'
';
+ print ''.$langs->trans("FilterOnInto", $search_all) . join(', ', $fieldstosearchall).'
';
}
$moreforfilter = '';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 73b691500fd06..c341d32cf3e68 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -58,7 +58,7 @@
$email = $_SESSION['email_customer'];
}
-$object = new ActionsTicket($db);
+$object = new Ticket($db);
@@ -83,7 +83,7 @@
} else {
if (!isValidEmail($email)) {
$error++;
- array_push($object->errors, $langs->trans("ErrorEmailInvalid"));
+ array_push($object->errors, $langs->trans("ErrorEmailOrTrackingInvalid"));
$action = '';
}
}
@@ -91,9 +91,9 @@
if (!$error) {
$ret = $object->fetch('', '', $track_id);
- if ($ret && $object->dao->id > 0) {
+ if ($ret && $object->id > 0) {
// vérifie si l'adresse email est bien dans les contacts du ticket
- $contacts = $object->dao->liste_contact(-1, 'external');
+ $contacts = $object->liste_contact(-1, 'external');
foreach ($contacts as $contact) {
if ($contact['email'] == $email) {
$display_ticket_list = true;
@@ -104,12 +104,24 @@
$display_ticket_list = false;
}
}
-
- if ($object->dao->fk_soc > 0) {
- $object->dao->fetch_thirdparty();
+ if ($object->fk_soc > 0) {
+ $object->fetch_thirdparty();
+ if ($email == $object->thirdparty->email) {
+ $display_ticket_list = true;
+ $_SESSION['email_customer'] = $email;
+ $_SESSION['track_id_customer'] = $track_id;
+ }
}
-
- if ($email == $object->dao->origin_email || $email == $object->dao->thirdparty->email) {
+ if ($object->fk_user_create > 0) {
+ $tmpuser=new User($db);
+ $tmpuser->fetch($object->fk_user_create);
+ if ($email == $tmpuser->email) {
+ $display_ticket_list = true;
+ $_SESSION['email_customer'] = $email;
+ $_SESSION['track_id_customer'] = $track_id;
+ }
+ }
+ if ($email == $object->origin_email) {
$display_ticket_list = true;
$_SESSION['email_customer'] = $email;
$_SESSION['track_id_customer'] = $track_id;
@@ -127,7 +139,7 @@
}
}
-$object->doActions($action);
+//$object->doActions($action);
@@ -138,10 +150,11 @@
$form = new Form($db);
$user_assign = new User($db);
$user_create = new User($db);
-$formticket = new FormTicket($db);
+$formTicket = new FormTicket($db);
$arrayofjs = array();
$arrayofcss = array('/ticket/css/styles.css.php');
+
llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
@@ -154,7 +167,6 @@
if ($action == "view_ticketlist")
{
-
if ($display_ticket_list) {
// Filters
$search_fk_status = GETPOST("search_fk_status", 'alpha');
@@ -266,7 +278,6 @@
if (!$sortfield) {
$sortfield = 't.datec';
}
-
if (!$sortorder) {
$sortorder = 'DESC';
}
@@ -430,7 +441,6 @@
/*
* Filter bar
*/
- $formTicket = new FormTicket($db);
print ''.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'
';
+ print ''.$langs->trans("FilterOnInto", $search_all) . join(', ', $fieldstosearchall).'
';
}
$moreforfilter = '';