lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX #11543

Browse Source
This commit is contained in:
Laurent Destailleur 2019-08-01 12:40:51 +02:00
parent 5eb8f05061
commit b8de18596a
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
htdocs/ticket/class/api_tickets.class.php
View File

@ -218,17 +218,16 @@ class Tickets extends DolibarrApi
* Get a list of tickets
*
* @param int $socid Filter list with thirdparty ID
* @param string $mode Use this param to filter list
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)"
*
* @return array Array of ticket objects
*
*/
public function index($socid = 0, $mode = "", $sortfield = "s.rowid", $sortorder = "ASC", $limit = 0, $page = 0, $sqlfilters = '')
public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '')
{
global $db, $conf;
@ -243,51 +242,25 @@ class Tickets extends DolibarrApi
$search_sale = DolibarrApiAccess::$user->id;
}
$sql = "SELECT s.rowid";
$sql = "SELECT t.rowid";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
}
$sql.= " FROM ".MAIN_DB_PREFIX."ticket as s";
$sql.= " FROM ".MAIN_DB_PREFIX."ticket as t";
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
}
$sql.= ' WHERE s.entity IN ('.getEntity('ticket', 1).')';
$sql.= ' WHERE t.entity IN ('.getEntity('ticket', 1).')';
if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
$sql.= " AND s.fk_soc = sc.fk_soc";
$sql.= " AND t.fk_soc = sc.fk_soc";
}
if ($socid > 0) {
$sql.= " AND s.fk_soc = ".$socid;
$sql.= " AND t.fk_soc = ".$socid;
}
if ($search_sale > 0) {
$sql.= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
}
// Example of use $mode
if ($mode == 'new') {
$sql.= " AND s.fk_statut IN (0)";
}
if ($mode == 'read') {
$sql.= " AND s.fk_statut IN (1)";
}
if ($mode == 'answered') {
$sql.= " AND s.fk_statut IN (3)";
}
if ($mode == 'assign') {
$sql.= " AND s.fk_statut IN (4)";
}
if ($mode == 'inprogress') {
$sql.= " AND s.fk_statut IN (5)";
}
if ($mode == 'waiting') {
$sql.= " AND s.fk_statut IN (6)";
}
if ($mode == 'closed') {
$sql.= " AND s.fk_statut IN (8)";
}
if ($mode == 'deleted') {
$sql.= " AND s.fk_statut IN (9)";
$sql.= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
}
// Insert sale filter
@ -344,7 +317,6 @@ class Tickets extends DolibarrApi
*
* @param array $request_data Request datas
* @return int ID of ticket
*
*/
public function post($request_data = null)
{
@ -364,9 +336,11 @@ class Tickets extends DolibarrApi
if (empty($this->ticket->track_id)) {
$this->ticket->track_id = generate_random_id(16);
}
if (! $this->ticket->create(DolibarrApiAccess::$user)) {
throw new RestException(500);
if ($this->ticket->create(DolibarrApiAccess::$user) < 0) {
throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors));
}
return $this->ticket->id;
}
@ -561,8 +535,12 @@ class Tickets extends DolibarrApi
"lastname",
"firstname",
"civility_id",
"canvas",
"cache_msgs_ticket",
"cache_logs_ticket",
"cache_types_tickets",
"cache_category_tickets",
"regeximgext",
"statuts_short",
"statuts"
);