From 8c026a30a1e946814cfc6cb06f50ecf62fe6b31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= Date: Thu, 18 Jan 2024 15:17:04 +0100 Subject: [PATCH] FIO plugin - settings form validation fix 3 --- plugins/fio_cz/fio_cz.zip | Bin 179331 -> 179277 bytes plugins/fio_cz/src/manifest.json | 6 +++--- plugins/fio_cz/src/src/FioCz/FioCz.php | 2 +- plugins_2.1.x.json | 2 +- plugins_2.2.x.json | 2 +- plugins_2.3.x.json | 2 +- plugins_2.4.x.json | 2 +- plugins_2.5.x.json | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/fio_cz/fio_cz.zip b/plugins/fio_cz/fio_cz.zip index 7a2e0d16799b94a1835074f7174af2304abba94f..6c0ea070fbd54207327215bbd46f5fa44bad32f8 100644 GIT binary patch delta 6265 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 delta 6218 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 diff --git a/plugins/fio_cz/src/manifest.json b/plugins/fio_cz/src/manifest.json index d30a0c7e9..d10a9ebf2 100644 --- a/plugins/fio_cz/src/manifest.json +++ b/plugins/fio_cz/src/manifest.json @@ -5,7 +5,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https://www.fio.cz/bankovni-sluzby/api-bankovnictvi", "url": "https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null @@ -37,8 +37,8 @@ { "key": "importUnattached", "label": "Import all payments.", - "description": "Import all payments. Payments without match will be imported as \"Unattached payments\". Fill 1 to enable or 0 to disable this feature (when disabled, the unmatched payment will only be logged and skipped).", - "required": 1, + "description": "Import all payments. Payments without match will be imported as \"Unattached payments\".", + "required": 0, "type": "checkbox" }, { diff --git a/plugins/fio_cz/src/src/FioCz/FioCz.php b/plugins/fio_cz/src/src/FioCz/FioCz.php index 608f9c1da..61eb14c33 100644 --- a/plugins/fio_cz/src/src/FioCz/FioCz.php +++ b/plugins/fio_cz/src/src/FioCz/FioCz.php @@ -89,7 +89,7 @@ function ($transaction) { 'amount' => $transaction['column1']['value'], 'currency' => $transaction['column14']['value'], 'date' => $transaction['column0']['value'], - 'reference' => $transaction['column5']['value'], + 'reference' => $transaction['column5']['value'] ?? '', 'id' => $transaction['column22']['value'], 'data' => $data, ]; diff --git a/plugins_2.1.x.json b/plugins_2.1.x.json index 15d6edba8..55eda7bff 100644 --- a/plugins_2.1.x.json +++ b/plugins_2.1.x.json @@ -31,7 +31,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https:\/\/www.fio.cz\/bankovni-sluzby\/api-bankovnictvi", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.2.x.json b/plugins_2.2.x.json index 15d6edba8..55eda7bff 100644 --- a/plugins_2.2.x.json +++ b/plugins_2.2.x.json @@ -31,7 +31,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https:\/\/www.fio.cz\/bankovni-sluzby\/api-bankovnictvi", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.3.x.json b/plugins_2.3.x.json index 517119ab7..82cd9eb89 100644 --- a/plugins_2.3.x.json +++ b/plugins_2.3.x.json @@ -31,7 +31,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https:\/\/www.fio.cz\/bankovni-sluzby\/api-bankovnictvi", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.4.x.json b/plugins_2.4.x.json index 517119ab7..82cd9eb89 100644 --- a/plugins_2.4.x.json +++ b/plugins_2.4.x.json @@ -31,7 +31,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https:\/\/www.fio.cz\/bankovni-sluzby\/api-bankovnictvi", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.5.x.json b/plugins_2.5.x.json index 517119ab7..82cd9eb89 100644 --- a/plugins_2.5.x.json +++ b/plugins_2.5.x.json @@ -31,7 +31,7 @@ "displayName": "Fio bank payment import", "description": "This plugin enables you to import payments from Fio bank to UCRM. See https:\/\/www.fio.cz\/bankovni-sluzby\/api-bankovnictvi", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/fio_cz", - "version": "1.2.8", + "version": "1.2.11", "unmsVersionCompliancy": { "min": "2.1.0", "max": null