From 77f37fbc274a5b7a253abe71b18cfc55e41b5a12 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 19 Nov 2024 15:25:44 +0100
Subject: [PATCH] Create Workorder button in Preorder/Index now always visible
 for admins

---
 Layout/default/Preorder/include/preorder-detail.php         | 2 +-
 application/Preorder/Preorder.php                           | 6 ++++--
 application/Preorder/PreorderController.php                 | 5 ++++-
 scripts/adb-rimo-import/ADBAddressHelper/address_helper.php | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php
index 4656952c7..bd0f6b917 100644
--- a/Layout/default/Preorder/include/preorder-detail.php
+++ b/Layout/default/Preorder/include/preorder-detail.php
@@ -430,7 +430,7 @@
                             </table>
                         <?php endforeach; ?>
 
-                    <?php elseif($preorder->adb_wohneinheit_id && $preorder->type == "legacytransfer"): ?>
+                    <?php elseif($preorder->adb_wohneinheit_id && $me->is("Admin")): ?>
                         <button type="button" class="btn btn-outline-primary create-workorder" onclick="createWorkorder(<?=$preorder->id?>)"><i class="fas fa-fw fa-plus"></i> <i class="fas fa-r"></i><i class="fas fa-fw fa-gears"></i> Wokorder erstellen</button>
                     <?php endif; ?>
                     
diff --git a/application/Preorder/Preorder.php b/application/Preorder/Preorder.php
index 45b5ad10d..5735d4093 100644
--- a/application/Preorder/Preorder.php
+++ b/application/Preorder/Preorder.php
@@ -101,8 +101,10 @@ class Preorder extends mfBaseModel {
             }
         }
 
-        foreach($this->getProperty("adb_wohneinheit")->rimo_workorders as $workorder) {
-            Rimoapi::updateWorkorder($workorder->rimo_id, $update);
+        if($this->adb_wohneinheit_id && is_array($this->getProperty("adb_wohneinheit")->rimo_workorders)) {
+            foreach($this->getProperty("adb_wohneinheit")->rimo_workorders as $workorder) {
+                Rimoapi::updateWorkorder($workorder->rimo_id, $update);
+            }
         }
 
         return true;
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index a7077e32a..20904acc5 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1289,7 +1289,10 @@ class PreorderController extends mfBaseController {
             return false;
         }
 
-        if($preorder->type != "legacytransfer") {
+        /*if($preorder->type != "legacytransfer") {
+            return false;
+        }*/
+        if(!$this->me->is("Admin")) {
             return false;
         }
 
diff --git a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
index decf275a4..8f74014d6 100644
--- a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
+++ b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
@@ -71,7 +71,7 @@ class AddressHelper
             if (array_key_exists(3, $m)) {
                 $addresszusatz = trim($m[3]);
             }
-        } elseif (preg_match('/^(\D+)\s+(\d+[a-z0-9\/&#._-]*)(?:\s+((?:gesch(?:ae|ä)ft|werkstatt|betrieb und wohnungen|stg|paketlogistik|cafe|pavillon|pfarrheim|[^ ]*haus|[^ ]*geb(?:ae|ä)ude|[^ ]*halle|[^ ]*schule|Öhlmühle)(?:\s+[a-z0-9]+)?))?/i', $strasse_hausnummer, $m)) {
+        } elseif (preg_match('/^(\D+)\s+(\d+[a-z0-9\/&#._-]*)(?:\s+((?:gesch(?:ae|ä)ft|werkstatt|schmiede|betrieb und wohnungen|stg|paketlogistik|cafe|pavillon|pfarrheim|[^ ]*haus|[^ ]*geb(?:ae|ä)ude|[^ ]*halle|[^ ]*schule|Öhlmühle)(?:\s+[a-z0-9]+)?))?/i', $strasse_hausnummer, $m)) {
             $strasse_name = trim($m[1]);
             $hausnummer_name = trim($m[2]);
             if (array_key_exists(3, $m)) {