From 37e48fa18a0e86a699adcf63e4a4e05d477568b7 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 14 Apr 2022 15:02:54 +0200
Subject: [PATCH] Fixed customer name including newline characters in
 Order/Form

---
 Layout/default/Order/Form.php             | 2 +-
 application/Address/AddressController.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 97bc4305c..3dd0cccc7 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -767,7 +767,7 @@
   
   // kunde
   <?php if($order->owner_id && is_object(($order->owner))): ?>
-  $('#owner_id').autoComplete('set', { value: <?=$order->owner_id?>, text: '<?=($order->owner_id) ? $order->owner->getCompanyOrName()." (".$order->owner->zip." ".$order->owner->city.", ".$order->owner->street.")".(($order->owner->customer_number) ? " [".$order->owner->customer_number."]" : "") : ""?>'});
+  $('#owner_id').autoComplete('set', { value: <?=$order->owner_id?>, text: '<?=($order->owner_id) ? str_replace(["\n", "\r"], " ", $order->owner->getCompanyOrName())." (".$order->owner->zip." ".$order->owner->city.", ".$order->owner->street.")".(($order->owner->customer_number) ? " [".$order->owner->customer_number."]" : "") : ""?>'});
   <?php else: ?>
   $('#owner_id').autoComplete();
   <?php endif; ?>
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 4628e6e50..577325ea3 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -291,7 +291,7 @@ class AddressController extends mfBaseController {
 
     if(!$autocomplete) {
       foreach($all_addresses as $id => $address) {
-        $results[$id] = $address->getCompanyOrName()." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "");
+        $results[$id] = str_replace(["\n", "\r"], " ",$address->getCompanyOrName())." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "");
         if(count($results) > 5) {
           $results["more"] = "...";
           break;
@@ -303,7 +303,7 @@ class AddressController extends mfBaseController {
     
     // return bootstrap-autocomplete format
     foreach($all_addresses as $id => $address) {
-      $result = ['value' => $id, 'text' => $address->getCompanyOrName()." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "")];
+      $result = ['value' => $id, 'text' => str_replace(["\n", "\r"], " ",$address->getCompanyOrName())." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "")];
       $results[] = $result;
       if(count($results) > 5) {
         $results[] = ['value' => 0, 'text' =>  "&nbsp;&nbsp;--> &nbsp;&nbsp;Mehr Suchergebnisse vorhanden. Bitte Suchbegriff genauer definieren &nbsp;&nbsp;<--"];