IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole 2022-04-13 14:11:48 +02:00
commit b10c1044bd
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Collector/Extensions/TimeCollection.php
View File

@ -555,7 +555,9 @@ trait TimeCollection
*/ */
public function setObjectBefore(Carbon $date, string $field): GroupCollectorInterface public function setObjectBefore(Carbon $date, string $field): GroupCollectorInterface
{ {
die('a'); $afterStr = $date->format('Y-m-d 00:00:00');
$this->query->where(sprintf('transaction_journals.%s', $field), '<=', $afterStr);
return $this;
} }
/** /**

4
app/Support/Search/OperatorQuerySearch.php
View File

@ -1374,7 +1374,7 @@ class OperatorQuerySearch implements SearchInterface
foreach ($range as $key => $value) { foreach ($range as $key => $value) {
switch ($key) { switch ($key) {
default: default:
throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key)); throw new FireflyException(sprintf('Cannot handle key "%s" in setObjectDateBeforeParams()', $key));
case 'exact': case 'exact':
$this->collector->setObjectBefore($value, $field); $this->collector->setObjectBefore($value, $field);
$this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d'),]); $this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d'),]);
@ -1413,7 +1413,7 @@ class OperatorQuerySearch implements SearchInterface
foreach ($range as $key => $value) { foreach ($range as $key => $value) {
switch ($key) { switch ($key) {
default: default:
throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key)); throw new FireflyException(sprintf('Cannot handle key "%s" in setObjectDateAfterParams()', $key));
case 'exact': case 'exact':
$this->collector->setObjectAfter($value, $field); $this->collector->setObjectAfter($value, $field);
$this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d'),]); $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d'),]);

3
app/Validation/FireflyValidator.php
View File

@ -807,9 +807,6 @@ class FireflyValidator extends Validator
->where('response', $response) ->where('response', $response)
->where('delivery', $delivery) ->where('delivery', $delivery)
->where('url', $url)->count(); ->where('url', $url)->count();
// find similar webhook for user:
//= var_dump($this->data);
//exit;
} }
return false; return false;