IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-02 05:29:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refer to correct location for bill transformer.

Browse Source
This commit is contained in:
James Cole 2018-02-06 19:48:56 +01:00
parent d3c8d06114
commit 811d8e330f
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/BillController.php
View File

@ -25,7 +25,7 @@ namespace FireflyIII\Api\V1\Controllers;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Transformers\Bill\BillTransformer; use FireflyIII\Transformers\BillTransformer;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use League\Fractal\Manager; use League\Fractal\Manager;

16
app/Http/Controllers/BillController.php
View File

@ -30,9 +30,12 @@ use FireflyIII\Models\Bill;
use FireflyIII\Models\Note; use FireflyIII\Models\Note;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Transformers\Bill\BillTransformer; use FireflyIII\Transformers\BillTransformer;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use League\Fractal\Manager;
use League\Fractal\Resource\Item;
use League\Fractal\Serializer\DataArraySerializer;
use Preferences; use Preferences;
use URL; use URL;
use View; use View;
@ -230,8 +233,13 @@ class BillController extends Controller
$pageSize = intval(Preferences::get('listPageSize', 50)->data); $pageSize = intval(Preferences::get('listPageSize', 50)->data);
$yearAverage = $repository->getYearAverage($bill, $start); $yearAverage = $repository->getYearAverage($bill, $start);
$overallAverage = $repository->getOverallAverage($bill); $overallAverage = $repository->getOverallAverage($bill);
$transformer = new BillTransformer($start, $end); $manager = new Manager();
$object = $transformer->transform($bill); $manager->setSerializer(new DataArraySerializer());
$manager->parseIncludes(['attachments']);
// Make a resource out of the data and
$resource = new Item($bill, new BillTransformer($start, $end), 'bill');
$object = $manager->createData($resource)->toArray();
// use collector: // use collector:
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
@ -242,7 +250,7 @@ class BillController extends Controller
$transactions->setPath(route('bills.show', [$bill->id])); $transactions->setPath(route('bills.show', [$bill->id]));
return view('bills.show', compact('transactions', 'yearAverage', 'overallAverage', 'year', 'object','bill', 'subTitle')); return view('bills.show', compact('transactions', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
} }
/** /**