From 4eb3021d8d700c4e155619b51a5d3692909fe614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Fri, 1 Apr 2022 09:16:17 +0200
Subject: [PATCH] refactor: use correct contact person in mails
---
.../Invoice/Output/OutputProviderInvoice.php | 20 ++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/QUI/ERP/Accounting/Invoice/Output/OutputProviderInvoice.php b/src/QUI/ERP/Accounting/Invoice/Output/OutputProviderInvoice.php
index b206511..ec89360 100644
--- a/src/QUI/ERP/Accounting/Invoice/Output/OutputProviderInvoice.php
+++ b/src/QUI/ERP/Accounting/Invoice/Output/OutputProviderInvoice.php
@@ -316,13 +316,19 @@ public static function getMailBody($entityId)
*/
protected static function getInvoiceLocaleVar($Invoice, $Customer): array
{
- $user = $Customer->getName();
- $user = \trim($user);
+ $CustomerAddress = $Customer->getAddress();
+ $user = $CustomerAddress->getAttribute('contactPerson');
+
+ if (empty($user)) {
+ $user = $Customer->getName();
+ }
if (empty($user)) {
$user = $Customer->getAddress()->getName();
}
+ $user = \trim($user);
+
// contact person
$contactPerson = $Invoice->getAttribute('contact_person');
@@ -394,13 +400,18 @@ public static function getCustomerVariables(QUI\ERP\User $Customer): array
$Address = $Customer->getAddress();
// customer name
- $user = $Customer->getName();
- $user = \trim($user);
+ $user = $Address->getAttribute('contactPerson');
+
+ if (empty($user)) {
+ $user = $Customer->getName();
+ }
if (empty($user)) {
$user = $Address->getName();
}
+ $user = \trim($user);
+
// email
$email = $Customer->getAttribute('email');
@@ -412,7 +423,6 @@ public static function getCustomerVariables(QUI\ERP\User $Customer): array
}
}
-
return [
'user' => $user,
'name' => $user,
--
GitLab