From 49c01370ebc099521629db4af8767684a5207e90 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Thu, 15 Aug 2024 10:05:02 +0200
Subject: [PATCH] improve kreditor suche

---
 .../CargosoftController.java                  | 10 +++++++--
 .../main/webapp/pages/admin/kreditor.xhtml    | 21 -------------------
 .../alexander/cargsoft-creditor-search.xhtml  |  6 +++---
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java
index ecd725e..efbb681 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/CargosoftController.java
@@ -97,8 +97,14 @@ public class CargosoftController implements Serializable {
 
 		// die cargosoft Kreditornummer beginnt seltsamerweise mit einem K
 		// und die Debitoren mit einem D.....
-		String query = "(type:" + KreditorDebitorService.TYPE_CARGOSOFTKREDITOR + ") AND ( (name:K" + phrase
-				+ "*) OR (name:D" + phrase + "*)  OR (" + phrase.toLowerCase() + "*) )";
+		String query = "(type:" + KreditorDebitorService.TYPE_CARGOSOFTKREDITOR + ")";
+		if (phrase.toUpperCase().startsWith("K") || phrase.toUpperCase().startsWith("D")) {
+			query = query + " AND ( (name:" + phrase + "*)  OR (" + phrase.toLowerCase() + "*) )";
+		} else {
+			// query with K and D prafix
+			query = query + " AND ( (name:K" + phrase + "*) OR (name:D" + phrase + "*) "
+					+ " OR (" + phrase.toLowerCase() + "*) )";
+		}
 
 		try {
 			List<ItemCollection> result = documentService.find(query, 20, 0, "$modified", true);
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml
index 87dfd18..1d41ad9 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml
@@ -5,11 +5,7 @@
 	template="/layout/template.xhtml">
 
 
-
-
 	<ui:define name="content">
-
-
 		<f:view>
 			<h:form id="zahlungsziel_form_id">
 				<!-- ########## Error ########## -->
@@ -26,16 +22,11 @@
 							<h:outputText value="Accounts " />
 						</h1>
 					</div>
-
-
 					<!-- ########## Error ########## -->
 					<ui:include src="/error_message.xhtml" />
-
 					<div class="imixs-body">
-
 						<div class="imixs-form-panel">
 							<div class="imixs-form-section-2">
-
 								<dl>
 									<dt>Creditor/Debtor:</dt>
 
@@ -44,11 +35,8 @@
 											pt:data-item="cdtr.number" />
 									</dd>
 								</dl>
-
 							</div>
-
 							<h:panelGroup layout="block" styleClass="imixs-form-section-2" id="contentIputID">
-
 								<dl>
 									<dt>E-Mail:</dt>
 									<dd>
@@ -59,8 +47,6 @@
 										<span class="small">Separate multiple addresses with new lines.</span>
 									</dd>
 								</dl>
-
-
 								<dl>
 									<dt>Term of Payment:</dt>
 									<dd>
@@ -69,10 +55,6 @@
 											pt:data-item="cdtr.creditperiod" /> days
 									</dd>
 								</dl>
-
-
-
-
 								<dl>
 									<dt>Country:</dt>
 									<dd>
@@ -80,11 +62,8 @@
 											value="#{cargosoftController.kreditor.item['country']}" />
 									</dd>
 								</dl>
-
-
 							</h:panelGroup>
 
-
 							<div class="imixs-form-section-2">
 
 								<dl>
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
index b5f6f0d..aad4956 100644
--- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
+++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/cargsoft-creditor-search.xhtml
@@ -66,11 +66,11 @@
 				$("input[data-item='invoice.number']").focus().select();
 
 			}
-			// update iban/bic
-			if (inputElementIban) {
+			// update iban/bic if available
+			if (inputElementIban && cdtrData.iban && cdtrData.iban != '') {
 				inputElementIban.val(cdtrData.iban);
 			}
-			if (inputElementBic) {
+			if (inputElementBic && cdtrData.bic && cdtrData.bic != '') {
 				inputElementBic.val(cdtrData.bic);
 			}
 			if (inputElementMail) {