Merge branch 'master' into feature/UCRM-5991-plugin-pro-generovani-ba…

…rcodu
Ubiquiti-App · Sep 6, 2024 · e4cbb60 · e4cbb60
2 parents 19147ad + e0d88b7
commit e4cbb60
Show file tree

Hide file tree

Showing 59 changed files with 69 additions and 5,798 deletions.
diff --git a/README.md b/README.md
@@ -16,11 +16,8 @@ UCRM plugins are compatible with UCRM 2.10.0+
 |-------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
 | [SMS Gateway Integration](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/sms-twilio)                        | Integrates Twilio SMS gateway which enables UCRM to send SMS to clients triggered by custom defined events, e.g. client's service gets suspended. |
 | [QuickBooks&nbsp;Online](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/quickbooks-online)                  | Sync financial data from UCRM into QB Online                                                                                                    |
-| [MKT&nbsp;Queue&nbsp;Sync](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/mkt-queue-sync)                   | Sync UCRM Service Data rate with Mikrotik Simple Queue by service IP Address and client's service speed set in UCRM                             |
 | [FIO CZ](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/fio_cz)                                             | Automatic payments import and matching with clients - from WISP's FIO bank account                                                              |
 | [Client&nbsp;Signup](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/ucrm-client-signup)                     | Enables any visitor to register as a new client through a public web form                                                                       |
-| [RouterOS&nbsp;packet&nbsp;manager](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/routeros-packet-manager) | Sync UCRM Service Data rate with Router-OS                                                                                                      |
-| [Packetlogic packet manager](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/packetlogic-packet-manager)     | Sync UCRM Entities and Service Data Rate with Procera                                                                                           |
 | [KMZ Map](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/kmz-map)                                           | Provides a frontend Google Map for clients to view tower coverage.                                                                              |
 | [Invoice CSV Export](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/invoice-csv-export)                     | Configurable export of invoices into CSV, can be used for a manual export to 3rd party accounting tools.                                        |
 | [Revenue Report](https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/revenue-report)                             | Revenue report grouped by products or services, shown under the Reporting main menu section.                                                    |

diff --git a/plugins.json b/plugins.json
@@ -57,27 +57,14 @@
             "displayName": "KMZ Map",
             "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.",
             "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "unmsVersionCompliancy": {
                 "min": "1.0.0",
                 "max": "2.1.0"
             },
             "author": "Charuwts, LLC",
             "zipUrl": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/raw\/master\/plugins\/kmz-map\/kmz-map.zip"
         },
-        {
-            "name": "packetlogic-packet-manager",
-            "displayName": "PacketLogic Packet Manager",
-            "description": "UCRM Plugin that synchronizes customers with Procera Networks PacketLogic system.",
-            "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/packetlogic-packet-manager",
-            "version": "1.0.3",
-            "ucrmVersionCompliancy": {
-                "min": "2.10.0-beta1",
-                "max": "2.1.0"
-            },
-            "author": "Shaun Wilkinson",
-            "zipUrl": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/raw\/master\/plugins\/packetlogic-packet-manager\/packetlogic-packet-manager.zip"
-        },
         {
             "name": "quickbooks-online",
             "displayName": "QuickBooks Online export",
@@ -126,13 +113,13 @@
             "displayName": "UCRM Client Signup",
             "description": "A UCRM plugin that provides a frontend form for clients to signup.",
             "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/ucrm-client-signup",
-            "version": "1.2.1",
+            "version": "1.3.3",
             "unmsVersionCompliancy": {
-                "min": "1.0.0-dev.1",
-                "max": "2.1.0"
+                "min": "2.1.0",
+                "max": null
             },
             "author": "Charuwts, LLC",
-            "zipUrl": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/raw\/88fe798826dd0fed95ba6624e9e84e7087b28abf\/plugins\/ucrm-client-signup\/ucrm-client-signup.zip"
+            "zipUrl": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/raw\/master\/plugins\/ucrm-client-signup\/ucrm-client-signup.zip"
         }
     ]
 }
