Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #235 from mesilov/dev
Dev
- Loading branch information
Showing
29 changed files
with
1,503 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Bitrix24\SDK\Services\CRM\Common\Result; | ||
|
|
||
| use Bitrix24\SDK\Core\Result\AbstractItem; | ||
| use Bitrix24\SDK\Services\CRM\Userfield\Exceptions\UserfieldNotFoundException; | ||
| use DateTimeImmutable; | ||
|
|
||
| class AbstractCrmItem extends AbstractItem | ||
| { | ||
| private const CRM_USERFIELD_PREFIX = 'UF_CRM_'; | ||
|
|
||
| /** | ||
| * @param int|string $offset | ||
| * | ||
| * @return bool|\DateTimeImmutable|int|mixed|null | ||
| */ | ||
| public function __get($offset) | ||
| { | ||
| // todo унести в отдельный класс и покрыть тестами | ||
| // приведение полей к реальным типам данных для основных сущностей CRM | ||
| switch ($offset) { | ||
| case 'ID': | ||
| case 'ASSIGNED_BY_ID': | ||
| case 'CREATED_BY_ID': | ||
| case 'MODIFY_BY_ID': | ||
| // deal | ||
| case 'LEAD_ID': | ||
| case 'CONTACT_ID': | ||
| case 'QUOTE_ID': | ||
| if ($this->data[$offset] !== '' && $this->data[$offset] !== null) { | ||
| return (int)$this->data[$offset]; | ||
| } | ||
|
|
||
| return null; | ||
| case 'COMPANY_ID': | ||
| if ($this->data[$offset] !== '' && $this->data[$offset] !== null && $this->data[$offset] !== '0') { | ||
| return (int)$this->data[$offset]; | ||
| } | ||
|
|
||
| return null; | ||
|
|
||
| // contact | ||
| case 'EXPORT': | ||
| case 'HAS_PHONE': | ||
| case 'HAS_EMAIL': | ||
| case 'HAS_IMOL': | ||
| case 'OPENED': | ||
| // deal | ||
| case 'IS_MANUAL_OPPORTUNITY': | ||
| case 'CLOSED': | ||
| case 'IS_NEW': | ||
| case 'IS_RECURRING': | ||
| case 'IS_RETURN_CUSTOMER': | ||
| case 'IS_REPEATED_APPROACH': | ||
| return $this->data[$offset] === 'Y'; | ||
| case 'DATE_CREATE': | ||
| case 'DATE_MODIFY': | ||
| case 'BIRTHDATE': | ||
| case 'BEGINDATE': | ||
| case 'CLOSEDATE': | ||
| if ($this->data[$offset] !== '') { | ||
| return DateTimeImmutable::createFromFormat(DATE_ATOM, $this->data[$offset]); | ||
| } | ||
|
|
||
| return null; | ||
| default: | ||
| return $this->data[$offset] ?? null; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * get userfield by field name | ||
| * | ||
| * @param string $fieldName | ||
| * | ||
| * @return mixed|null | ||
| * @throws \Bitrix24\SDK\Services\CRM\Userfield\Exceptions\UserfieldNotFoundException | ||
| */ | ||
| protected function getKeyWithUserfieldByFieldName(string $fieldName) | ||
| { | ||
| $fieldName = self::CRM_USERFIELD_PREFIX . $fieldName; | ||
| if (!$this->isKeyExists($fieldName)) { | ||
| throw new UserfieldNotFoundException(sprintf('crm userfield not found by field name %s', $fieldName)); | ||
| } | ||
|
|
||
| return $this->$fieldName; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
src/Services/CRM/Contact/Result/ContactUserfieldItemResult.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Bitrix24\SDK\Services\CRM\Contact\Result; | ||
|
|
||
| use Bitrix24\SDK\Services\CRM\Userfield\Result\AbstractUserfieldItemResult; | ||
|
|
||
| class ContactUserfieldItemResult extends AbstractUserfieldItemResult | ||
| { | ||
| } |
18 changes: 18 additions & 0 deletions
18
src/Services/CRM/Contact/Result/ContactUserfieldResult.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Bitrix24\SDK\Services\CRM\Contact\Result; | ||
|
|
||
| use Bitrix24\SDK\Core\Result\AbstractResult; | ||
|
|
||
| class ContactUserfieldResult extends AbstractResult | ||
| { | ||
| /** | ||
| * @throws \Bitrix24\SDK\Core\Exceptions\BaseException | ||
| */ | ||
| public function userfieldItem(): ContactUserfieldItemResult | ||
| { | ||
| return new ContactUserfieldItemResult($this->getCoreResponse()->getResponseData()->getResult()->getResultData()); | ||
| } | ||
| } |
Oops, something went wrong.