extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

moving opening of CRM view code into Contacts class

Browse Source
This commit is contained in:
Ralf Becker 2021-02-15 15:11:06 +02:00
parent 390c715508
commit a64590d3db
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addressbook/crm.php
View File

@ -84,32 +84,7 @@ else
try { try {
$contacts = new Api\Contacts(); $contacts = new Api\Contacts();
$found = $contacts->phone_search($from); $contacts->openCrmView($from);
// ToDo: select best match from multiple matches containing the number
$contact = $found[0];
$push = new Api\Json\Push($account_id);
$extras = [
//'index': ToDo: what's that used for?
'crm_list' => count($found) > 1 && $contact['org_name'] ? 'infolog-organisation' : 'infolog',
];
$params = [(int)$contact['id'], 'addressbook', 'view', $extras, [
'displayName' => count($found) > 1 && $contact['org_name'] ?
$contact['org_name'] : $contact['n_fn'].' ('.lang($extras['crm_list']).')',
'icon' => $contact['photo'],
'refreshCallback' => 'app.addressbook.view_refresh',
'id' => $contact['id'].'-'.$extras['crm_list'],
]];
/* ToDo: allow refreshCallback to be a "app.<appname>.<func>" string resolving also private / non-global apps
$push->apply('egw.openTab', $params);
*/
$params = str_replace('"app.addressbook.view_refresh"', 'function(){
let et2 = etemplate2.getById("addressbook-view-"+this.appName);
if (et2) et2.app_obj.addressbook.view_set_list();
}', json_encode($params, JSON_UNESCAPED_SLASHES));
$push->script('egw.openTab.apply(egw, '.$params.')');
if (!is_string($params)) $params = json_encode($params, JSON_UNESCAPED_SLASHES);
error_log("crm.php: calling push($user/#$account_id)->apply('egw.openTab', $params)");
die("calling push($user/#$account_id)->apply('egw.openTab', $params)\n");
} }
catch (\Exception $e) { catch (\Exception $e) {
error_log("crm.php: No contact for from=$from found!"); error_log("crm.php: No contact for from=$from found!");

46
api/src/Contacts.php
View File

@ -2786,7 +2786,7 @@ class Contacts extends Contacts\Storage
if (is_string($criteria) && preg_match(self::PHONE_PREG, $criteria)) if (is_string($criteria) && preg_match(self::PHONE_PREG, $criteria))
{ {
try { try {
return $this->phone_search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $ignore_acl); return $this->phoneSearch($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $ignore_acl);
} }
catch (\Exception $e) { catch (\Exception $e) {
// try regular search // try regular search
@ -2814,7 +2814,7 @@ class Contacts extends Contacts\Storage
* @throws Exception\WrongParameter|\libphonenumber\NumberParseException if $critera is not a string with a valid phone-number * @throws Exception\WrongParameter|\libphonenumber\NumberParseException if $critera is not a string with a valid phone-number
* @throws Exception\NotFound if no contact matches the phone-number in $criteria * @throws Exception\NotFound if no contact matches the phone-number in $criteria
*/ */
function &phone_search($criteria, $only_keys = false, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $ignore_acl = false) function &phoneSearch($criteria, $only_keys = false, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $ignore_acl = false)
{ {
$phoneNumberUtil = PhoneNumberUtil::getInstance(); $phoneNumberUtil = PhoneNumberUtil::getInstance();
$region = $GLOBALS['egw_info']['user']['preferences']['common']['country'] ?: 'DE'; $region = $GLOBALS['egw_info']['user']['preferences']['common']['country'] ?: 'DE';
@ -2848,7 +2848,10 @@ class Contacts extends Contacts\Storage
if (substr($name, 0, 4) === 'tel_' && !empty($value)) if (substr($name, 0, 4) === 'tel_' && !empty($value))
{ {
try { try {
$tel = $phoneNumberUtil->parse($value, $region); $tel = $phoneNumberUtil->parse($value,
// prefer region of contact, to eg. be able to parse US numbers starting direct with areacode but no leading 0
$row[substr($name, -5) === '_home' ? 'adr_two_countrycode' : 'adr_one_countrycode'] ?:
$row['adr_one_countrycode'] ?: $region);
if (($found = $tel->equals($number))) break; if (($found = $tel->equals($number))) break;
} }
catch (\Exception $e) { catch (\Exception $e) {
@ -2866,4 +2869,41 @@ class Contacts extends Contacts\Storage
} }
throw new Exception\NotFound("No contacts with phone number '$criteria' found!"); throw new Exception\NotFound("No contacts with phone number '$criteria' found!");
} }
/**
* Open CRM view for a calling number by sending a push requestion to the user
*
* @param $from
* @throws Exception\WrongParameter|\libphonenumber\NumberParseException if $critera is not a string with a valid phone-number
* @throws Exception\NotFound if no contact matches the phone-number in $criteria
*/
function openCrmView($from)
{
$found = $this->phoneSearch($from);
// ToDo: select best match from multiple matches containing the number
$contact = $found[0];
$push = new Json\Push($this->user);
$extras = [
//'index': ToDo: what's that used for?
'crm_list' => count($found) > 1 && $contact['org_name'] ? 'infolog-organisation' : 'infolog',
];
$params = [(int)$contact['id'], 'addressbook', 'view', $extras, [
'displayName' => count($found) > 1 && $contact['org_name'] ?
$contact['org_name'] : $contact['n_fn'].' ('.lang($extras['crm_list']).')',
'icon' => $contact['photo'],
'refreshCallback' => 'app.addressbook.view_refresh',
'id' => $contact['id'].'-'.$extras['crm_list'],
]];
/* ToDo: allow refreshCallback to be a "app.<appname>.<func>" string resolving also private / non-global apps
$push->apply('egw.openTab', $params);
*/
$params = str_replace('"app.addressbook.view_refresh"', 'function(){
let et2 = etemplate2.getById("addressbook-view-"+this.appName);
if (et2) et2.app_obj.addressbook.view_set_list();
}', json_encode($params, JSON_UNESCAPED_SLASHES));
$push->script('egw.openTab.apply(egw, '.$params.')');
if (!is_string($params)) $params = json_encode($params, JSON_UNESCAPED_SLASHES);
error_log("crm.php: calling push(#$this->user)->apply('egw.openTab', $params)");
//echo "calling push(#$this->user)->apply('egw.openTab', $params)\n";
}
} }