[info] frissites: PHPApiAgent-2.10.23-50fe9a95e69bd665e2cb079c9a72bad0.zip

Author: Benjaminhu

szamlaagent/changelog.md

@@ -2,7 +2,26 @@
 All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [2.10.22] - 2025.11.13
+## [2.10.23] - 2025.11.26
+
+### Added
+
+- added function: singleton mode can be disabled
+    - src/szamlaagent/SzamlaAgentAPI.php
+        - SzamlaAgentAPI::create last parameter, default is true (singleton mode is enabled)
+        - when disabled, the SzamlaAgentAPI create method always returns a new instance
+        - when Singleton mode is disabled, the names of XML files change; hash of the SzamlaAgent instance is added to the file name
+  ````
+    SzamlaAgentAPI::create("AGENT KEY", true, Log::LOG_LEVEL_DEBUG, SzamlaAgentResponse::RESULT_AS_TEXT, "PHP API teszt", false);
+  ````
+- added function: invoice XML data download by external ID
+    - src/szamlaagent/SzamlaAgentSetting.php
+    - src/szamlaagent/SzamlaAgent.php
+    ````
+    $agent->getInvoiceData("EXTERNAL_ID", Invoice::FROM_INVOICE_EXTERNAL_ID);
+  ````
+
+## [2.10.22] - 2025.10.13
 
 ### Added
 

szamlaagent/src/SzamlaAgent/Item/InvoiceItem.php

