EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
invitation dateStartFull
Yuri Kuznetsovc6f9250d85f4
diff --git a/application/Espo/Entities/Preferences.php b/application/Espo/Entities/Preferences.phpindex 1292d7a40d..247e134e72 100644--- a/application/Espo/Entities/Preferences.php+++ b/application/Espo/Entities/Preferences.php@@ -47,4 +47,9 @@ class Preferences extends \Espo\Core\ORM\Entity{return $this->get('timeZone');}++ public function getLanguage(): ?string+ {+ return $this->get('language');+ }}diff --git a/application/Espo/Modules/Crm/Business/Event/Invitations.php b/application/Espo/Modules/Crm/Business/Event/Invitations.phpindex cddbfc4aef..92eb96d4fd 100644--- a/application/Espo/Modules/Crm/Business/Event/Invitations.php+++ b/application/Espo/Modules/Crm/Business/Event/Invitations.php@@ -66,6 +66,7 @@ class Invitations/*** Some dependencies are unused to keep backward compatibility.+ * @todo Revise.*/public function __construct(private EntityManager $entityManager,@@ -75,6 +76,7 @@ class Invitationsprivate TemplateFileManager $templateFileManager,private HtmlizerFactory $htmlizerFactory,private ApplicationConfig $applicationConfig,+ private DateTimeUtil $dateTime,) {}/**@@ -282,7 +284,10 @@ class Invitations$data['entityType'] = $this->language->translateLabel($entity->getEntityType(), 'scopeNames');$data['entityTypeLowerFirst'] = Util::mbLowerCaseFirst($data['entityType']);- $data['timeZone'] = $this->getTimeZone($invitee);+ [$timeZone, $language] = $this->getTimeZoneAndLanguage($invitee);++ $data['timeZone'] = $timeZone;+ $data['dateStartFull'] = $this->prepareDateStartFull($entity, $timeZone, $language);return $data;}@@ -340,9 +345,13 @@ class Invitationsreturn $attendees;}- private function getTimeZone(Entity $invitee): string+ /**+ * @return array{string, string}+ */+ private function getTimeZoneAndLanguage(Entity $invitee): array{$timeZone = $this->applicationConfig->getTimeZone();+ $language = $this->applicationConfig->getLanguage();if ($invitee instanceof User) {$preferences = $this->entityManager@@ -352,8 +361,36 @@ class Invitationsif ($preferences && $preferences->getTimeZone()) {$timeZone = $preferences->getTimeZone();}++ if ($preferences && $preferences->getLanguage()) {+ $language = $preferences->getLanguage();+ }+ }++ return [$timeZone, $language];+ }++ /**+ * @todo Take into account the invitees time format if a user.+ */+ private function prepareDateStartFull(Entity $entity, string $timeZone, string $language): ?string+ {+ $format = "dddd, MMMM Do, YYYY";++ if ($entity->get('dateStartDate')) {+ $value = $entity->get('dateStartDate');++ return $this->dateTime->convertSystemDate($value, $format, $language);}- return $timeZone;+ $value = $entity->get('dateStart');++ if (!$value) {+ return null;+ }++ $format = $this->applicationConfig->getTimeFormat() . ", " . $format;++ return $this->dateTime->convertSystemDateTime($value, $timeZone, $format, $language);}}diff --git a/application/Espo/Modules/Crm/Resources/templates/cancellation/de_DE/body.tpl b/application/Espo/Modules/Crm/Resources/templates/cancellation/de_DE/body.tplindex 503605235c..c61ed6fa85 100644--- a/application/Espo/Modules/Crm/Resources/templates/cancellation/de_DE/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/cancellation/de_DE/body.tpl@@ -1,5 +1,5 @@<p>Betreff: {{name}}</p>-<p>Start: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Start: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}<p><a href="{{recordUrl}}">Eintrag öffnen</a></p>{{/if}}diff --git a/application/Espo/Modules/Crm/Resources/templates/cancellation/en_US/body.tpl b/application/Espo/Modules/Crm/Resources/templates/cancellation/en_US/body.tplindex 72b3d01cc7..f59f90d642 100644--- a/application/Espo/Modules/Crm/Resources/templates/cancellation/en_US/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/cancellation/en_US/body.tpl@@ -1,5 +1,5 @@<p>Subject: {{name}}</p>-<p>Start: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Start: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}<p><a href="{{recordUrl}}">View record</a></p>{{/if}}diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/de_DE/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/de_DE/body.tplindex 871b6ff6ef..681c1cae10 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/de_DE/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/de_DE/body.tpl@@ -1,5 +1,5 @@<p>Betreff: {{name}}</p>-<p>Beginn: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Beginn: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/en_US/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/en_US/body.tplindex b71112d8a4..ee116a25f5 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/en_US/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/en_US/body.tpl@@ -1,5 +1,5 @@<p>Subject: {{name}}</p>-<p>Start: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Start: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/es_ES/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/es_ES/body.tplindex 161c53a937..e271842265 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/es_ES/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/es_ES/body.tpl@@ -1,5 +1,5 @@<p>Asunto: {{name}}</p>-<p>Comienzo: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Comienzo: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/fr_FR/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/fr_FR/body.tplindex d143ae4aba..988f4ad477 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/fr_FR/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/fr_FR/body.tpl@@ -1,5 +1,5 @@<p>Objet: {{name}}</p>-<p>Débute à: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Débute à: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/ru_RU/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/ru_RU/body.tplindex fc7dce1b2f..7bf0d88b78 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/ru_RU/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/ru_RU/body.tpl@@ -1,5 +1,5 @@<p>Название: {{name}}</p>-<p>Начало: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Начало: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/uk_UA/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/uk_UA/body.tplindex 4c88fc84ee..a909340134 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/uk_UA/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/uk_UA/body.tpl@@ -1,5 +1,5 @@<p>Назва: {{name}}</p>-<p>Початок: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Початок: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>diff --git a/application/Espo/Modules/Crm/Resources/templates/invitation/zh_CN/body.tpl b/application/Espo/Modules/Crm/Resources/templates/invitation/zh_CN/body.tplindex a4d1017b2e..07b39ee39a 100644--- a/application/Espo/Modules/Crm/Resources/templates/invitation/zh_CN/body.tpl+++ b/application/Espo/Modules/Crm/Resources/templates/invitation/zh_CN/body.tpl@@ -1,5 +1,5 @@<p>Subject: {{name}}</p>-<p>Start: {{#if isAllDay}}{{dateStartDate}}{{else}}{{dateStart}} ({{timeZone}}){{/if}}</p>+<p>Start: {{#if isAllDay}}{{dateStartFull}}{{else}}{{dateStartFull}} ({{timeZone}}){{/if}}</p>{{#if isUser}}{{#if description}}<p>{{{description}}}</p>