$dedupeParams['check_permission'] = $params['check_permission'];
}
- $ids = CRM_Dedupe_Finder::dupesByParams($dedupeParams, $params['contact_type'], 'Strict', array());
+ $ids = CRM_Dedupe_Finder::dupesByParams($dedupeParams, $params['contact_type'], 'Unsupervised', array());
if (count($ids) >0) {
throw new API_Exception("Found matching contacts: ". implode(',',$ids),"duplicate",array("ids"=>$ids));
$where .= " AND cc.contact_sub_type = '{$contactSubType}'";
}
+ if (!empty($params['contact_type'])) {
+ $contactType = CRM_Utils_Type::escape($params['contact_type'], 'String');
+ $where .= " AND cc.contact_type LIKE '{$contactType}'";
+ }
+
//set default for current_employer or return contact with particular id
if (!empty($params['id'])) {
$where .= " AND cc.id = " . (int) $params['id'];
if(!in_array($searchField, $list)) {
$list[] = $searchField;
}
- $request['params']['return'] = $list;
+ $request['description_field'] = $list;
+ $list[] = 'contact_type';
+ $request['params']['return'] = array_unique(array_merge($list, $request['extra']));
$request['params']['options']['sort'] = 'sort_name';
// Contact api doesn't support array(LIKE => 'foo') syntax
$request['params'][$request['search_field']] = $request['input'];
function _civicrm_api3_contact_getlist_output($result, $request) {
$output = array();
if (!empty($result['values'])) {
+ $addressFields = array_intersect(array('street_address', 'city', 'state_province', 'country'), $request['params']['return']);
foreach ($result['values'] as $row) {
$data = array(
'id' => $row[$request['id_field']],
'label' => $row[$request['label_field']],
+ 'description' => array(),
);
- $description = array();
- foreach ($request['params']['return'] as $item) {
- if (!strpos($item, '_name') && !empty($row[$item])) {
- $description[] = $row[$item];
+ foreach ($request['description_field'] as $item) {
+ if (!strpos($item, '_name') && !in_array($item, $addressFields) && !empty($row[$item])) {
+ $data['description'][] = $row[$item];
}
}
- $data['description'] = implode(' :: ', $description);
+ $address = array();
+ foreach($addressFields as $item) {
+ if (!empty($row[$item])) {
+ $address[] = $row[$item];
+ }
+ }
+ if ($address) {
+ $data['description'][] = implode(' ', $address);
+ }
if (!empty($request['image_field'])) {
$data['image'] = isset($row[$request['image_field']]) ? $row[$request['image_field']] : '';
- };
+ }
+ else {
+ $data['icon_class'] = $row['contact_type'];
+ }
+ foreach ($request['extra'] as $field) {
+ $data['extra'][$field] = isset($row[$field]) ? $row[$field] : NULL;
+ }
$output[] = $data;
}
}