@@ -50,7 +50,7 @@ public function buildXmlData() {
         $data['mennyiseg']        = SzamlaAgentUtil::doubleFormat($this->getQuantity());
         $data['mennyisegiEgyseg'] = $this->getQuantityUnit();
         $data['nettoEgysegar']    = SzamlaAgentUtil::doubleFormat($this->getNetUnitPrice());
-        $data['afakulcs']         = $this->getVat();
+        $data['afakulcs']         = SzamlaAgentUtil::dotCheck($this->getVat());
 
         if (SzamlaAgentUtil::isNotNull($this->getPriceGapVatBase())) {
             $data['arresAfaAlap'] = SzamlaAgentUtil::doubleFormat($this->getPriceGapVatBase());

szamlaagent/src/SzamlaAgent/Response/SzamlaAgentResponse.php

@@ -270,7 +270,7 @@ private function createXmlFile(\SimpleXMLElement $xml) {
                 throw new SzamlaAgentException(SzamlaAgentException::RESPONSE_TYPE_NOT_EXISTS . " ($type)");
         }
 
-        $fileName = SzamlaAgentUtil::getXmlFileName('response', $name . $postfix, $agent->getRequest()->getEntity());
+        $fileName = SzamlaAgentUtil::getXmlFileName('response', $name . $postfix, $agent, $agent->getRequest()->getEntity());
         $xmlSaved = $xml->save($fileName);
 
         if (!$xmlSaved) {

szamlaagent/src/SzamlaAgent/SzamlaAgent.php

@@ -177,6 +177,8 @@ class SzamlaAgent {
      */
     private $certificationFilePath;
 
+    private $singleton = true;
+
     /**
      * Számla Agent létrehozása
      *
@@ -397,8 +399,10 @@ public function getInvoiceData($data, $type = Invoice::FROM_INVOICE_NUMBER, $dow
 
         if ($type == Invoice::FROM_INVOICE_NUMBER) {
             $invoice->getHeader()->setInvoiceNumber($data);
-        } else {
+        } else if($type == Invoice::FROM_ORDER_NUMBER) {
             $invoice->getHeader()->setOrderNumber($data);
+        } else {
+            $this->setInvoiceExternalId($data);
         }
 
         if ($this->getResponseType() !== SzamlaAgentResponse::RESULT_AS_XML) {
@@ -1256,4 +1260,21 @@ public function getRequestConnectTimeout() {
     public function setRequestConnectTimeout($requestConnectTimeout) {
         $this->requestConnectTimeout = max($requestConnectTimeout, 0);
     }
+
+    /**
+     * @return mixed
+     */
+    public function getSingleton()
+    {
+        return $this->singleton;
+    }
+
+    /**
+     * @param mixed $singleton
+     */
+    protected function setSingleton($singleton)
+    {
+        $this->singleton = $singleton;
+    }
+
 }

szamlaagent/src/SzamlaAgent/SzamlaAgentAPI.php

@@ -23,18 +23,22 @@ class SzamlaAgentAPI extends SzamlaAgent {
      * @return SzamlaAgent
      * @throws SzamlaAgentException
      */
-    public static function create($apiKey, $downloadPdf = true, $logLevel = Log::LOG_LEVEL_DEBUG, $responseType = SzamlaAgentResponse::RESULT_AS_TEXT, $aggregator = '') {
-        $index = self::getHash($apiKey);
+    public static function create($apiKey, $downloadPdf = true, $logLevel = Log::LOG_LEVEL_DEBUG, $responseType = SzamlaAgentResponse::RESULT_AS_TEXT, $aggregator = '', $singleton = true) {
 
         $agent = null;
-        if (isset(self::$agents[$index])) {
-            $agent = self::$agents[$index];
-        }
 
-        if ($agent === null) {
-            return self::$agents[$index] = new self(null, null, $apiKey, $downloadPdf, $logLevel, $responseType, $aggregator);
+        if ($singleton) {
+            $index = self::getHash($apiKey);
+            if (isset(self::$agents[$index])) {
+                $agent = self::$agents[$index];
+            } else {
+                $agent = new self(null, null, $apiKey, $downloadPdf, $logLevel, $responseType, $aggregator);
+                self::$agents[$index] = $agent;
+            }
         } else {
-            return $agent;
+            $agent =  new self(null, null, $apiKey, $downloadPdf, $logLevel, $responseType, $aggregator);
+            $agent->setSingleton($singleton);
         }
+        return $agent;
     }
 }

szamlaagent/src/SzamlaAgent/SzamlaAgentRequest.php

@@ -289,7 +289,7 @@ private function arrayToXML(array $xmlData, SimpleXMLExtended &$xmlFields) {
      * @throws \ReflectionException
      */
     private function createXmlFile(\DOMDocument $xml) {
-        $fileName = SzamlaAgentUtil::getXmlFileName('request', $this->getXmlName(), $this->getEntity());
+        $fileName = SzamlaAgentUtil::getXmlFileName('request', $this->getXmlName(), $this->getAgent(), $this->getEntity());
         $xmlSaved = $xml->save($fileName);
 
         if (!$xmlSaved) {
@@ -491,7 +491,7 @@ private function makeCurlCall() {
                 $xmlFile = new \CURLFile($this->getXmlFilePath(), $mimeType, basename($this->getXmlFilePath()));
             } else {
                 $xmlContent = 'data://application/octet-stream;base64,' . base64_encode($this->getXmlData());
-                $fileName = SzamlaAgentUtil::getXmlFileName('request', $this->getXmlName(), $this->getEntity());
+                $fileName = SzamlaAgentUtil::getXmlFileName('request', $this->getXmlName(), $this->getAgent(), $this->getEntity());
                 $xmlFile = new \CURLFile($xmlContent, $mimeType, basename($fileName));
             }
 

szamlaagent/src/SzamlaAgent/SzamlaAgentSetting.php

@@ -349,7 +349,7 @@ public function buildXmlData(SzamlaAgentRequest $request) {
                 $data = $this->buildFieldsData($request, array_merge($settings, ['szamlaszam', 'adoszam', 'additiv', 'aggregator', 'valaszVerzio']));
                 break;
             case $request::XML_SCHEMA_REQUEST_INVOICE_XML:
-                $data = $this->buildFieldsData($request, array_merge($settings, ['szamlaszam', 'rendelesSzam', 'pdf']));
+                $data = $this->buildFieldsData($request, array_merge($settings, ['szamlaszam', 'rendelesSzam', 'pdf', 'szamlaKulsoAzon']));
                 break;
             case $request::XML_SCHEMA_REQUEST_INVOICE_PDF:
                 $data = $this->buildFieldsData($request, array_merge($settings, ['szamlaszam', 'rendelesSzam', 'valaszVerzio', 'szamlaKulsoAzon']));

szamlaagent/src/SzamlaAgent/SzamlaAgentUtil.php

@@ -156,12 +156,14 @@ public static function isNotValidDate($date) {
      * @return string|bool
      * @throws \ReflectionException
      */
-    public static function getXmlFileName($prefix, $name, $entity = null) {
+    public static function getXmlFileName($prefix, $name, $agent, $entity = null) {
         if (!empty($name) && !empty($entity)) {
             $name .= '-' . (new \ReflectionClass($entity))->getShortName();
         }
 
-        $fileName  = $prefix . '-' . strtolower($name) . '-' . self::getDateTimeWithMilliseconds() . '.xml';
+        $hash = $agent->getSingleton() ? '' : spl_object_hash($agent);
+
+        $fileName  = $prefix . '-' . strtolower($name) . '-' . $hash . '-' .self::getDateTimeWithMilliseconds() . '.xml';
         return self::getAbsPath(SzamlaAgent::XML_FILE_SAVE_PATH, $fileName);
     }