Merge pull request #18 from mindbox-moscow/MB-750

Mb 750

Author: MaximBurcev

.gitignore

@@ -1,2 +1,3 @@
 vendor/
 composer.lock 
+src/Clients/getDeviceUUID

.travis.yml

@@ -28,4 +28,4 @@ install:
 # Run scripts
 script:
   - vendor/bin/phpcs
-  - vendor/bin/phpunit --coverage-text
+  - vendor/bin/phpunit

src/Clients/AbstractMindboxClient.php

@@ -270,6 +270,8 @@ final protected function parseRawResponse(MindboxRequest $request, HttpClientRaw
             throw new \Mindbox\Exceptions\MindboxClientException('Empty response body');
         }
 
+        //$statusCode = 503;
+
         switch ($statusCode) {
             case 200:
                 $this->logger->info($message, $context);
@@ -280,7 +282,9 @@ final protected function parseRawResponse(MindboxRequest $request, HttpClientRaw
                 throw new \Mindbox\Exceptions\MindboxUnavailableException('Service unavailable');
             case 400:
                 $this->logger->error($message, $context);
-                throw new \Mindbox\Exceptions\MindboxBadRequestException('Bad request');
+                $body = $context['response']['body'];
+                $arBody  = json_decode($body, true);
+                throw new \Mindbox\Exceptions\MindboxBadRequestException(substr($arBody['errorMessage'], strpos($arBody['errorMessage'], ":") + 1));
             case 409:
                 $this->logger->error($message, $context);
                 throw new \Mindbox\Exceptions\MindboxConflictException('Conflict');

src/Clients/MindboxClientV3.php

@@ -5,7 +5,6 @@
 
 use Mindbox\HttpClients\IHttpClient;
 use Psr\Log\LoggerInterface;
-use Mindbox\Options;
 
 /**
  * Клиент для отправки запросов к v3 API Mindbox.
@@ -122,8 +121,8 @@ protected function prepareQueryParams($operation, array $queryParams, $addDevice
      */
     private function getDeviceUUID()
     {
-        if(empty($_COOKIE['mindboxDeviceUUID'])) {
-            $logger = new \Mindbox\Loggers\MindboxFileLogger(Options::getModuleOption('LOG_PATH'));
+        if (empty($_COOKIE['mindboxDeviceUUID'])) {
+            $logger = new \Mindbox\Loggers\MindboxFileLogger(__DIR__ . '/getDeviceUUID/');
             $message = date('d.m.Y H:i:s');
             $logger->error($message, ['$_COOKIE' => $_COOKIE, '$_REQUEST' => $_REQUEST, '$_SERVER' => $_SERVER]);
         }

src/DTO/V2/Requests/OrderRequestDTO.php

@@ -124,4 +124,12 @@ public function setDeliveryCost($deliveryCost)
     {
         $this->setField('deliveryCost', $deliveryCost);
     }
+
+    /**
+     * @param mixed $order
+     */
+    public function setOrder($order)
+    {
+        $this->setField('order', $order);
+    }
 }

src/DTO/V2/Responses/LineResponseDTO.php

@@ -63,6 +63,6 @@ public function getGiftCard()
      */
     public function getDiscountedPrice()
     {
-        return $this->getField('discountedPrice');
+        return $this->getField('discountedPriceOfLine');
     }
 }

src/DTO/V3/DiscountDTO.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace Mindbox\DTO\V3;
+
+use Mindbox\DTO\DTO;
+
+/**
+ * Class DiscountDTO
+ *
+ * @package Mindbox\DTO\V3
+ * @property string $type
+ * @property string $amount
+ * @property string $id
+ **/
+abstract class DiscountDTO extends DTO
+{
+    /**
+     * @var string Название элемента для корректной генерации xml.
+     */
+    protected static $xmlName = 'discount';
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->getField('type');
+    }
+
+    /**
+     * @return string
+     */
+    public function getAmount()
+    {
+        return $this->getField('amount');
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->getField('id');
+    }
+}

src/DTO/V3/OrderDTO.php

@@ -0,0 +1,40 @@
+<?php
+
+
+namespace Mindbox\DTO\V3;
+
+use Mindbox\DTO\DTO;
+
+/**
+ * Class OrderDTO
+ *
+ * @package Mindbox\DTO\V3
+ * @property array  $ids
+ * @property string $pointOfContact
+ * @property string $area
+ **/
+abstract class OrderDTO extends DTO
+{
+    use IdentityDTO;
+
+    /**
+     * @var string Название элемента для корректной генерации xml.
+     */
+    protected static $xmlName = 'order';
+
+    /**
+     * @return string
+     */
+    public function getPointOfContact()
+    {
+        return $this->getField('pointOfContact');
+    }
+
+    /**
+     * @return string
+     */
+    public function getArea()
+    {
+        return $this->getField('area');
+    }
+}

src/DTO/V3/Requests/DiscountRequestCollection.php

@@ -0,0 +1,24 @@
+<?php
+
+
+namespace Mindbox\DTO\V3\Requests;
+
+use Mindbox\DTO\DTOCollection;
+
+/**
+ * Class DiscountRequestCollection
+ *
+ * @package Mindbox\DTO\V3\Requests
+ */
+class DiscountRequestCollection extends DTOCollection
+{
+    /**
+     * @var string Название элементов коллекции для корректной генерации xml.
+     */
+    protected static $collectionItemsName = DiscountRequestDTO::class;
+
+    /**
+     * @var string Название элемента для корректной генерации xml.
+     */
+    protected static $xmlName = 'discounts';
+}

src/DTO/V3/Requests/DiscountRequestDTO.php

@@ -0,0 +1,38 @@
+<?php
+
+
+namespace Mindbox\DTO\V3\Requests;
+
+use Mindbox\DTO\V3\DiscountDTO;
+
+/**
+ * Class DiscountRequestDTO
+ *
+ * @package Mindbox\DTO\V2\Requests
+ **/
+class DiscountRequestDTO extends DiscountDTO
+{
+    /**
+     * @param mixed $type
+     */
+    public function setType($type)
+    {
+        $this->setField('type', $type);
+    }
+
+    /**
+     * @param mixed $amount
+     */
+    public function setAmount($amount)
+    {
+        $this->setField('amount', $amount);
+    }
+
+    /**
+     * @param mixed $id
+     */
+    public function setId($id)
+    {
+        $this->setField('id', $id);
+    }
+}