Skip to content
Snippets Groups Projects
Commit 35a64d5e authored by Druganov Demid's avatar Druganov Demid
Browse files

fix bitrix api calls for client search

parent 7bdeb35b
Branches
Tags 0.3.4
No related merge requests found
......@@ -71,8 +71,8 @@ final class BitrixApi
return new ClientData(
id: $data['ID'],
name: $data['TITLE'],
taxPayerId: $data[Yii::$app->params['bitrix']['customFields']['taxPayerId']],
taxRegistrationReasonCode: $data[Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode']]
taxPayerId: $data[Yii::$app->params['bitrix']['customFields']['taxPayerId'] ?? null] ?? null,
taxRegistrationReasonCode: $data[Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode'] ?? null] ?? null
);
}
......@@ -93,13 +93,13 @@ final class BitrixApi
if (is_numeric($query)) {
if (strlen($query) === 10 || strlen($query) === 12) {
$taxPayerId = Yii::$app->params['bitrix']['customFields']['taxPayerId'];
$taxPayerId = Yii::$app->params['bitrix']['customFields']['taxPayerId'] ?? null;
return self::companySearch("=$taxPayerId", $query);
}
if (strlen($query) === 9) {
$taxRegistrationReasonCode = Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode'];
$taxRegistrationReasonCode = Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode'] ?? null;
return self::companySearch("=$taxRegistrationReasonCode", $query);
}
......@@ -131,12 +131,12 @@ final class BitrixApi
'filter' => array_filter([
$column => $value
] + $additionalFilter),
'select' => [
'select' => array_filter([
'ID',
'TITLE',
Yii::$app->params['bitrix']['customFields']['taxPayerId'],
Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode']
]
Yii::$app->params['bitrix']['customFields']['taxPayerId'] ?? null,
Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode'] ?? null
])
])['result'] ?? [];
if (!$rows) {
return [];
......@@ -145,8 +145,8 @@ final class BitrixApi
return array_map(static fn(array $row) => new ClientData(
id: $row['ID'],
name: $row['TITLE'],
taxPayerId: $row[Yii::$app->params['bitrix']['customFields']['taxPayerId']],
taxRegistrationReasonCode: $row[Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode']]
taxPayerId: $row[Yii::$app->params['bitrix']['customFields']['taxPayerId'] ?? null] ?? null,
taxRegistrationReasonCode: $row[Yii::$app->params['bitrix']['customFields']['taxRegistrationReasonCode'] ?? null] ?? null
), $rows);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment