Merge branch 'dev' into feature/153-add-contact-detail-configuration

Author: sallee113

.gitignore

@@ -17,3 +17,4 @@ docs/api/var
 .env.local
 *.local
 /.php-cs-fixer.cache
+log.txt

.php-cs-fixer.php

@@ -7,6 +7,9 @@
 $finder = Finder::create()
     ->in(__DIR__ . '/src/Infrastructure/Console/Commands/')
     ->in(__DIR__ . '/src/Services/CRM/Contact/')
+    ->in(__DIR__ . '/src/Services/CRM/Quote/')
+    ->in(__DIR__ . '/src/Services/CRM/Lead/')
+    ->in(__DIR__ . '/src/Services/CRM/Currency/')
     ->name('*.php')
     ->exclude(['vendor', 'storage', 'docker', 'docs']) // Exclude directories
     ->ignoreDotFiles(true)

CHANGELOG.md

@@ -4,6 +4,50 @@
 
 ### Added
 
+- Added service `Services\CRM\Lead\Service\LeadProductRows` with support methods,
+  see [add crm.lead.productrows* methods](https://github.com/bitrix24/b24phpsdk/issues/175):
+    - `set` Adds products to a lead
+    - `get` Returns the products of a lead
+- Added service `Services\CRM\Quote\Service\Quote` with support methods,
+  see [crm.quote.* methods](https://github.com/bitrix24/b24phpsdk/issues/179):
+    - `fields` returns a list of fields for the quote
+    - `get` returns the settings of the quote by Id
+    - `list` returns a list of quote
+    - `add` creates a new quote
+    - `delete` deletes a quote
+    - `update` modifies the quote
+    - `countByFilter` count quotes by filter
+- Added support for events:
+    - `OnCrmQuoteAdd`
+    - `OnCrmQuoteDelete`
+    - `OnCrmQuoteUpdate`
+    - `OnCrmQuoteUserFieldAdd`
+    - `OnCrmQuoteUserFieldDelete`
+    - `OnCrmQuoteUserFieldSetEnumValues`
+    - `OnCrmQuoteUserFieldUpdate`
+- Added service `Services\CRM\Quote\Service\QuoteUserfield` with support methods:
+    - `add` add userfield to a quote
+    - `get` get userfield to a quote
+    - `list` list userfields
+    - `delete` delete userfield
+    - `update` update userfield
+- Added service `Services\CRM\Quote\Service\QuoteProductRows` with support methods:
+    - `set` Adds products to a quote
+    - `get` Returns the products of a quote
+- Added service `Services\CRM\Quote\Service\QuoteContact` with support methods,
+    - `fields` get fiels for quote contact connection
+    - `setItems` set contacts related with quote
+    - `get` get contacts related to quote
+    - `deleteItems` delete all relations for quote
+    - `add` add contact relation with quote
+    - `delete` delete contact relation with quote
+- Added service `CRM\Lead\Service\LeadUserfield` with support methods,
+  see [add crm.lead.userfield.* methods](https://github.com/bitrix24/b24phpsdk/issues/177):
+    - `add` add userfield to lead
+    - `get` get userfield to lead
+    - `list` list userfields
+    - `delete` delete userfield
+    - `update` update userfield
 - Added service `Services\CRM\Deal\Service\DealRecurring` with support methods,
   see [crm.deal.recurring.* methods](https://github.com/bitrix24/b24phpsdk/issues/160):
     - `fields` returns a list of fields for the recurring deal template
@@ -19,11 +63,25 @@
     - `delete` delete trigger, with batch calls support
     - `list`  get list of triggers, with batch calls support
     - `execute` execute trigger, with batch calls support
+- Added service `Services\CRM\Currency` with support methods,
+  see [Add crm.currency.* methods](https://github.com/bitrix24/b24phpsdk/issues/155):
+    - `get` get currency
+    - `fields` get currency fields
+    - `list` get currency list
+    - `add` add new currency, with batch calls support
+    - `delete` delete currency, with batch calls support
+    - `update`  update currency, with batch calls support
+- Added service `Services\CRM\Currency\Localizations` with support methods,
+  see [Add crm.currency.* methods](https://github.com/bitrix24/b24phpsdk/issues/155):
+    - `set` set localizations, with batch calls support
+    - `get` get localizations
+    - `fields` get localization fields
+    - `delete` delete currency, with batch calls support
 
 ### Fixed
 
 - Fixed error in arguments in service for method `placement.bind`, [see details](https://github.com/bitrix24/b24phpsdk/issues/151)
-
+- Fixed errors in `task.elapseditem.*` call in ApiClient [see details](https://github.com/bitrix24/b24phpsdk/issues/180) 
 ### Changed
 
 - ❗**️️BC** Changed contract `Bitrix24\SDK\Application\Contracts\Bitrix24Accounts\Entity\Bitrix24AccountInterface`, this change needs to process corner cases

Makefile

@@ -183,13 +183,33 @@ test-integration-scope-ai-admin:
 integration_tests_scope_crm_contact_details:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_crm_contact_details
 
+.PHONY: integration_tests_lead_userfield
+integration_tests_lead_userfield:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lead_userfield
+	
+.PHONY: integration_tests_lead_userfield_use_case
+integration_tests_lead_userfield_use_case:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lead_userfield_use_case
+  
+.PHONY: integration_tests_scope_crm_currency
+integration_tests_scope_crm_currency:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_crm_currency
+
 .PHONY: integration_tests_deal_recurring
 integration_tests_deal_recurring:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_deal_recurring
 
 .PHONY: integration_tests_scope_automation
 integration_tests_scope_automation:
 	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_scope_automation
+	
+.PHONY: integration_tests_lead_productrows
+integration_tests_lead_productrows:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_lead_productrows
+
+.PHONY: integration_tests_crm_quote
+integration_tests_crm_quote:
+	docker-compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_crm_quote
 
 # work dev environment
 .PHONY: php-dev-server-up

phpstan.neon.dist

@@ -12,6 +12,14 @@ parameters:
     - tests/Integration/Services/Main
     - tests/Integration/Services/Placement
     - tests/Integration/Services/CRM/Contact/Service/ContactDetailsConfigurationTest.php
+    - tests/Integration/Services/CRM/Lead/Service/LeadProductRowsTest.php
+    - tests/Integration/Services/CRM/Quote/Service/QuoteTest.php
+    - tests/Integration/Services/CRM/Quote/Service/BatchTest.php
+    - tests/Integration/Services/CRM/Quote/Service/QuoteContactTest.php
+    - tests/Integration/Services/CRM/Quote/Service/QuoteUserfieldTest.php
+    - tests/Integration/Services/CRM/Quote/Service/QuoteProductRowsTest.php
+    - tests/Integration/Services/CRM/Lead/Service/LeadUserfieldTest.php
+    - tests/Integration/Services/CRM/Currency
   bootstrapFiles:
     - tests/bootstrap.php
   parallel:

phpunit.xml.dist

@@ -46,12 +46,27 @@
         <testsuite name="integration_tests_scope_crm_contact_details">
             <file>./tests/Integration/Services/CRM/Contact/Service/ContactDetailsConfigurationTest.php</file>
         </testsuite>
+        <testsuite name="integration_tests_lead_productrows">
+            <file>./tests/Integration/Services/CRM/Lead/Service/LeadProductRowsTest.php</file>
+        </testsuite>
+        <testsuite name="integration_tests_lead_userfield">
+            <file>./tests/Integration/Services/CRM/Lead/Service/LeadUserfieldTest.php</file>
+        </testsuite>
+        <testsuite name="integration_tests_lead_userfield_use_case">
+            <file>./tests/Integration/Services/CRM/Lead/Service/LeadUserfieldUseCaseTest.php</file>
+        </testsuite>
+        <testsuite name="integration_tests_scope_crm_currency">
+            <directory>./tests/Integration/Services/CRM/Currency/</directory>
+        </testsuite>
         <testsuite name="integration_tests_deal_recurring">
             <file>./tests/Integration/Services/CRM/Deal/Service/DealRecurringTest.php</file>
         </testsuite>
         <testsuite name="integration_tests_scope_automation">
             <directory>./tests/Integration/Services/CRM/Automation/</directory>
         </testsuite>
+        <testsuite name="integration_tests_crm_quote">
+            <directory>./tests/Integration/Services/CRM/Quote/</directory>
+        </testsuite>
     </testsuites>
     <source>
         <include>

rector.php

@@ -38,6 +38,12 @@
         __DIR__ . '/tests/Integration/Services/Placement',
         __DIR__ . '/src/Services/CRM/Contact/Service/ContactDetailsConfiguration.php',
         __DIR__ . '/tests/Integration/Services/CRM/Contact/Service/ContactDetailsConfigurationTest.php',
+        __DIR__ . '/src/Services/CRM/Lead',
+        __DIR__ . '/tests/Integration/Services/CRM/Lead/Service',
+        __DIR__ . '/src/Services/CRM/Quote',
+        __DIR__ . '/tests/Integration/Services/CRM/Quote/Service',
+        __DIR__ . '/src/Services/CRM/Currency',
+        __DIR__ . '/tests/Integration/Services/CRM/Currency',
         __DIR__ . '/tests/Unit/',
     ])
     ->withCache(cacheDirectory: __DIR__ . '.cache/rector')

src/Core/ApiClient.php

@@ -210,7 +210,15 @@ public function getResponse(string $apiMethod, array $parameters = []): Response
             'task.commentitem.update',
             'task.commentitem.getlist',
             'task.commentitem.delete',
-            'task.commentitem.isactionallowed'
+            'task.commentitem.isactionallowed',
+            'task.elapseditem.add',
+            'task.elapseditem.update',
+            'task.elapseditem.get',
+            'task.elapseditem.getlist',
+            'task.elapseditem.delete',
+            'task.elapseditem.isactionallowed',
+            'task.elapseditem.getmanifest',
+            'tasks.task.add',
         ];
         if (!in_array($apiMethod, $strictApiMethods, true)) {
             $url .= '?' . $this->requestIdGenerator->getQueryStringParameterName() . '=' . $requestId;

src/Core/Batch.php

@@ -837,7 +837,7 @@ protected function getTraversable(bool $isHaltOnError): Generator
      * @throws BaseException
      * @throws Exceptions\TransportException
      */
-    private function getTraversableBatchResults(bool $isHaltOnError): Generator
+    protected function getTraversableBatchResults(bool $isHaltOnError): Generator
     {
         $this->logger->debug(
             'getTraversableBatchResults.start',

src/Services/CRM/CRMServiceBuilder.php

@@ -95,6 +95,40 @@ public function vat(): VatRates\Service\Vat
 
         return $this->serviceCache[__METHOD__];
     }
+    
+    public function currency(): Currency\Service\Currency
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $batch = new Currency\Batch(
+                $this->core,
+                $this->log
+            );
+            $this->serviceCache[__METHOD__] = new Currency\Service\Currency(
+                new Currency\Service\Batch($batch, $this->log),
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+    
+    public function localizations(): Currency\Localizations\Service\Localizations
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $batch = new Currency\Localizations\Batch(
+                $this->core,
+                $this->log
+            );
+            $this->serviceCache[__METHOD__] = new Currency\Localizations\Service\Localizations(
+                new Currency\Localizations\Service\Batch($batch, $this->log),
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
 
     public function companyContact(): Company\Service\CompanyContact
     {
@@ -289,6 +323,81 @@ public function lead(): Lead\Service\Lead
 
         return $this->serviceCache[__METHOD__];
     }
+    
+    /**
+     * @return Lead\Service\LeadProductRows
+     */
+    public function leadProductRows(): Lead\Service\LeadProductRows
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Lead\Service\LeadProductRows($this->core, $this->log);
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+  
+    public function leadUserfield(): Lead\Service\LeadUserfield
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Lead\Service\LeadUserfield(
+                new UserfieldConstraints(),
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+    
+    public function quote(): Quote\Service\Quote
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Quote\Service\Quote(
+                new Quote\Service\Batch($this->batch, $this->log),
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+    
+    public function quoteContact(): Quote\Service\QuoteContact
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Quote\Service\QuoteContact(
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+    
+    /**
+     * @return Quote\Service\QuoteProductRows
+     */
+    public function quoteProductRows(): Quote\Service\QuoteProductRows
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Quote\Service\QuoteProductRows($this->core, $this->log);
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
+    
+    public function quoteUserfield(): Quote\Service\QuoteUserfield
+    {
+        if (!isset($this->serviceCache[__METHOD__])) {
+            $this->serviceCache[__METHOD__] = new Quote\Service\QuoteUserfield(
+              new UserfieldConstraints(),
+                $this->core,
+                $this->log
+            );
+        }
+
+        return $this->serviceCache[__METHOD__];
+    }
 
     public function activity(): Activity\Service\Activity
     {