Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed customer name including newline characters in Order/Form

Browse Source
This commit is contained in:
Frank Schubert
2022-04-14 15:02:54 +02:00
parent 4923b4e823
commit 37e48fa18a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/Order/Form.php
View File

@@ -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; ?>

4
application/Address/AddressController.php
View File

@@ -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;<--"];