Skip to content
Snippets Groups Projects
Commit 7c74e7cd authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Merge date format

parents ef3d1d5c 74088fa3
No related branches found
No related tags found
1 merge request!3New version 4 1
...@@ -143,12 +143,12 @@ class MailRepository extends AbstractRepository { ...@@ -143,12 +143,12 @@ class MailRepository extends AbstractRepository {
$fromTime = strtotime($filters['filterFromDate']); $fromTime = strtotime($filters['filterFromDate']);
if ($fromTime) { if ($fromTime) {
$constraintsAnd[] = $query->greaterThan('last_sending_time', $fromTime); $constraintsAnd[] = $query->greaterThanOrEqual('last_sending_time', $fromTime);
} }
$toTime = strtotime($filters['filterToDate']); $toTime = strtotime($filters['filterToDate']);
if ($toTime) { if ($toTime) {
$constraintsAnd[] = $query->lessThan('last_sending_time', $toTime); $constraintsAnd[] = $query->lessThanOrEqual('last_sending_time', $toTime);
} }
if ($filters['sent']) { if ($filters['sent']) {
......
...@@ -62,11 +62,11 @@ ...@@ -62,11 +62,11 @@
</td> </td>
<td> <td>
<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span> <span><f:format.date format="d.m.Y H:i">{mail.crdate}</f:format.date></span>
<hr> <hr>
<f:if condition="{mail.last_sending_time} != 0"> <f:if condition="{mail.last_sending_time} != 0">
<f:then> <f:then>
<span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span> <span><f:format.date format="d.m.Y H:i">{mail.last_sending_time}</f:format.date></span>
</f:then> </f:then>
<f:else> <f:else>
<f:translate key="backend.not_sent" /> <f:translate key="backend.not_sent" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment