Support EBICS TS mode.

ebics-api · Jan 17, 2024 · 46f62b6 · 46f62b6
1 parent 234b3fa
commit 46f62b6
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/src/Factories/RequestFactoryV24.php b/src/Factories/RequestFactoryV24.php
@@ -52,7 +52,8 @@ protected function addOrderType(
                 $orderAttribute = OrderDetailsBuilder::ORDER_ATTRIBUTE_DZNNN;
                 break;
             case 'FUL':
-                $orderAttribute = OrderDetailsBuilder::ORDER_ATTRIBUTE_OZHNN;
+                $orderAttribute = $this->bank->usesUploadWithES() ?
+                    OrderDetailsBuilder::ORDER_ATTRIBUTE_OZHNN : OrderDetailsBuilder::ORDER_ATTRIBUTE_DZHNN;
                 break;
             default:
                 $orderAttribute = OrderDetailsBuilder::ORDER_ATTRIBUTE_DZHNN;

diff --git a/src/Factories/RequestFactoryV25.php b/src/Factories/RequestFactoryV25.php
@@ -64,7 +64,8 @@ protected function addOrderType(OrderDetailsBuilder $orderDetailsBuilder, string
             case 'XE2':
             case 'XE3':
             case 'CIP':
-                $orderAttribute = OrderDetailsBuilder::ORDER_ATTRIBUTE_OZHNN;
+                $orderAttribute = $this->bank->usesUploadWithES() ?
+                    OrderDetailsBuilder::ORDER_ATTRIBUTE_OZHNN : OrderDetailsBuilder::ORDER_ATTRIBUTE_DZHNN;
                 break;
             case 'HVE':
                 $orderAttribute = OrderDetailsBuilder::ORDER_ATTRIBUTE_UZHNN;

diff --git a/src/Models/Bank.php b/src/Models/Bank.php
@@ -24,7 +24,19 @@ final class Bank
      */
     private string $url;
 
-    private ?bool $isCertified;
+    /**
+     * Uses certificate.
+     *
+     * @var bool
+     */
+    private bool $isCertified = false;
+
+    /**
+     * Uses upload orders with ES.
+     *
+     * @var bool
+     */
+    private bool $usesUploadWithES = true;
 
     /**
      * The Server Name of the bank.
@@ -34,7 +46,7 @@ final class Bank
     /**
      * The Server Version of the bank.
      */
-    private ?string $version;
+    private string $version;
 
     /**
      * Constructor.
@@ -83,7 +95,25 @@ public function setIsCertified(bool $isCertified): void
      */
     public function isCertified(): bool
     {
-        return (bool)$this->isCertified;
+        return $this->isCertified;
+    }
+
+    /**
+     * @param bool $usesUploadWithES
+     *
+     * @return void
+     */
+    public function setUsesUploadWithES(bool $usesUploadWithES): void
+    {
+        $this->usesUploadWithES = $usesUploadWithES;
+    }
+
+    /**
+     * @return bool
+     */
+    public function usesUploadWithES(): bool
+    {
+        return $this->usesUploadWithES;
     }
 
     /**

diff --git a/tests/AbstractEbicsTestCase.php b/tests/AbstractEbicsTestCase.php
@@ -65,6 +65,7 @@ private function setupClient(
         $credentials = $this->credentialsDataProvider($credentialsId);
 
         $bank = new Bank($credentials['hostId'], $credentials['hostURL'], $version);
+        $bank->setUsesUploadWithES(true);
         $bank->setIsCertified($credentials['hostIsCertified']);
         $bank->setServerName(sprintf('Server %d', $credentialsId));
         $user = new User($credentials['partnerId'], $credentials['userId']);