|
@@ -253,11 +253,12 @@ class Webservice
|
|
|
public function getById($webservice, $id)
|
|
|
{
|
|
|
$result = $this->getArray($webservice, array(
|
|
|
- 'id' => $id
|
|
|
+ 'id' => $id,
|
|
|
));
|
|
|
-
|
|
|
- return isset($result[0]) && isset($result[0]['id']) && isset($result[0]['name'])
|
|
|
- ? "{$result[0]['id']} - {$result[0]['name']}"
|
|
|
+
|
|
|
+ $isset = isset($result[0]) && isset($result[0]['id']) && isset($result[0]['externalId']) && isset($result[0]['name']);
|
|
|
+ return $isset
|
|
|
+ ? "{$result[0]['externalId']} - {$result[0]['name']} ({$result[0]['id']})"
|
|
|
: $id;
|
|
|
}
|
|
|
|
|
@@ -368,7 +369,10 @@ class Webservice
|
|
|
if (is_numeric($value['value'])) {
|
|
|
$clients = $this->getData('client',
|
|
|
array(
|
|
|
- 'externalId' => $value['value']
|
|
|
+ 'qb-criteria' => '',
|
|
|
+ 'orWhere' => '',
|
|
|
+ 'id' => $value['value'],
|
|
|
+ 'externalId' => $value['value'],
|
|
|
)
|
|
|
);
|
|
|
} else {
|
|
@@ -376,9 +380,10 @@ class Webservice
|
|
|
array(
|
|
|
'qb-criteria' => '',
|
|
|
'orWhere' => '',
|
|
|
+ 'id' => $value['value'],
|
|
|
'externalId' => $value['value'],
|
|
|
'name' => $value['value'],
|
|
|
- 'address' => $value['value']
|
|
|
+ 'address' => $value['value'],
|
|
|
)
|
|
|
);
|
|
|
}
|