Skip to content

Commit

Permalink
Исправлен тип поля phone в свойстве Seller.
Browse files Browse the repository at this point in the history
Обновлены тестовые аккаунты.
  • Loading branch information
ihomyak committed Jun 18, 2020
1 parent 3dbe623 commit b70701d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 25 deletions.
4 changes: 2 additions & 2 deletions src/BaseTypes/Seller.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class Seller extends Base

/**
* Телефон истинного продавца
* @Type("CdekSDK2\BaseTypes\Phone")
* @var Phone
* @Type("string")
* @var string
*/
public $phone;

Expand Down
38 changes: 19 additions & 19 deletions src/Constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,13 @@ class Constants
* Аккаунт для тестовой среды
* @var string
*/
public const TEST_ACCOUNT = 'z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd';
public const TEST_ACCOUNT = 'EMscd6r9JnFiQ3bLoyjJY6eM78JrJceI';

/**
* Секретный ключ для тестовой среды
* @var string
*/
public const TEST_SECURE = 'w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq';
public const TEST_SECURE = 'PjLZkKBHEiLK3YsjtNrt3TGNG0ahs3kG';

/**
* Тип связанной сущности: возвратный заказ
Expand Down Expand Up @@ -325,103 +325,103 @@ class Constants

/**
* Код материала товара: Полиэстер
* @var string
* @var int
*/
public const MATERIAL_POLYESTER = 1;

/**
* Код материала товара: Нейлон
* @var string
* @var int
*/
public const MATERIAL_NYLON = 2;

/**
* Код материала товара: Флис
* @var string
* @var int
*/
public const MATERIAL_FLEECE = 3;

/**
* Код материала товара: Хлопок
* @var string
* @var int
*/
public const MATERIAL_COTTON = 4;

/**
* Код материала товара: Текстиль
* @var string
* @var int
*/
public const MATERIAL_TEXTILES = 5;

/**
* Код материала товара: Лён
* @var string
* @var int
*/
public const MATERIAL_FLAX = 6;

/**
* Код материала товара: Вискоза
* @var string
* @var int
*/
public const MATERIAL_VISCOSE = 7;

/**
* Код материала товара: Шелк
* @var string
* @var int
*/
public const MATERIAL_SILK = 8;

/**
* Код материала товара: Шерсть
* @var string
* @var int
*/
public const MATERIAL_WOOL = 9;

/**
* Код материала товара: Кашемир
* @var string
* @var int
*/
public const MATERIAL_CASHMERE = 10;

/**
* Код материала товара: Кожа
* @var string
* @var int
*/
public const MATERIAL_LEATHER = 11;

/**
* Код материала товара: Кожзам
* @var string
* @var int
*/
public const MATERIAL_LEATHERETTE = 12;

/**
* Код материала товара: Искусственный мех
* @var string
* @var int
*/
public const MATERIAL_FAUX_FUR = 13;

/**
* Код материала товара: Замша
* @var string
* @var int
*/
public const MATERIAL_SUEDE = 14;

/**
* Код материала товара: Полиуретан
* @var string
* @var int
*/
public const MATERIAL_POLYURETHANE = 15;

/**
* Код материала товара: Спандекс
* @var string
* @var int
*/
public const MATERIAL_SPANDEX = 16;

/**
* Код материала товара: Резина
* @var string
* @var int
*/
public const MATERIAL_RUBBER = 17;
}
4 changes: 2 additions & 2 deletions tests/ApiTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public function testSetTest()
{
$this->api->setTest(true);
$this->assertTrue($this->api->isTest());
$this->assertStringContainsString('z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd', $this->api->getAccount());
$this->assertStringContainsString('w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq', $this->api->getSecure());
$this->assertStringContainsString(Constants::TEST_ACCOUNT, $this->api->getAccount());
$this->assertStringContainsString(Constants::TEST_SECURE, $this->api->getSecure());
}

public function testAuthorize()
Expand Down
5 changes: 3 additions & 2 deletions tests/ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use CdekSDK2\Actions\Orders;
use CdekSDK2\Actions\Webhooks;
use CdekSDK2\BaseTypes\Invoice;
use CdekSDK2\Constants;
use CdekSDK2\Dto\RegionList;
use CdekSDK2\Client;
use CdekSDK2\Exceptions\ParsingException;
Expand Down Expand Up @@ -71,8 +72,8 @@ public function testSetTest(): Client
{
$this->client->setTest(true);
$this->assertTrue($this->client->isTest());
$this->assertStringContainsString('z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd', $this->client->getAccount());
$this->assertStringContainsString('w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq', $this->client->getSecure());
$this->assertStringContainsString(Constants::TEST_ACCOUNT, $this->client->getAccount());
$this->assertStringContainsString(Constants::TEST_SECURE, $this->client->getSecure());
return $this->client;
}

Expand Down

0 comments on commit b70701d

Please sign in to comment.