diff --git a/plugins/fio_cz/fio_cz.zip b/plugins/fio_cz/fio_cz.zip
diff --git 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.9",
+    "version": "1.2.12",
     "unmsVersionCompliancy": {
       "min": "2.1.0",
       "max": null
@@ -37,26 +37,20 @@
     {
       "key": "importUnattached",
       "label": "Import all payments.",
-      "description": "Import all payments. Payments without match will be imported as \"Unattached payments\". When disabled, the unmatched payment will only be logged and skipped.",
+      "description": "Import all payments. Payments without match will be imported as \"Unattached payments\".",
       "required": 0,
       "type": "checkbox"
     },
     {
       "key": "lastProcessedPayment",
-      "label": "Last processed payment ID (readonly)",
+      "label": "Last processed payment",
       "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 (readonly)",
+      "label": "Last time the payment list was requested",
       "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
@@ -6,17 +6,38 @@
 
 class PluginData extends UcrmData
 {
-    public string $lastProcessedPayment;
-
-    public string $paymentMatchAttribute;
-
-    public string $startDate;
-
-    public string $token;
-
-    public string $lastProcessedTimestamp;
-
-    public string $importUnattached;
-
-    public string $lastProcessedPaymentDateTime;
+    /**
+     * @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;
 }
diff --git a/plugins/fio_cz/src/src/FioCz/FioCz.php b/plugins/fio_cz/src/src/FioCz/FioCz.php
@@ -57,7 +57,7 @@ public function getTransactions(
     private function downloadTransactionsFromFio(string $token, \DateTimeImmutable $since, \DateTimeImmutable $until): array
     {
         $url = sprintf(
-            'https://www.fio.cz/ib_api/rest/periods/%s/%s/%s/transactions.json',
+            'https://fioapi.fio.cz/v1/rest/periods/%s/%s/%s/transactions.json',
             $token,
             $since->format('Y-m-d'),
             $until->format('Y-m-d')
@@ -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/kmz-map/kmz-map.zip b/plugins/kmz-map/kmz-map.zip
diff --git a/plugins/kmz-map/src/manifest.json b/plugins/kmz-map/src/manifest.json
@@ -5,7 +5,7 @@
     "displayName": "KMZ Map",
     "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.",
     "url": "https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/kmz-map",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "unmsVersionCompliancy": {
       "min": "1.0.0",
       "max": null

diff --git a/plugins/kmz-map/src/public.php b/plugins/kmz-map/src/public.php
@@ -31,10 +31,14 @@
         <?php } ?>
         <div class="buttons">
           <?php if (! empty(\KMZMap\Config::$LINK_ONE[0])) { ?>
-            <a href="<?php echo htmlspecialchars(\KMZMap\Config::$LINK_ONE[0], ENT_QUOTES); ?>" class="btn" style="background-color: #28a745;"><?php echo htmlspecialchars(\KMZMap\Config::$LINK_ONE[1], ENT_QUOTES); ?></a>
+            <a href="<?php echo htmlspecialchars(filter_var(\KMZMap\Config::$LINK_ONE[0], FILTER_VALIDATE_URL, [
+                'flags' => FILTER_NULL_ON_FAILURE,
+            ]) ?? '', ENT_QUOTES); ?>" class="btn" style="background-color: #28a745;"><?php echo htmlspecialchars(\KMZMap\Config::$LINK_ONE[1], ENT_QUOTES); ?></a>
           <?php } ?>
           <?php if (! empty(\KMZMap\Config::$LINK_TWO[0])) { ?>
-            <a href="<?php echo htmlspecialchars(\KMZMap\Config::$LINK_TWO[0], ENT_QUOTES); ?>" class="btn" style="background-color: #007bff;"><?php echo htmlspecialchars(\KMZMap\Config::$LINK_TWO[1], ENT_QUOTES); ?></a>
+            <a href="<?php echo htmlspecialchars(filter_var(\KMZMap\Config::$LINK_TWO[0], FILTER_VALIDATE_URL, [
+                'flags' => FILTER_NULL_ON_FAILURE,
+            ]) ?? '', ENT_QUOTES); ?>" class="btn" style="background-color: #007bff;"><?php echo htmlspecialchars(\KMZMap\Config::$LINK_TWO[1], ENT_QUOTES); ?></a>
           <?php } ?>
         </div>
       </div>

diff --git a/plugins/mkt-queue-sync/README.md b/plugins/mkt-queue-sync/README.md
diff --git a/plugins/mkt-queue-sync/mkt-queue-sync.zip b/plugins/mkt-queue-sync/mkt-queue-sync.zip
diff --git a/plugins/mkt-queue-sync/src/.gitignore b/plugins/mkt-queue-sync/src/.gitignore
diff --git a/plugins/mkt-queue-sync/src/classes/Http.php b/plugins/mkt-queue-sync/src/classes/Http.php