Merge pull request #221 from opheugene/offer-site

Added site field to ProductOffer

.github/workflows/ci.yml

@@ -17,24 +17,30 @@ jobs:
         php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
     steps:
       - name: Check out code into the workspace
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
+
       - name: Composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ env.HOME }}/.composer/cache
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+
       - name: Install dependencies
         run: composer install -o
+
       - name: Configure matchers
         uses: mheap/phpunit-matcher-action@v1
+
       - name: Run tests
         run: composer run-script phpunit-ci
+
       - name: Coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
           verbose: true

.github/workflows/code_quality.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the workspace
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run PHPCS
         uses: chekalsky/phpcs-action@v1
   phpmd:
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the workspace
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run PHPMD
         uses: GeneaLabs/action-reviewdog-phpmd@1.0.0
         with:
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the workspace
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run PHPStan
         uses: docker://oskarstark/phpstan-ga:1.8.0
         with:

.github/workflows/documentation.yml

@@ -19,7 +19,7 @@ jobs:
           pages_threshold: major_outage
       - name: Check out code into the workspace
         if: success() && ${{ github.ref != 'refs/heads/master' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP 8.3
         if: ${{ github.ref != 'refs/heads/master' }}
         uses: shivammathur/setup-php@v2
@@ -27,7 +27,7 @@ jobs:
           php-version: "8.3"
       - name: Cache phpDocumentor
         id: cache-phpdocumentor
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: phpDocumentor.phar
           key: phpdocumentor

composer.json

@@ -23,19 +23,19 @@
         "psr/http-message": "^1.0 || ^2.0",
         "psr/http-message-implementation": "^1.0",
         "php-http/client-implementation": "^1.0",
-        "php-http/message-factory": "^1.0",
         "php-http/discovery": "^1.13",
         "doctrine/annotations": "^1.13|^2.0",
         "liip/serializer": "2.2.* || 2.6.*",
         "php-http/httplug": "^2.2",
         "civicrm/composer-compile-plugin": "^0.20",
-        "symfony/console": "^4.0|^5.0|^6.0",
+        "symfony/console": "^4.0|^5.0|^6.0|^7.0",
         "psr/event-dispatcher": "^1.0",
         "neur0toxine/psr.http-client-implementation.php-http-curl": "*",
         "neur0toxine/psr.http-factory-implementation.nyholm": "*",
         "neur0toxine/psr.http-message-implementation.nyholm": "*",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
-        "symfony/cache": ">=v3.1.0"
+        "symfony/cache": ">=v3.1.0",
+        "psr/http-factory": "^1.1"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5",

src/Factory/ClientFactory.php

@@ -285,6 +285,7 @@ class ClientFactory implements ClientFactoryInterface, EventDispatcherAwareInter
             ->setStreamFactory($this->streamFactory)
             ->setRequestFactory($this->requestFactory)
             ->setUriFactory($this->uriFactory)
+            ->setEventDispatcher($this->eventDispatcher)
             ->appendRequestHandlers($this->requestHandlers)
             ->appendResponseHandlers($this->responseHandlers)
             ->build();

src/Model/Entity/Customers/Customer.php

@@ -369,6 +369,14 @@ class Customer implements CustomerInterface
      */
     public $subscribed;
 
+    /**
+     * @var \RetailCrm\Api\Model\Entity\Customers\CustomerSubscription[]
+     *
+     * @JMS\Type("array<RetailCrm\Api\Model\Entity\Customers\CustomerSubscription>")
+     * @JMS\SerializedName("customerSubscriptions")
+     */
+    public $customerSubscriptions;
+
     /**
      * @var \RetailCrm\Api\Model\Entity\Customers\MGCustomer[]
      *

src/Model/Entity/Customers/CustomerSubscription.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category CustomerSubscription
+ * @package  RetailCrm\Api\Model\Entity\Customers
+ */
+
+namespace RetailCrm\Api\Model\Entity\Customers;
+
+use DateTime;
+use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+
+/**
+ * Class CustomerSubscription
+ *
+ * @category CustomerSubscription
+ * @package  RetailCrm\Api\Model\Entity\Customers
+ */
+class CustomerSubscription
+{
+    /**
+     * @var \RetailCrm\Api\Model\Entity\Customers\SubscriptionCategory
+     *
+     * @JMS\Type("RetailCrm\Api\Model\Entity\Customers\SubscriptionCategory")
+     * @JMS\SerializedName("subscription")
+     */
+    public $subscription;
+
+    /**
+     * @var bool
+     *
+     * @JMS\Type("bool")
+     * @JMS\SerializedName("subscribed")
+     */
+    public $subscribed;
+
+    /**
+     * @var DateTime
+     *
+     * @JMS\Type("DateTime<'Y-m-d H:i:s'>")
+     * @JMS\SerializedName("changedAt")
+     */
+    public $changedAt;
+}

src/Model/Entity/Customers/SubscriptionCategory.php

@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category SubscriptionCategory
+ * @package  RetailCrm\Api\Model\Entity\Customers
+ */
+
+namespace RetailCrm\Api\Model\Entity\Customers;
+
+use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+
+/**
+ * Class SubscriptionCategory
+ *
+ * @category SubscriptionCategory
+ * @package  RetailCrm\Api\Model\Entity\Customers
+ */
+class SubscriptionCategory
+{
+    /**
+     * @var int
+     *
+     * @JMS\Type("int")
+     * @JMS\SerializedName("id")
+     */
+    public $id;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("channel")
+     */
+    public $channel;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("name")
+     */
+    public $name;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("code")
+     */
+    public $code;
+
+    /**
+     * @var bool
+     *
+     * @JMS\Type("bool")
+     * @JMS\SerializedName("active")
+     */
+    public $active;
+
+    /**
+     * @var bool
+     *
+     * @JMS\Type("bool")
+     * @JMS\SerializedName("autoSubscribe")
+     */
+    public $autoSubscribe;
+
+    /**
+     * @var int
+     *
+     * @JMS\Type("int")
+     * @JMS\SerializedName("ordering")
+     */
+    public $ordering;
+}

src/Model/Entity/Integration/EmbedJs/EmbedJsConfiguration.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category EmbedJsConfiguration
+ * @package  RetailCrm\Api\Model\Entity\Integration\EmbedJs
+ */
+
+namespace RetailCrm\Api\Model\Entity\Integration\EmbedJs;
+
+use RetailCrm\Api\Component\Serializer\Annotation as JMS;
+
+/**
+ * Class EmbedJsConfiguration
+ *
+ * @category EmbedJsConfiguration
+ * @package  RetailCrm\Api\Model\Entity\Integration\EmbedJs
+ */
+class EmbedJsConfiguration
+{
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("entrypoint")
+     */
+    public $entrypoint;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("stylesheet")
+     */
+    public $stylesheet;
+
+    /**
+     * @var string[]
+     *
+     * @JMS\Type("array<string>")
+     * @JMS\SerializedName("targets")
+     */
+    public $targets;
+}

src/Model/Entity/Integration/Integrations.php

@@ -74,4 +74,12 @@ class Integrations
      * @JMS\SerializedName("mgBot")
      */
     public $mgBot;
+
+    /**
+     * @var \RetailCrm\Api\Model\Entity\Integration\EmbedJs\EmbedJsConfiguration
+     *
+     * @JMS\Type("RetailCrm\Api\Model\Entity\Integration\EmbedJs\EmbedJsConfiguration")
+     * @JMS\SerializedName("embedJs")
+     */
+    public $embedJs;
 }

src/Model/Entity/Payments/ApiUpdateInvoiceRequest.php

@@ -43,6 +43,14 @@ class ApiUpdateInvoiceRequest
      */
     public $amount;
 
+    /**
+     * @var float
+     *
+     * @JMS\Type("float")
+     * @JMS\SerializedName("discountAmount")
+     */
+    public $discountAmount;
+
     /**
      * @var string
      *

src/Model/Entity/References/Store.php

@@ -91,6 +91,14 @@ class Store
      */
     public $phone;
 
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("contact")
+     */
+    public $contact;
+
     /**
      * @var string
      *

src/Model/Entity/Store/Product.php

@@ -36,6 +36,14 @@ class Product
      */
     public $maxPrice;
 
+    /**
+     * @var int
+     *
+     * @JMS\Type("int")
+     * @JMS\SerializedName("catalogId")
+     */
+    public $catalogId;
+
     /**
      * @var int
      *

src/Model/Entity/Store/ProductOffer.php

@@ -170,4 +170,12 @@ class ProductOffer
      * @JMS\SerializedName("barcode")
      */
     public $barcode;
+
+    /**
+     * @var string
+     *
+     * @JMS\Type("string")
+     * @JMS\SerializedName("site")
+     */
+    public $site;
 }

