Merge pull request #26 from boekuwzending/fix/vat-eori-number

Eori nummer en vatnumber zijn toegevoegd
boekuwzending · Sep 22, 2022 · 2521f85 · 2521f85
2 parents ff81334 + 9511f19
commit 2521f85
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/src/Resource/DispatchInstruction.php b/src/Resource/DispatchInstruction.php
@@ -13,22 +13,22 @@
 class DispatchInstruction extends Instruction
 {
     /**
-     * @var DateTimeInterface
+     * @var DateTimeInterface|null
      */
     protected $date;
 
     /**
-     * @return DateTimeInterface
+     * @return ?DateTimeInterface
      */
-    public function getDate(): DateTimeInterface
+    public function getDate(): ?DateTimeInterface
     {
         return $this->date;
     }
 
     /**
-     * @param DateTimeInterface $date
+     * @param DateTimeInterface|null $date
      */
-    public function setDate(DateTimeInterface $date): void
+    public function setDate(?DateTimeInterface $date): void
     {
         $this->date = $date;
     }

diff --git a/src/Resource/Instruction.php b/src/Resource/Instruction.php
@@ -32,6 +32,16 @@ abstract class Instruction
      */
     protected $timeWindowEnd;
 
+    /**
+     * @var string|null
+     */
+    protected $vatNumber;
+
+    /**
+     * @var string|null
+     */
+    protected $eoriNumber;
+
     /**
      * @return string|null
      */
@@ -95,4 +105,24 @@ public function setTimeWindowEnd(?DateTimeInterface $timeWindowEnd): void
     {
         $this->timeWindowEnd = $timeWindowEnd;
     }
+
+    public function getVatNumber(): ?string
+    {
+        return $this->vatNumber;
+    }
+
+    public function setVatNumber(?string $vatNumber): void
+    {
+        $this->vatNumber = $vatNumber;
+    }
+
+    public function getEoriNumber(): ?string
+    {
+        return $this->eoriNumber;
+    }
+
+    public function setEoriNumber(?string $eoriNumber): void
+    {
+        $this->eoriNumber = $eoriNumber;
+    }
 }
diff --git a/src/Serializer/InstructionSerializer.php b/src/Serializer/InstructionSerializer.php
@@ -28,6 +28,8 @@ public function serialize($data): array
                 'begin' => $data->getTimeWindowBegin(),
                 'end' => $data->getTimeWindowEnd(),
             ],
+            'vatNumber' => $data->getVatNumber(),
+            'eoriNumber' => $data->getEoriNumber(),
         ];
 
         if (null !== $data->getDate()) {
@@ -49,6 +51,8 @@ public function deserialize(array $data, string $dataType)
         $object->setReference($data['reference']);
         $object->setTimeWindowBegin($data['timeWindow']['begin']);
         $object->setTimeWindowEnd($data['timeWindow']['end']);
+        $object->setVatNumber($data['vatNumber']);
+        $object->setEoriNumber($data['eoriNumber']);
 
         if (!empty($data['date'])) {
             $object->setDate((new DateTime($data['date'])));

diff --git a/src/Serializer/ShipmentSerializer.php b/src/Serializer/ShipmentSerializer.php
@@ -106,7 +106,7 @@ public function deserialize(array $data, string $dataType)
         $shipment->setInvoiceReference($data['invoiceReference']);
         $shipment->setSequence($data['sequence']);
         $shipment->setStatus($data['status']);
-        $shipment->setRelated($data['related']);
+        $shipment->setRelated($data['related'] ?? null);
 
         $items = [];
         foreach ($data['items'] as $item) {

diff --git a/tests/Serializer/ShipmentSerializerTest.php b/tests/Serializer/ShipmentSerializerTest.php
@@ -43,9 +43,11 @@ public function testShipment()
         $addressTo->setCountryCode($this->getFaker()->countryCode);
         $shipment->setShipToAddress($addressTo);
 
-        // Set Dispactch
+        // Set Dispatch
         $dispatch = new DispatchInstruction();
         $dispatch->setDate($this->getFaker()->dateTime());
+        $dispatch->setEoriNumber($this->getFaker()->randomNumber(9));
+        $dispatch->setVatNumber($this->getFaker()->randomNumber(9));
         $shipment->setDispatch($dispatch);
 
         $serializedShipment = (new ShipmentSerializer())->serialize($shipment);
@@ -57,6 +59,8 @@ public function testShipment()
 
         self::assertArrayHasKey('dispatch', $serializedShipment);
         self::assertArrayHasKey('date', $serializedShipment['dispatch']);
+        self::assertArrayHasKey('eoriNumber', $serializedShipment['dispatch']);
+        self::assertArrayHasKey('vatNumber', $serializedShipment['dispatch']);
 
         self::assertArrayHasKey('shipTo', $serializedShipment);
         self::assertArrayHasKey('contact', $serializedShipment['shipTo']);