kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix transaction link route.

Browse Source
This commit is contained in:
James Cole
2020-08-07 11:10:35 +02:00
parent d078764ae4
commit f60bacba85
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Api/V1/Controllers/TransactionController.php
View File

@@ -114,18 +114,15 @@ class TransactionController extends Controller
} }
/** /**
* @param TransactionGroup $transactionGroup * @param TransactionJournal $transactionJournal
* *
* @return JsonResponse * @return JsonResponse
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function transactionLinks(TransactionGroup $transactionGroup): JsonResponse public function transactionLinks(TransactionJournal $transactionJournal): JsonResponse
{ {
$manager = $this->getManager(); $manager = $this->getManager();
$journalLinks = new Collection; $journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal);
foreach ($transactionGroup->transactionJournals as $transactionJournal) {
$journalLinks = $this->journalAPIRepository->getJournalLinks($transactionJournal)->merge($journalLinks);
}
/** @var TransactionLinkTransformer $transformer */ /** @var TransactionLinkTransformer $transformer */
$transformer = app(TransactionLinkTransformer::class); $transformer = app(TransactionLinkTransformer::class);
@@ -293,8 +290,8 @@ class TransactionController extends Controller
* *
* @param TransactionStoreRequest $request * @param TransactionStoreRequest $request
* *
* @throws FireflyException
* @return JsonResponse * @return JsonResponse
* @throws FireflyException
*/ */
public function store(TransactionStoreRequest $request): JsonResponse public function store(TransactionStoreRequest $request): JsonResponse
{ {

4
routes/api.php
View File

@@ -481,9 +481,9 @@ Route::group(
Route::get('{transactionGroup}', ['uses' => 'TransactionController@show', 'as' => 'show']); Route::get('{transactionGroup}', ['uses' => 'TransactionController@show', 'as' => 'show']);
Route::get('{transactionGroup}/attachments', ['uses' => 'TransactionController@attachments', 'as' => 'attachments']); Route::get('{transactionGroup}/attachments', ['uses' => 'TransactionController@attachments', 'as' => 'attachments']);
Route::get('{transactionGroup}/piggy_bank_events', ['uses' => 'TransactionController@piggyBankEvents', 'as' => 'piggy_bank_events']); Route::get('{transactionGroup}/piggy_bank_events', ['uses' => 'TransactionController@piggyBankEvents', 'as' => 'piggy_bank_events']);
Route::get('{transactionGroup}/transaction_links', ['uses' => 'TransactionController@transactionLinks', 'as' => 'transaction_links']); Route::get('{tj}/transaction_links', ['uses' => 'TransactionController@transactionLinks', 'as' => 'transaction_links']);
Route::put('{transactionGroup}', ['uses' => 'TransactionController@update', 'as' => 'update']); Route::put('{transactionGroup}', ['uses' => 'TransactionController@update', 'as' => 'update']);
Route::delete('{transactionGroup}/{transactionJournal}', ['uses' => 'TransactionController@deleteJournal', 'as' => 'delete-journal']); Route::delete('{transactionGroup}/{tj}', ['uses' => 'TransactionController@deleteJournal', 'as' => 'delete-journal']);
Route::delete('{transactionGroup}', ['uses' => 'TransactionController@delete', 'as' => 'delete']); Route::delete('{transactionGroup}', ['uses' => 'TransactionController@delete', 'as' => 'delete']);
} }
); );