Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
->in(__DIR__ . '/src/Services/SonetGroup/')
->in(__DIR__ . '/src/Services/IMOpenLines/')
->in(__DIR__ . '/src/Services/Landing/')
->in(__DIR__ . '/src/Services/Catalog/')
->name('*.php')
->exclude(['vendor', 'storage', 'docker', 'docs']) // Exclude directories
->ignoreDotFiles(true)
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

### Added

- Added service `Services\Catalog\StoreProduct` with support methods,
see [catalog.storeproduct.* methods](https://apidocs.bitrix24.com/api-reference/catalog/store-product/index.html) ([#584](https://github.com/bitrix24/b24phpsdk/issues/584)):
- `get` returns product stock information by record identifier
- `list` returns a list of product stock records by filter
- `getFields` returns the description of product stock fields
- Added service `Services\Landing\Site\Service\Site` with support methods,
see [landing.site.* methods](https://github.com/bitrix24/b24phpsdk/issues/267):
- `add` adds a site
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,10 @@ test-integration-landing-role:
test-integration-landing-repowidget:
docker compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_landing_repowidget

.PHONY: test-integration-catalog-store-product
test-integration-catalog-store-product:
docker compose run --rm php-cli vendor/bin/phpunit --testsuite integration_tests_catalog_store_product

# work dev environment
.PHONY: php-dev-server-up
php-dev-server-up:
Expand Down
3 changes: 3 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@
<testsuite name="integration_tests_landing_repowidget">
<directory>./tests/Integration/Services/Landing/RepoWidget/</directory>
</testsuite>
<testsuite name="integration_tests_catalog_store_product">
<directory>./tests/Integration/Services/Catalog/StoreProduct/</directory>
</testsuite>
</testsuites>
<source>
<include>
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Catalog/Catalog/Result/CatalogItemResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
*/
class CatalogItemResult extends AbstractCatalogItem
{
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Catalog/Result/CatalogResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ public function catalog(): CatalogItemResult
{
return new CatalogItemResult($this->getCoreResponse()->getResponseData()->getResult()['catalog']);
}
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Catalog/Result/CatalogsResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ public function getCatalogs(): array

return $res;
}
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Catalog/Service/Catalog.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ public function fields(): FieldsResult
{
return new FieldsResult($this->core->call('catalog.catalog.getFields'));
}
}
}
15 changes: 14 additions & 1 deletion src/Services/Catalog/CatalogServiceBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Bitrix24\SDK\Core\Credentials\Scope;
use Bitrix24\SDK\Services\AbstractServiceBuilder;
use Bitrix24\SDK\Services\Catalog;

#[ApiServiceBuilderMetadata(new Scope(['catalog']))]
class CatalogServiceBuilder extends AbstractServiceBuilder
{
Expand Down Expand Up @@ -44,4 +45,16 @@ public function catalog(): Catalog\Catalog\Service\Catalog

return $this->serviceCache[__METHOD__];
}
}

public function storeProduct(): Catalog\StoreProduct\Service\StoreProduct
{
if (!isset($this->serviceCache[__METHOD__])) {
$this->serviceCache[__METHOD__] = new Catalog\StoreProduct\Service\StoreProduct(
$this->core,
$this->log
);
}

return $this->serviceCache[__METHOD__];
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Common/ProductType.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ enum ProductType: int
case SKU = 3;
case productOffer = 4;
case genericOffer = 5;
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Common/Result/AbstractCatalogItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ protected function getKeyWithUserfieldByFieldName(string $fieldName)

return $this->$fieldName;
}
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Product/Result/ProductItemResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
*/
class ProductItemResult extends AbstractCatalogItem
{
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Product/Result/ProductResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ public function product(): ProductItemResult

return new ProductItemResult($this->getCoreResponse()->getResponseData()->getResult()['product']);
}
}
}
2 changes: 1 addition & 1 deletion src/Services/Catalog/Product/Result/ProductsResult.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ public function getProducts(): array

return $res;
}
}
}
6 changes: 3 additions & 3 deletions src/Services/Catalog/Product/Service/Batch.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{
public function __construct(
protected BatchOperationsInterface $batch,
protected LoggerInterface $log)
{
protected LoggerInterface $log
) {
}
}
}
10 changes: 5 additions & 5 deletions src/Services/Catalog/Product/Service/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
use Bitrix24\SDK\Services\Catalog\Common\ProductType;
use Bitrix24\SDK\Services\Catalog\Product\Result\ProductResult;
use Bitrix24\SDK\Services\Catalog\Product\Result\ProductsResult;

use Psr\Log\LoggerInterface;

#[ApiServiceMetadata(new Scope(['catalog']))]
Expand All @@ -35,8 +34,7 @@ public function __construct(
public Batch $batch,
CoreInterface $core,
LoggerInterface $logger
)
{
) {
parent::__construct($core, $logger);
}

