RetailCRM-Mirror/DeliveryModuleBundle
1
0
Fork 0
mirror of synced 2025-01-26 10:11:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17 from IvanLutokhin/fix-model-namespaces

Browse Source 
Fix model namespaces
This commit is contained in:
Kruglov Kirill 2021-05-18 09:59:48 +03:00 committed by GitHub
commit aad7a0616a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Model/RequestCalculate.php
View File

@ -11,7 +11,7 @@ class RequestCalculate
/** /**
* Адрес отгрузки. * Адрес отгрузки.
* *
* @var RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress * @var DeliveryAddress
* *
* @Serializer\Groups({"request", "calculate"}) * @Serializer\Groups({"request", "calculate"})
* @Serializer\SerializedName("shipmentAddress") * @Serializer\SerializedName("shipmentAddress")
@ -33,7 +33,7 @@ class RequestCalculate
/** /**
* Набор упаковок. * Набор упаковок.
* *
* @var RetailCrm\DeliveryModuleBundle\Model\Package[] * @var Package[]
* *
* @Serializer\Groups({"request", "calculate"}) * @Serializer\Groups({"request", "calculate"})
* @Serializer\SerializedName("packages") * @Serializer\SerializedName("packages")

2
Model/ResponseLoadDeliveryData.php
View File

@ -50,7 +50,7 @@ class ResponseLoadDeliveryData
/** /**
* Время доставки * Время доставки
* @var RetailCrm\DeliveryModuleBundle\Model\DeliveryTime * @var DeliveryTime
* *
* @Serializer\Groups({"response"}) * @Serializer\Groups({"response"})
* @Serializer\SerializedName("deliveryTime") * @Serializer\SerializedName("deliveryTime")

5
Model/Settings.php
View File

@ -3,7 +3,6 @@
namespace RetailCrm\DeliveryModuleBundle\Model; namespace RetailCrm\DeliveryModuleBundle\Model;
use JMS\Serializer\Annotation as Serializer; use JMS\Serializer\Annotation as Serializer;
use RetailCrm\DeliveryModuleBundle\Model\Settings\ExtraData;
use RetailCrm\DeliveryModuleBundle\Model\Settings\PaymentType; use RetailCrm\DeliveryModuleBundle\Model\Settings\PaymentType;
use RetailCrm\DeliveryModuleBundle\Model\Settings\ShipmentPoint; use RetailCrm\DeliveryModuleBundle\Model\Settings\ShipmentPoint;
use RetailCrm\DeliveryModuleBundle\Model\Settings\Status; use RetailCrm\DeliveryModuleBundle\Model\Settings\Status;
@ -77,7 +76,7 @@ class Settings
public $statuses; public $statuses;
/** /**
* @var array|ExtraData[] * @var array
* *
* @Serializer\Groups({"set", "get"}) * @Serializer\Groups({"set", "get"})
* @Serializer\SerializedName("deliveryExtraData") * @Serializer\SerializedName("deliveryExtraData")
@ -86,7 +85,7 @@ class Settings
public $deliveryExtraData; public $deliveryExtraData;
/** /**
* @var array|ExtraData[] * @var array
* *
* @Serializer\Groups({"set", "get"}) * @Serializer\Groups({"set", "get"})
* @Serializer\SerializedName("shipmentExtraData") * @Serializer\SerializedName("shipmentExtraData")

2
Model/Unit.php
View File

@ -2,6 +2,8 @@
namespace RetailCrm\DeliveryModuleBundle\Model; namespace RetailCrm\DeliveryModuleBundle\Model;
use JMS\Serializer\Annotation as Serializer;
class Unit class Unit
{ {
/** /**