src/Model/Filter/Customers/CustomerFilter.php

@@ -494,4 +494,12 @@ class CustomerFilter
      * @Form\SerializedName("attachedTags")
      */
     public $attachedTags;
+
+    /**
+     * @var \RetailCrm\Api\Model\Filter\Customers\CustomerSubscriptionFilter[]
+     *
+     * @Form\Type("array<RetailCrm\Api\Model\Filter\Customers\CustomerSubscriptionFilter>")
+     * @Form\SerializedName("subscriptions")
+     */
+    public $subscriptions;
 }

src/Model/Filter/Customers/CustomerSubscriptionFilter.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category CustomerSubscriptionFilter
+ * @package  RetailCrm\Api\Model\Filter\Customers
+ */
+
+namespace RetailCrm\Api\Model\Filter\Customers;
+
+use RetailCrm\Api\Component\FormData\Mapping as Form;
+
+/**
+ * Class CustomerSubscriptionFilter
+ *
+ * @category CustomerSubscriptionFilter
+ * @package  RetailCrm\Api\Model\Filter\Customers
+ */
+class CustomerSubscriptionFilter
+{
+    /**
+     * @var string
+     *
+     * @Form\Type("string")
+     * @Form\SerializedName("channel")
+     */
+    public $channel;
+
+    /**
+     * @var string
+     *
+     * @Form\Type("string")
+     * @Form\SerializedName("subscription")
+     */
+    public $subscription;
+
+    /**
+     * @var bool
+     *
+     * @Form\Type("bool")
+     * @Form\SerializedName("subscribed")
+     */
+    public $subscribed;
+}

