add store and shipment date fields in RequestCalculate

Model/BaseStore.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace RetailCrm\DeliveryModuleBundle\Model;
+
+use JMS\Serializer\Annotation as Serializer;
+
+class BaseStore
+{
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("code")
+     * @Serializer\Type("string")
+     */
+    public $code;
+
+    /**
+     * @var string
+     *
+     * @Serializer\Groups({"request"})
+     * @Serializer\SerializedName("name")
+     * @Serializer\Type("string")
+     */
+    public $name;
+}

Model/Request/RequestCalculate.php

@@ -2,8 +2,9 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
-use RetailCrm\DeliveryModuleBundle\Model\DeliveryTime;
+use DateTime;
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\DeliveryTime;
 use RetailCrm\DeliveryModuleBundle\Model\Traits\ExtraDataTrait;
 
 class RequestCalculate
@@ -24,7 +25,7 @@ class RequestCalculate
     /**
      * Адрес доставки.
      *
-     * @var string
+     * @var RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("deliveryAddress")
@@ -79,7 +80,7 @@ class RequestCalculate
     /**
      * Дата доставки.
      *
-     * @var \DateTime
+     * @var DateTime
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("deliveryDate")

Model/RequestCalculate.php

@@ -2,6 +2,7 @@
 
 namespace RetailCrm\DeliveryModuleBundle\Model;
 
+use DateTime;
 use JMS\Serializer\Annotation as Serializer;
 
 class RequestCalculate
@@ -22,7 +23,7 @@ class RequestCalculate
     /**
      * Адрес доставки.
      *
-     * @var string
+     * @var DeliveryAddress
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("deliveryAddress")
@@ -74,10 +75,21 @@ class RequestCalculate
      */
     public $payerType;
 
+    /**
+     * Дата отгрузки.
+     *
+     * @var DateTime
+     *
+     * @Serializer\Groups({"request", "calculate"})
+     * @Serializer\SerializedName("shipmentDate")
+     * @Serializer\Type("DateTime<'Y-m-d'>")
+     */
+    public $shipmentDate;
+
     /**
      * Дата доставки.
      *
-     * @var \DateTime
+     * @var DateTime
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("deliveryDate")
@@ -117,4 +129,16 @@ class RequestCalculate
      * @Serializer\Type("array")
      */
     public $extraData;
+
+
+    /**
+     * Склад отгрузки.
+     *
+     * @var BaseStore
+     *
+     * @Serializer\Groups({"request", "calculate"})
+     * @Serializer\SerializedName("store")
+     * @Serializer\Type("RetailCrm\DeliveryModuleBundle\Model\BaseStore")
+     */
+    public $store;
 }

Model/Store.php

@@ -4,26 +4,8 @@ namespace RetailCrm\DeliveryModuleBundle\Model;
 
 use JMS\Serializer\Annotation as Serializer;
 
-class Store
+class Store extends BaseStore
 {
-    /**
-     * @var string
-     *
-     * @Serializer\Groups({"request"})
-     * @Serializer\SerializedName("code")
-     * @Serializer\Type("string")
-     */
-    public $code;
-
-    /**
-     * @var string
-     *
-     * @Serializer\Groups({"request"})
-     * @Serializer\SerializedName("name")
-     * @Serializer\Type("string")
-     */
-    public $name;
-
     /**
      * @var StoreWorkTime
      *