refactor

src/Fiskalizacija.php

@@ -13,6 +13,7 @@
 use DOMElement;
 use Exception;
 use Nticaric\Fiskalizacija\SoapClient;
+use Nticaric\Fiskalizacija\XMLSerializer;
 
 class Fiskalizacija
 {
@@ -200,4 +201,14 @@ public function parseResponse($response, $code = 4)
 
     }
 
+    public function signAndSend($request)
+    {
+        $serializer = new XMLSerializer($request);
+        $xml        = $serializer->toXml();
+
+        $soapMessage = $this->signXML($xml);
+
+        return $this->sendSoap($soapMessage);
+    }
+
 }

src/Generators/EchoRequest.php

@@ -0,0 +1,32 @@
+<?php namespace Nticaric\Fiskalizacija\Generators;
+
+/**
+ * Class representing EchoRequest
+ *
+ * Poruka echo metodi.
+ */
+class EchoRequest
+{
+    /**
+     * Poruka
+     *
+     * @var string $message
+     */
+    private $message = null;
+
+    public function __construct($message)
+    {
+        $this->setMessage($message);
+    }
+
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    public function setMessage(string $message)
+    {
+        $this->message = $message;
+        return $this;
+    }
+}

src/Generators/NapojnicaType.php

@@ -20,6 +20,11 @@ class NapojnicaType
      */
     private $nacinPlacanjaNapojnice = null;
 
+    public function __construct($iznosNapojnice, $nacinPlacanjaNapojnice)
+    {
+        $this->iznosNapojnice         = number_format($iznosNapojnice, 2, '.', '');
+        $this->nacinPlacanjaNapojnice = $nacinPlacanjaNapojnice;
+    }
     /**
      * Gets as iznosNapojnice
      *
@@ -64,4 +69,3 @@ public function setNacinPlacanjaNapojnice($nacinPlacanjaNapojnice)
         return $this;
     }
 }
-

src/Generators/NapojnicaZahtjev/NapojnicaZahtjevAType.php

@@ -29,6 +29,11 @@ class NapojnicaZahtjevAType
      */
     private $signature = null;
 
+    public function __construct()
+    {
+        $this->setId(uniqid());
+    }
+
     /**
      * Gets as id
      *
@@ -121,4 +126,3 @@ public function setSignature(?\Nticaric\Fiskalizacija\Generators\Xmldsig\Signatu
         return $this;
     }
 }
-

src/Generators/RacunNapojnicaType.php

@@ -907,4 +907,23 @@ public function setNapojnica(\Nticaric\Fiskalizacija\Generators\NapojnicaType $n
         $this->napojnica = $napojnica;
         return $this;
     }
+
+    public function generirajZastKod($pkey, $oib, $dt, $bor, $opp, $onu, $uir)
+    {
+        $medjurezultat = "";
+        $medjurezultat .= $oib; // 1. OIB
+        $medjurezultat .= $dt; // 2. Datum i vrijeme izdavanja računa zapisan kao tekst u formatu 'dd.mm.gggg hh:mm:ss'
+        $medjurezultat .= $bor; // 3. Brojcana oznaka racuna
+        $medjurezultat .= $opp; // 4. Oznaka poslovnog prostora
+        $medjurezultat .= $onu; // 5. Oznaka naplatnog uređaja
+        $medjurezultat .= $uir; // 6. Ukupni iznos računa
+
+        $zastKodSignature = null;
+
+        if (!openssl_sign($medjurezultat, $zastKodSignature, $pkey, OPENSSL_ALGO_SHA1)) {
+            throw new \Exception('Error creating security code');
+        }
+
+        return $this->zastKod = md5($zastKodSignature);
+    }
 }

src/Metadata/Generators.EchoRequest.yml

@@ -0,0 +1,12 @@
+Nticaric\Fiskalizacija\Generators\EchoRequest:
+    xml_root_name: EchoRequest
+    xml_root_namespace: 'http://www.apis-it.hr/fin/2012/types/f73'
+    properties:
+        message:
+            expose: true
+            access_type: public_method
+            xml_value: true  # This will treat the property as the XML value
+            accessor:
+                getter: getMessage
+                setter: setMessage
+            type: string

tests/EchoRequestTest.php

@@ -1,7 +1,8 @@
 <?php
 
-use Nticaric\Fiskalizacija\EchoRequest;
+use Nticaric\Fiskalizacija\Generators\EchoRequest;
 use Nticaric\Fiskalizacija\SoapClient;
+use Nticaric\Fiskalizacija\XMLSerializer;
 use PHPUnit\Framework\TestCase;
 
 class EchoRequestTest extends TestCase
@@ -11,7 +12,9 @@ public function testMakeEchoRequest()
         $message = "proizvoljan tekst";
 
         $echoRequest = new EchoRequest($message);
-        $xml         = $echoRequest->toXML();
+
+        $serializer = new XMLSerializer($echoRequest);
+        $xml        = $serializer->toXml();
 
         $soapClient  = new SoapClient("https://cistest.apis-it.hr:8449/FiskalizacijaServiceTest");
         $xmlEnvelope = $soapClient->addEnvelope($xml);