src/Model/Filter/CustomersCorporate/CustomerCorporateFilter.php

@@ -357,4 +357,12 @@ class CustomerCorporateFilter
      * @Form\SerializedName("companyName")
      */
     public $companyName;
+
+    /**
+     * @var array<string, mixed>
+     *
+     * @Form\Type("array")
+     * @Form\SerializedName("customFields")
+     */
+    public $customFields;
 }

src/Model/Filter/Store/OfferFilterType.php

@@ -68,6 +68,14 @@ class OfferFilterType
      */
     public $sites;
 
+    /**
+     * @var int[]
+     *
+     * @Form\Type("int[]")
+     * @Form\SerializedName("catalogs")
+     */
+    public $catalogs;
+
     /**
      * @var int
      *
@@ -83,4 +91,52 @@ class OfferFilterType
      * @Form\SerializedName("sinceId")
      */
     public $sinceId;
+
+    /**
+     * @var int[]
+     *
+     * @Form\Type("int[]")
+     * @Form\SerializedName("groups")
+     */
+    public $groups;
+
+    /**
+     * @var string
+     *
+     * @Form\Type("string")
+     * @Form\SerializedName("priceType")
+     */
+    public $priceType;
+
+    /**
+     * @var int
+     *
+     * @Form\Type("int")
+     * @Form\SerializedName("minPrice")
+     */
+    public $minPrice;
+
+    /**
+     * @var int
+     *
+     * @Form\Type("int")
+     * @Form\SerializedName("maxPrice")
+     */
+    public $maxPrice;
+
+    /**
+     * @var int
+     *
+     * @Form\Type("int")
+     * @Form\SerializedName("minQuantity")
+     */
+    public $minQuantity;
+
+    /**
+     * @var int
+     *
+     * @Form\Type("int")
+     * @Form\SerializedName("maxQuantity")
+     */
+    public $maxQuantity;
 }

src/Model/Filter/Store/ProductFilterType.php

@@ -124,6 +124,14 @@ class ProductFilterType
      */
     public $url;
 
+    /**
+     * @var string
+     *
+     * @Form\Type("string")
+     * @Form\SerializedName("urlLike")
+     */
+    public $urlLike;
+
     /**
      * @var string
      *

src/Model/Request/Loyalty/LoyaltyBonusChargeRequest.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category LoyaltyBonusChargeRequest
+ * @package  RetailCrm\Api\Model\Request\Loyalty
+ */
+
+namespace RetailCrm\Api\Model\Request\Loyalty;
+
+use DateTime;
+use RetailCrm\Api\Component\FormData\Mapping as Form;
+use RetailCrm\Api\Interfaces\RequestInterface;
+
+/**
+ * Class LoyaltyBonusChargeRequest
+ *
+ * @category LoyaltyBonusChargeRequest
+ * @package  RetailCrm\Api\Model\Request\Loyalty
+ */
+class LoyaltyBonusChargeRequest implements RequestInterface
+{
+    /**
+     * @var float
+     *
+     * @Form\Type("float")
+     * @Form\SerializedName("amount")
+     */
+    public $amount;
+
+    /**
+     * @var string
+     *
+     * @Form\Type("string")
+     * @Form\SerializedName("comment")
+     */
+    public $comment;
+}

