diff --git a/src/QUI/Memberships/Users/MembershipUser.php b/src/QUI/Memberships/Users/MembershipUser.php index 752d16b52e97b5bb8bcf7e407b726d282d0e7094..f60e1a77dcdbc48bcf80fa9c6ea254fad956b853 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'; + } } }