kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Make sure the "classic" page uses the transformer as well.

Browse Source
This commit is contained in:
James Cole
2018-02-06 18:11:33 +01:00
parent 9a0672e359
commit c4507a7f75
5 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Transformers/Bill/BillTransformer.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers\Bill;
use Carbon\Carbon;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Note;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Illuminate\Support\Collection;
use League\Fractal\TransformerAbstract;
@@ -74,6 +75,7 @@ class BillTransformer extends TransformerAbstract
'pay_dates' => $this->payDates($bill),
'paid_dates' => $paidData['paid_dates'],
'next_expected_match' => $paidData['next_expected_match'],
'notes' => $this->getNote($bill),
'links' => [
[
'rel' => 'self',
@@ -82,6 +84,8 @@ class BillTransformer extends TransformerAbstract
],
];
// todo: attachments, journals, notes
return $data;
@@ -137,6 +141,13 @@ class BillTransformer extends TransformerAbstract
*/
protected function paidData(Bill $bill): array
{
if (is_null($this->start) || is_null($this->end)) {
return [
'paid_dates' => [],
'next_expected_match' => null,
];
}
/** @var BillRepositoryInterface $repository */
$repository = app(BillRepositoryInterface::class);
$repository->setUser($bill->user);
@@ -193,4 +204,15 @@ class BillTransformer extends TransformerAbstract
return $simple->toArray();
}
private function getNote($bill): string
{
/** @var Note $note */
$note = $bill->notes()->first();
if (!is_null($note)) {
return $note->text;
}
return '';
}
}