kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 21:23:36 +00:00
Code Issues Projects Releases Wiki Activity

New possibilities for date range triggers #3403

Browse Source
This commit is contained in:
James Cole
2020-06-12 07:49:39 +02:00
parent 48b5f749a1
commit b1732d0de8
4 changed files with 422 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/TransactionRules/Triggers/DateIs.php
View File

@@ -82,7 +82,9 @@ final class DateIs extends AbstractTrigger implements TriggerInterface
return false;
}
if ($ruleDate->isSameDay($date)) {
$isDateRange = $dateParser->isDateRange($this->triggerValue);
if (false === $isDateRange && $ruleDate->isSameDay($date)) {
Log::debug(
sprintf(
'%s is on the same day as %s, so return true.',
@@ -94,6 +96,34 @@ final class DateIs extends AbstractTrigger implements TriggerInterface
return true;
}
// could be a date range.
if ($isDateRange) {
Log::debug(sprintf('Date value is "%s", representing a range.', $this->triggerValue));
$range = $dateParser->parseRange($this->triggerValue, $date);
if ($date->isAfter($range['start']) && $date->isBefore($range['end'])) {
Log::debug(
sprintf(
'%s is between [%s/%s], so return true.',
$date->format('Y-m-d H:i:s'),
$range['start']->format('Y-m-d H:i:s'),
$range['end']->format('Y-m-d H:i:s'),
)
);
return true;
}
Log::debug(
sprintf(
'%s is NOT between [%s/%s], so return false.',
$date->format('Y-m-d H:i:s'),
$range['start']->format('Y-m-d H:i:s'),
$range['end']->format('Y-m-d H:i:s'),
)
);
return false;
}
Log::debug(
sprintf(
'%s is NOT on the same day as %s, so return true.',