Update EDS logic. Update Timestamp format. Added SystemID support. Added Parameter to BTF.

Author: andrew-svirin

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 * Updated custom keyring details.
 * Dynamic Orders.
+* Updated EDS logic.
+* Updated `Timestamp` format.
+* Added `SystemID` support.
+* Added `Parameter` to BTF.
 
 ## 2.5
 

src/Builders/Request/StaticBuilder.php

@@ -51,7 +51,11 @@ public function addRandomNonce(): StaticBuilder
 
     public function addTimestamp(DateTimeInterface $dateTime): StaticBuilder
     {
-        $this->appendElementTo('Timestamp', $dateTime->format('Y-m-d\TH:i:s\Z'), $this->instance);
+        $milliseconds = (int)($dateTime->format('u') / 1000);
+
+        $formatted = $dateTime->format('Y-m-d\TH:i:s') . sprintf('.%03dZ', $milliseconds);
+
+        $this->appendElementTo('Timestamp', $formatted, $this->instance);
 
         return $this;
     }
@@ -70,6 +74,13 @@ public function addUserId(string $userId): StaticBuilder
         return $this;
     }
 
+    public function addSystemId(string $systemId): StaticBuilder
+    {
+        $this->appendElementTo('SystemID', $systemId, $this->instance);
+
+        return $this;
+    }
+
     public function addProduct(string $product, string $language): StaticBuilder
     {
         $this->appendElementTo('Product', $product, $this->instance, ['Language' => $language]);

src/Contexts/BTFContext.php

@@ -10,30 +10,17 @@
  */
 abstract class BTFContext extends ServiceContext
 {
-    private bool $signatureFlag = false;
-    private bool $signatureFlagEds = false;
+    private array $parameters = [];
 
-    public function setSignatureFlag(bool $signatureFlag): self
+    public function setParameter(string $name, string $value): self
     {
-        $this->signatureFlag = $signatureFlag;
+        $this->parameters[$name] = $value;
 
         return $this;
     }
 
-    public function getSignatureFlag(): bool
+    public function getParameters(): array
     {
-        return $this->signatureFlag;
-    }
-
-    public function setSignatureFlagEds(bool $signatureFlagEds): self
-    {
-        $this->signatureFlagEds = $signatureFlagEds;
-
-        return $this;
-    }
-
-    public function getSignatureFlagEds(): bool
-    {
-        return $this->signatureFlagEds;
+        return $this->parameters;
     }
 }

src/Orders/BTD.php

@@ -168,5 +168,7 @@ private function addBTDOrderParams(
             );
             $xmlBTDOrderParams->appendChild($xmlDateRange);
         }
+
+        $orderDetailsBuilder->addParameters($xmlBTDOrderParams, $this->btdContext->getParameters());
     }
 }

src/Orders/BTU.php

@@ -120,8 +120,7 @@ private function buildRequest(): Request
                             ->addDataDigest(
                                 $this->context->getSignatureVersion(),
                                 $this->context->getDataDigest()
-                            )
-                            ->addAdditionalOrderInfo();
+                            );
                     });
                 });
             })
@@ -164,12 +163,12 @@ private function addBTUOrderParams(OrderDetailsBuilder $orderDetailsBuilder): vo
             $xmlMsgName->setAttribute('format', $this->btuContext->getMsgNameFormat());
         }
 
-        if (true === $this->btuContext->getSignatureFlag()) {
+        if ($this->context->getWithES()) {
             $xmlSignatureFlag = $orderDetailsBuilder->appendEmptyElementTo('SignatureFlag', $xmlBTUOrderParams);
 
-            if (true === $this->btuContext->getSignatureFlagEds()) {
-                $xmlSignatureFlag->setAttribute('requestEDS', 'true');
-            }
+            $xmlSignatureFlag->setAttribute('requestEDS', 'true');
         }
+
+        $orderDetailsBuilder->addParameters($xmlBTUOrderParams, $this->btuContext->getParameters());
     }
 }