From cc22bd9ddfe3aa050d962e112a31b6cfca50f877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= Date: Fri, 5 Jan 2024 13:15:12 +0100 Subject: [PATCH] FIO plugin - settings form validation fix --- plugins/fio_cz/fio_cz.zip | Bin 179331 -> 179321 bytes plugins/fio_cz/src/manifest.json | 16 ++++--- plugins/fio_cz/src/src/Data/PluginData.php | 47 ++++++--------------- 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, 29 insertions(+), 44 deletions(-) diff --git a/plugins/fio_cz/fio_cz.zip b/plugins/fio_cz/fio_cz.zip index 7a2e0d16799b94a1835074f7174af2304abba94f..03b83172094a38c6721d72db531c59d17767d8ab 100644 GIT binary patch delta 4726 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 delta 4839 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 BlqdiI diff --git a/plugins/fio_cz/src/manifest.json b/plugins/fio_cz/src/manifest.json index d30a0c7e..86327e61 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null @@ -37,20 +37,26 @@ { "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\". When disabled, the unmatched payment will only be logged and skipped.", + "required": 0, "type": "checkbox" }, { "key": "lastProcessedPayment", - "label": "Last processed payment", + "label": "Last processed payment ID (readonly)", "description": "Internal payment tracking to avoid duplicate processing of the same payment", "required": 0, "type": "text" }, + { + "key": "lastProcessedPaymentDateTime", + "label": "Last processed payment date and time (readonly)", + "required": 0, + "type": "datetime" + }, { "key": "lastProcessedTimestamp", - "label": "Last time the payment list was requested", + "label": "Last time the payment list was requested (readonly)", "description": "Internal timestamp tracking to politely avoid API request rate limits", "required": 0, "type": "text" diff --git a/plugins/fio_cz/src/src/Data/PluginData.php b/plugins/fio_cz/src/src/Data/PluginData.php index 96b00f86..1921e011 100644 --- a/plugins/fio_cz/src/src/Data/PluginData.php +++ b/plugins/fio_cz/src/src/Data/PluginData.php @@ -6,38 +6,17 @@ class PluginData extends UcrmData { - /** - * @var string - */ - public $lastProcessedPayment; - - /** - * @var string - */ - public $paymentMatchAttribute; - - /** - * @var string - */ - public $startDate; - - /** - * @var string - */ - public $token; - - /** - * @var string - */ - public $lastProcessedTimestamp; - - /** - * @var string - */ - public $importUnattached; - - /** - * @var string - */ - public $lastProcessedPaymentDateTime; + public string $lastProcessedPayment; + + public string $paymentMatchAttribute; + + public string $startDate; + + public string $token; + + public string $lastProcessedTimestamp; + + public string $importUnattached; + + public string $lastProcessedPaymentDateTime; } diff --git a/plugins_2.1.x.json b/plugins_2.1.x.json index 15d6edba..adad652a 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.2.x.json b/plugins_2.2.x.json index 15d6edba..adad652a 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.3.x.json b/plugins_2.3.x.json index 517119ab..c5d31de7 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.4.x.json b/plugins_2.4.x.json index 517119ab..c5d31de7 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null diff --git a/plugins_2.5.x.json b/plugins_2.5.x.json index 517119ab..c5d31de7 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.9", "unmsVersionCompliancy": { "min": "2.1.0", "max": null