diff --git a/api/v2/app/src/controllers/CommonController.php b/api/v2/app/src/controllers/CommonController.php index f8994c0..1fe3fa8 100755 --- a/api/v2/app/src/controllers/CommonController.php +++ b/api/v2/app/src/controllers/CommonController.php @@ -14557,6 +14557,7 @@ class CommonController extends ApiController `e`.`calendar_view`, `e`.`cancel`, `e`.`tel`, + `e`.`deal_id`, `o`.`nazv`, `e`.`name` @@ -14581,6 +14582,7 @@ class CommonController extends ApiController `e`.`calendar_view`, `e`.`cancel`, 0 AS `tel`, + 0 AS `deal_id`, `o`.`nazv`, '' AS `name` FROM `user_sub_comments` AS `s` LEFT JOIN `user_object_events` AS `e` ON e.`id` = `s`.`event_id` @@ -14592,6 +14594,11 @@ class CommonController extends ApiController if ($query = mysql_query($sql)) { while ($event = mysql_fetch_assoc($query)) { + // Deal-события обрабатываются отдельно в client_events + if ($event['type'] == 'deal' && !empty($event['deal_id'])) { + continue; + } + $type = null; $is_viewed = false; $event['nazv'] = str_replace('"', "'", $event['nazv']); @@ -14872,7 +14879,7 @@ class CommonController extends ApiController 'object_id' => null, 'requisition_id' => !empty($bestEvent['req_id']) ? (int)$bestEvent['req_id'] : null, 'employee_id' => null, - 'title' => "Сделка " . str_replace('"', "'", $dealTitle ?: 'без названия'), + 'title' => str_replace('"', "'", $dealTitle ?: 'Сделка'), 'event_type' => 'deal', 'is_viewed' => $is_viewed, 'user_id' => $bestEvent['user_id'],