From e1f60a372e6387ac0400f1eddbc3a372f86497b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20M=C3=BCller?= <p.mueller@pcsg.de>
Date: Thu, 17 Oct 2024 08:07:52 +0200
Subject: [PATCH] fix: better fallback for date formats
---
src/QUI/Memberships/Users/MembershipUser.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/QUI/Memberships/Users/MembershipUser.php b/src/QUI/Memberships/Users/MembershipUser.php
index 752d16b..f60e1a7 100644
--- a/src/QUI/Memberships/Users/MembershipUser.php
+++ b/src/QUI/Memberships/Users/MembershipUser.php
@@ -916,7 +916,11 @@ protected function formatDate($date)
// fallback to default value
if (empty($dateFormat)) {
- $dateFormat = '%D';
+ if (QUI::getPackageManager()->isInstalled('quiqqer/erp')) {
+ $dateFormat = QUI\ERP\Defaults::getDateFormat($lang);
+ } else {
+ $dateFormat = '%D';
+ }
}
break;
@@ -925,7 +929,11 @@ protected function formatDate($date)
// fallback to default value
if (empty($dateFormat)) {
- $dateFormat = '%D %H:%M';
+ if (QUI::getPackageManager()->isInstalled('quiqqer/erp')) {
+ $dateFormat = QUI\ERP\Defaults::getTimestampFormat($lang);
+ } else {
+ $dateFormat = '%D %H:%M';
+ }
}
}
--
GitLab