Expand Down Expand Up @@ -71,7 +69,9 @@ public function get(int $productId): ProductResult
)]
public function add(array $productFields): ProductResult
{
return new ProductResult($this->core->call('catalog.product.add', [
return new ProductResult($this->core->call(
'catalog.product.add',
[
'fields' => $productFields
]
));
Expand Down Expand Up @@ -140,4 +140,4 @@ public function fieldsByFilter(int $iblockId, ProductType $productType, ?array $

return new FieldsResult($this->core->call('catalog.product.getFieldsByFilter', ['filter' => $filter]));
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

/**
* This file is part of the bitrix24-php-sdk package.
*
* © Dmitriy Ignatenko <algonexys@gmail.com>
*
* For the full copyright and license information, please view the MIT-LICENSE.txt
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Bitrix24\SDK\Services\Catalog\StoreProduct\Result;

use Bitrix24\SDK\Core\Exceptions\BaseException;
use Bitrix24\SDK\Core\Result\AbstractResult;

class StoreProductFieldsResult extends AbstractResult
{
/**
* @return array<string, array<string, mixed>>
* @throws BaseException
*/
public function getFieldsDescription(): array
{
return $this->getCoreResponse()->getResponseData()->getResult()['storeProduct'];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

/**
* This file is part of the bitrix24-php-sdk package.
*
* © Dmitriy Ignatenko <algonexys@gmail.com>
*
* For the full copyright and license information, please view the MIT-LICENSE.txt
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Bitrix24\SDK\Services\Catalog\StoreProduct\Result;

use Bitrix24\SDK\Core\Result\AbstractItem;

/**
* @property-read int $id
* @property-read int $productId
* @property-read int $storeId
* @property-read float $amount
* @property-read float|null $quantityReserved
*/
class StoreProductItemResult extends AbstractItem
{
}
26 changes: 26 additions & 0 deletions src/Services/Catalog/StoreProduct/Result/StoreProductResult.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

/**
* This file is part of the bitrix24-php-sdk package.
*
* © Dmitriy Ignatenko <algonexys@gmail.com>
*
* For the full copyright and license information, please view the MIT-LICENSE.txt
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Bitrix24\SDK\Services\Catalog\StoreProduct\Result;

use Bitrix24\SDK\Core\Result\AbstractResult;

class StoreProductResult extends AbstractResult
{
public function storeProduct(): StoreProductItemResult
{
return new StoreProductItemResult(
$this->getCoreResponse()->getResponseData()->getResult()['storeProduct']
);
}
}
42 changes: 42 additions & 0 deletions src/Services/Catalog/StoreProduct/Result/StoreProductsResult.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

/**
* This file is part of the bitrix24-php-sdk package.
*
* © Dmitriy Ignatenko <algonexys@gmail.com>
*
* For the full copyright and license information, please view the MIT-LICENSE.txt
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Bitrix24\SDK\Services\Catalog\StoreProduct\Result;

use Bitrix24\SDK\Core\Exceptions\BaseException;
use Bitrix24\SDK\Core\Result\AbstractResult;

class StoreProductsResult extends AbstractResult
{
/**
* @return StoreProductItemResult[]
* @throws BaseException
*/
public function getStoreProducts(): array
{
$res = [];
foreach ($this->getCoreResponse()->getResponseData()->getResult()['storeProducts'] as $item) {
$res[] = new StoreProductItemResult($item);
}

return $res;
}

/**
* @throws BaseException
*/
public function getTotal(): int
{
return $this->getCoreResponse()->getResponseData()->getPagination()->getTotal() ?? 0;
}
}
92 changes: 92 additions & 0 deletions src/Services/Catalog/StoreProduct/Service/StoreProduct.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?php

/**
* This file is part of the bitrix24-php-sdk package.
*
* © Dmitriy Ignatenko <algonexys@gmail.com>
*
* For the full copyright and license information, please view the MIT-LICENSE.txt
* file that was distributed with this source code.
*/

declare(strict_types=1);

namespace Bitrix24\SDK\Services\Catalog\StoreProduct\Service;

use Bitrix24\SDK\Attributes\ApiEndpointMetadata;
use Bitrix24\SDK\Attributes\ApiServiceMetadata;
use Bitrix24\SDK\Core\Credentials\Scope;
use Bitrix24\SDK\Core\Exceptions\BaseException;
use Bitrix24\SDK\Core\Exceptions\TransportException;
use Bitrix24\SDK\Services\AbstractService;
use Bitrix24\SDK\Services\Catalog\StoreProduct\Result\StoreProductFieldsResult;
use Bitrix24\SDK\Services\Catalog\StoreProduct\Result\StoreProductResult;
use Bitrix24\SDK\Services\Catalog\StoreProduct\Result\StoreProductsResult;

#[ApiServiceMetadata(new Scope(['catalog']))]
class StoreProduct extends AbstractService
{
/**
* Returns information about product stock by record identifier.
*
* @link https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-get.html
*
* @throws BaseException
* @throws TransportException
*/
#[ApiEndpointMetadata(
'catalog.storeproduct.get',
'https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-get.html',
'Returns information about product stock by record identifier.'
)]
public function get(int $id): StoreProductResult
{
$this->guardPositiveId($id);

return new StoreProductResult($this->core->call('catalog.storeproduct.get', ['id' => $id]));
}

/**
* Returns a list of product stock records by filter.
*
* @link https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-list.html
*
* @param string[] $select
* @param array<string, mixed> $filter
* @param array<string, string> $order
*
* @throws BaseException
* @throws TransportException
*/
#[ApiEndpointMetadata(
'catalog.storeproduct.list',
'https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-list.html',
'Returns a list of product stock records by filter.'
)]
public function list(array $select = [], array $filter = [], array $order = []): StoreProductsResult
{
return new StoreProductsResult($this->core->call('catalog.storeproduct.list', [
'select' => $select,
'filter' => $filter,
'order' => $order,
]));
}

/**
* Returns the fields of product stock records.
*
* @link https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-get-fields.html
*
* @throws BaseException
* @throws TransportException
*/
#[ApiEndpointMetadata(
'catalog.storeproduct.getFields',
'https://apidocs.bitrix24.com/api-reference/catalog/store-product/catalog-store-product-get-fields.html',
'Returns the fields of product stock records.'
)]
public function getFields(): StoreProductFieldsResult
{
return new StoreProductFieldsResult($this->core->call('catalog.storeproduct.getFields'));
}
}
Loading
Loading