Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-21 07:03:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'features/household-editor' into features/household-validation

Browse Source
This commit is contained in:
Julien Fastré
2021-06-11 17:08:38 +02:00
parent 45dc8ed661 b2ce5fca38
commit af740fd87d
36 changed files with 1661 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillPersonBundle/Entity/Household/Household.php
View File

@@ -116,8 +116,7 @@ class Household
{
$criteria = new Criteria();
$expr = Criteria::expr();
$date = $now === null ? (new \DateTimeImmutable('now')) : $now;
$date = $now === null ? (new \DateTimeImmutable('today')) : $now;
$criteria
->where($expr->orX(
@@ -149,7 +148,7 @@ class Household
{
$criteria = new Criteria();
$expr = Criteria::expr();
$date = $now === null ? (new \DateTimeImmutable('now')) : $now;
$date = $now === null ? (new \DateTimeImmutable('today')) : $now;
$criteria
->where(