src/ResourceGroup/Loyalty.php

@@ -16,6 +16,7 @@ use RetailCrm\Api\Model\Request\Loyalty\LoyaltiesRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountCreateRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountEditRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountsRequest;
+use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusChargeRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusCreditRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusOperationsRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyCalculateRequest;
@@ -30,6 +31,7 @@ use RetailCrm\Api\Model\Response\Loyalty\LoyaltyBonusCreditResponse;
 use RetailCrm\Api\Model\Response\Loyalty\LoyaltyBonusOperationsResponse;
 use RetailCrm\Api\Model\Response\Loyalty\LoyaltyCalculateResponse;
 use RetailCrm\Api\Model\Response\Loyalty\LoyaltyResponse;
+use RetailCrm\Api\Model\Response\SuccessResponse;
 
 /**
  * Class Loyalty
@@ -163,6 +165,66 @@ class Loyalty extends AbstractApiResourceGroup
         return $response;
     }
 
+    /**
+     * Makes POST "/api/v5/loyalty/account/{id}/bonus/charge" request.
+     *
+     * Example:
+     * ```php
+     * use RetailCrm\Api\Factory\SimpleClientFactory;
+     * use RetailCrm\Api\Interfaces\ApiExceptionInterface;
+     * use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusChargeRequest;
+     *
+     * $client = SimpleClientFactory::createClient('https://test.retailcrm.pro', 'apiKey');
+     *
+     * $request = new LoyaltyBonusChargeRequest();
+     * $request->amount = 100;
+     * $request->comment = 'Payment for the goods.';
+     *
+     * try {
+     *     $response = $client->loyalty->accountBonusCharge(159, $request);
+     * } catch (ApiExceptionInterface $exception) {
+     *     echo sprintf(
+     *         'Error from RetailCRM API (status code: %d): %s',
+     *         $exception->getStatusCode(),
+     *         $exception->getMessage()
+     *     );
+     *
+     *     if (count($exception->getErrorResponse()->errors) > 0) {
+     *         echo PHP_EOL . 'Errors: ' . implode(', ', $exception->getErrorResponse()->errors);
+     *     }
+     *
+     *     return;
+     * }
+     *
+     * echo 'Status: ' . var_export($response->success, true);
+     * ```
+     *
+     * @param int                                                            $id
+     * @param \RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusChargeRequest $request
+     *
+     * @return \RetailCrm\Api\Model\Response\Loyalty\LoyaltyBonusCreditResponse
+     * @throws \RetailCrm\Api\Exception\Api\AccountDoesNotExistException
+     * @throws \RetailCrm\Api\Exception\Api\ApiErrorException
+     * @throws \RetailCrm\Api\Exception\Api\MissingCredentialsException
+     * @throws \RetailCrm\Api\Exception\Api\MissingParameterException
+     * @throws \RetailCrm\Api\Exception\Api\ValidationException
+     * @throws \RetailCrm\Api\Exception\Client\HandlerException
+     * @throws \RetailCrm\Api\Exception\Client\HttpClientException
+     * @throws \RetailCrm\Api\Interfaces\ApiExceptionInterface
+     * @throws \RetailCrm\Api\Interfaces\ClientExceptionInterface
+     */
+    public function accountBonusCharge(int $id, LoyaltyBonusChargeRequest $request): SuccessResponse
+    {
+        /** @var LoyaltyBonusCreditResponse $response */
+        $response = $this->sendRequest(
+            RequestMethod::POST,
+            'loyalty/account/' . $id . '/bonus/charge',
+            $request,
+            SuccessResponse::class
+        );
+        return $response;
+    }
+
     /**
      * Makes POST "/api/v5/loyalty/account/{id}/bonus/credit" request.
      *

src/Traits/EventDispatcherAwareTrait.php

@@ -27,7 +27,7 @@ trait EventDispatcherAwareTrait
      *
      * @param \Psr\EventDispatcher\EventDispatcherInterface|null $eventDispatcher
      *
-     * @return object
+     * @return static
      */
     public function setEventDispatcher(?EventDispatcherInterface $eventDispatcher): object
     {

tests/src/ResourceGroup/CustomersTest.php

@@ -180,6 +180,33 @@ class CustomersTest extends AbstractApiResourceGroupTestCase
           "number": "89229112322"
         }
       ],
