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

Remove debug, add fix for https://github.com/orgs/firefly-iii/discussions/7655#discussioncomment-6468397

Browse Source
This commit is contained in:
James Cole 2023-07-18 06:18:04 +02:00
parent 788dae1477
commit e435ff8b1c
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Transformers/BillTransformer.php
View File

@ -86,11 +86,6 @@ class BillTransformer extends AbstractTransformer
foreach ($payDates as $string) { foreach ($payDates as $string) {
$payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString(); $payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString();
} }
if (1 === $bill->id) {
var_dump($payDates);
var_dump($payDatesFormatted);
var_dump($paidData['next_expected_match']);
}
$nextExpectedMatch = null; $nextExpectedMatch = null;
if (null !== $paidData['next_expected_match']) { if (null !== $paidData['next_expected_match']) {
$nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $paidData['next_expected_match'], config('app.timezone'))->toAtomString(); $nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $paidData['next_expected_match'], config('app.timezone'))->toAtomString();
@ -157,7 +152,7 @@ class BillTransformer extends AbstractTransformer
{ {
Log::debug(sprintf('Now in paidData for bill #%d', $bill->id)); Log::debug(sprintf('Now in paidData for bill #%d', $bill->id));
if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) { if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) {
//Log::debug('parameters are NULL, return empty array'); Log::debug('parameters are NULL, return empty array');
return [ return [
'paid_dates' => [], 'paid_dates' => [],
@ -165,15 +160,19 @@ class BillTransformer extends AbstractTransformer
]; ];
} }
// 2023-07-1 sub one day from the start date to fix a possible bug (see #7704) // 2023-07-1 sub one day from the start date to fix a possible bug (see #7704)
// 2023-07-18 this particular date is used to search for the last paid date.
// 2023-07-18 the cloned $searchDate is used to grab the correct transactions.
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone $this->parameters->get('start'); $start = clone $this->parameters->get('start');
$start->subDay(); $start->subDay();
$searchStart = clone $start;
//Log::debug(sprintf('Parameters are start:%s end:%s', $start->format('Y-m-d'), $this->parameters->get('end')->format('Y-m-d'))); //Log::debug(sprintf('Parameters are start:%s end:%s', $start->format('Y-m-d'), $this->parameters->get('end')->format('Y-m-d')));
/* /*
* Get from database when bill was paid. * Get from database when bill was paid.
*/ */
$set = $this->repository->getPaidDatesInRange($bill, $start, $this->parameters->get('end')); $set = $this->repository->getPaidDatesInRange($bill, $searchStart, $this->parameters->get('end'));
//Log::debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count())); //Log::debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
/* /*