kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 18:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix nullpointer in bill transformer.

Browse Source
This commit is contained in:
James Cole
2021-04-02 06:57:31 +02:00
parent a2ae977550
commit 5750087d37
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Transformers/BillTransformer.php
View File

@@ -86,6 +86,10 @@ 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();
} }
$nextExpectedMatch = null;
if(null !== $paidData['next_expected_match'] ) {
$nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $paidData['next_expected_match'], config('app.timezone'))->toAtomString();
}
return [ return [
'id' => (int)$bill->id, 'id' => (int)$bill->id,
@@ -104,7 +108,7 @@ class BillTransformer extends AbstractTransformer
'active' => $bill->active, 'active' => $bill->active,
'order' => (int)$bill->order, 'order' => (int)$bill->order,
'notes' => $notes, 'notes' => $notes,
'next_expected_match' => Carbon::createFromFormat('!Y-m-d', $paidData['next_expected_match'], config('app.timezone'))->toAtomString(), 'next_expected_match' => $nextExpectedMatch,
'pay_dates' => $payDatesFormatted, 'pay_dates' => $payDatesFormatted,
'paid_dates' => $paidDataFormatted, 'paid_dates' => $paidDataFormatted,
'object_group_id' => $objectGroupId ? (string)$objectGroupId : null, 'object_group_id' => $objectGroupId ? (string)$objectGroupId : null,