Readme Update

MultiFlexi definition update
Spoje-NET · Nov 4, 2024 · 2f64f7c · 2f64f7c
1 parent 1ad0eae
commit 2f64f7c
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -17,26 +17,6 @@ Requirements
 * MSSQL login and password
 * [php-sqlsrv](https://learn.microsoft.com/en-us/sql/connect/php/microsoft-php-driver-for-sql-server?view=sql-server-ver16)
 
-Debian/Ubuntu installation
---------------------------
-
-Please use the .deb packages. The repository is availble:
-
- ```shell
-    echo "deb http://repo.vitexsoftware.com $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/vitexsoftware.list
-    sudo wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg http://repo.vitexsoftware.com/keyring.gpg
-    sudo apt update
-    sudo apt install pohoda-raiffeisenbank
-```
-
-Po instalaci balíku jsou v systému k dispozici tyto nové příkazy:
-
-  * **pohoda-raiffeisenbank-setup**         - check and/or prepare Bank account setup in Pohoda
-  * **pohoda-raiffeisenbank-transactions**  - Import transactions. From latest imported or within the given scope
-  * **pohoda-raiffeisenbank-statements**    - Import transactions from Account Statements.
-  * **pohoda-raiffeisenbank-xml-statement** - Import transactions from XML Statements file.
-
-
 Setup command
 -------------
 
@@ -67,6 +47,7 @@ TRANSACTION_IMPORT_SCOPE=yesterday
 API_DEBUG=True
 APP_DEBUG=True
 STATEMENT_LINE=ADDITIONAL
+STATEMENT_SAVE_DIR=/tmp/rb
 
 POHODA_ICO=12345678
 POHODA_URL=http://10.11.25.25:10010
@@ -134,3 +115,23 @@ Pohoda RaiffeisenBank is ready for run as [MultiFlexi](https://multiflexi.eu) ap
 See the full list of ready-to-run applications within the MultiFlexi platform on the [application list page](https://www.multiflexi.eu/apps.php).
 
 [![MultiFlexi App](https://github.com/VitexSoftware/MultiFlexi/blob/main/doc/multiflexi-app.svg)](https://www.multiflexi.eu/apps.php)
+
+Debian/Ubuntu installation
+--------------------------
+
+Please use the .deb packages. The repository is availble:
+
+ ```shell
+    echo "deb http://repo.vitexsoftware.com $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/vitexsoftware.list
+    sudo wget -O /etc/apt/trusted.gpg.d/vitexsoftware.gpg http://repo.vitexsoftware.com/keyring.gpg
+    sudo apt update
+    sudo apt install pohoda-raiffeisenbank
+```
+
+Po instalaci balíku jsou v systému k dispozici tyto nové příkazy:
+
+  * **pohoda-raiffeisenbank-setup**         - check and/or prepare Bank account setup in Pohoda
+  * **pohoda-raiffeisenbank-transactions**  - Import transactions. From latest imported or within the given scope
+  * **pohoda-raiffeisenbank-statements**    - Import transactions from Account Statements.
+  * **pohoda-raiffeisenbank-xml-statement** - Import transactions from XML Statements file.
+  * **pohodasql-raiffeisenbank-statements-sharepoint** - Import transactions from Account Statements with link to Sharepoint
diff --git a/multiflexi/pohoda_raiffeisenbank_statements.multiflexi.app.json b/multiflexi/pohoda_raiffeisenbank_statements.multiflexi.app.json
@@ -95,6 +95,12 @@
             "description": "Pohoda Bank IDs",
             "defval": "KB",
             "required": true
+        },
+        "STATEMENT_SAVE_DIR": {
+            "type": "text",
+            "description": "Place for PDF files",
+            "defval": "",
+            "required": false
         }
     },
     "multiflexi": "1.10.2.0"

diff --git a/multiflexi/pohodasql_raiffeisenbank_sharepoint.multiflexi.app.json b/multiflexi/pohodasql_raiffeisenbank_sharepoint.multiflexi.app.json
@@ -128,9 +128,9 @@
         },
         "DB_SETTINGS": {
             "type": "text",
-            "description": "Database Settings",
-            "defval": "encrypt=false",
-            "required": true
+            "description": "Database Settings like encrypt=false",
+            "defval": "",
+            "required": false
         },
         "OFFICE365_USERNAME": {
             "type": "text",
@@ -179,6 +179,12 @@
             "description": "Office 365 Path",
             "defval": "",
             "required": true
+        },
+        "STATEMENT_SAVE_DIR": {
+            "type": "text",
+            "description": "Place for PDF files",
+            "defval": "",
+            "required": false
         }
     },
     "multiflexi": "1.10.2.0"

diff --git a/src/Pohoda/RaiffeisenBank/Transactor.php b/src/Pohoda/RaiffeisenBank/Transactor.php
@@ -60,8 +60,20 @@ public function getTransactions()
                 }
             } while ($result['lastPage'] === false);
         } catch (\VitexSoftware\Raiffeisenbank\ApiException $e) {
-            echo 'Exception when calling GetTransactionListApi->getTransactionList: ', $e->getMessage(), \PHP_EOL;
-            exit($e->getCode());
+            $errorMessage = $e->getMessage();
+            preg_match('/cURL error ([0-9]+)/', $errorMessage, $matches);
+
+            if (\array_key_exists(1, $matches)) {
+                $errorCode = $matches[1];
+            } elseif (preg_match('/\[([0-9]+)\]/', $errorMessage, $matches)) {
+                $errorCode = $matches[1];
+            } else {
+                $errorCode = 2;
+            }
+
+            $this->addStatusMessage('Exception when calling GetTransactionListApi->getTransactionList: '.$errorMessage, 'error', $apiInstance);
+
+            exit(intval($errorCode));
         }
 
         return $transactions;