+      "customerSubscriptions": [
+        {
+          "subscription": {
+            "id": 2,
+            "channel": "email",
+            "name": "Без тематики",
+            "code": "default_marketing",
+            "active": true,
+            "autoSubscribe": true,
+            "ordering": 1
+          },
+          "subscribed": true
+        },
+        {
+          "subscription": {
+            "id": 4,
+            "channel": "waba",
+            "name": "Без тематики",
+            "code": "default_marketing",
+            "active": true,
+            "autoSubscribe": true,
+            "ordering": 1
+          },
+          "subscribed": false,
+          "changedAt": "2024-12-17 11:50:43"
+        }
+      ],
       "mgCustomers": [
         {
           "id": 1,
@@ -2670,6 +2697,33 @@ EOF;
         "number": "+79094055044"
       }
     ],
+    "customerSubscriptions": [
+      {
+        "subscription": {
+          "id": 2,
+          "channel": "email",
+          "name": "Без тематики",
+          "code": "default_marketing",
+          "active": true,
+          "autoSubscribe": true,
+          "ordering": 1
+        },
+        "subscribed": true
+      },
+      {
+        "subscription": {
+          "id": 4,
+          "channel": "waba",
+          "name": "Без тематики",
+          "code": "default_marketing",
+          "active": true,
+          "autoSubscribe": true,
+          "ordering": 1
+        },
+        "subscribed": false,
+        "changedAt": "2024-12-17 11:50:43"
+      }
+    ],
     "mgCustomers": [
       {
         "id": 1,

tests/src/ResourceGroup/LoyaltyTest.php

@@ -38,6 +38,7 @@ use RetailCrm\Api\Model\Request\Loyalty\LoyaltiesRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountCreateRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountEditRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyAccountsRequest;
+use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusChargeRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusCreditRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyBonusOperationsRequest;
 use RetailCrm\Api\Model\Request\Loyalty\LoyaltyCalculateRequest;
@@ -121,6 +122,29 @@ EOF;
         self::assertModelEqualsToResponse($json, $response);
     }
 
+    public function testAccountBonusCharge(): void
+    {
+        $json = <<<EOF
+{
+    "success": true
+}
+EOF;
+
+        $request = new LoyaltyBonusChargeRequest();
+        $request->amount = 100;
+        $request->comment = 'Monthly membership bonuses.';
+
+        $mock = static::createApiMockBuilder('loyalty/account/159/bonus/charge');
+        $mock->matchMethod(RequestMethod::POST)
+            ->reply(200)
+            ->withBody($json);
+
+        $client = TestClientFactory::createClient($mock->getClient());
+        $response = $client->loyalty->accountBonusCharge(159, $request);
+
+        self::assertModelEqualsToResponse($json, $response);
+    }
+
     public function testAccountBonusCredit(): void
     {
         $activationDate = new DateTime();

tests/src/ResourceGroup/PaymentsTest.php

@@ -99,6 +99,7 @@ EOF;
         $invoiceRequest->paymentId   = 'd6458333-fff3-4fd0-9b23-4e6344451f8e';
         $invoiceRequest->invoiceUuid = '5b1b2e9d-b7f1-48f4-acb9-4bfce04b30cf';
         $invoiceRequest->invoiceUrl  = 'https://example.com/newUrl';
+        $invoiceRequest->discountAmount = 20.0;
 
         $request = new PaymentUpdateInvoiceRequest($invoiceRequest);
 

tests/src/ResourceGroup/StoreTest.php

@@ -943,11 +943,24 @@ EOF;
         $request                    = new OffersRequest();
         $request->filter            = new OfferFilterType();
         $request->filter->active    = NumericBoolean::TRUE;
-        $request->filter->name      = 'Test Offer';
+        $request->filter->minPrice      = 1;
+        $request->filter->maxPrice      = 120000;
+        $request->filter->sites      = ['main'];
+        $request->filter->maxQuantity      = 5;
+        $request->filter->catalogs      =  [2];
 
         $mock = static::createApiMockBuilder('store/offers');
         $mock->matchMethod(RequestMethod::GET)
-            ->matchQuery(self::encodeFormArray($request))
+            ->matchQuery([
+                'filter' => [
+                    'sites' => ['main'],
+                    'catalogs' => ['2'],
+                    'active' => '1',
+                    'minPrice' => '1',
+                    'maxPrice' => '120000',
+                    'maxQuantity' => '5',
+                ]
+            ])
             ->reply(200)
             ->withBody($json);