kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-02 20:25:28 +00:00
Code Issues Projects Releases Wiki Activity

Expand link view and more features #616

Browse Source
This commit is contained in:
James Cole
2017-08-21 18:16:15 +02:00
parent d00b9515de
commit a5013ecbc3
10 changed files with 281 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -13,13 +13,80 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use Illuminate\Http\Request;
use FireflyIII\Http\Requests\JournalLinkRequest;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionJournalLink;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Log;
use Session;
class LinkController
{
public function store(Request $request) {
var_dump($request->all());
/**
* @param JournalLinkRequest $request
* @param LinkTypeRepositoryInterface $repository
* @param JournalRepositoryInterface $journalRepository
* @param TransactionJournal $journal
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(
JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
) {
$linkType = $request->get('link_type');
$parts = explode('_', $linkType);
if (count($parts) !== 2) {
Session::flash('error', trans('firefly.invalid_link_data'));
return redirect(route('transactions.show', $journal->id));
}
if (!in_array($parts[1], ['inward', 'outward'])) {
Session::flash('error', trans('firefly.invalid_link_data'));
return redirect(route('transactions.show', $journal->id));
}
$linkTypeId = intval($parts[0]);
$linkType = $repository->find($linkTypeId);
if ($linkType->id !== $linkTypeId) {
Session::flash('error', trans('firefly.invalid_link_data'));
return redirect(route('transactions.show', $journal->id));
}
Log::debug('Will link using linktype', $linkType->toArray());
$linkJournalId = intval($request->get('link_journal_id'));
if ($linkJournalId === 0 && ctype_digit($request->string('link_other'))) {
$linkJournalId = intval($request->string('link_other'));
}
$opposing = $journalRepository->find($linkJournalId);
$result = $repository->findLink($journal, $opposing);
if ($result) {
Session::flash('error', trans('firefly.journals_error_linked'));
return redirect(route('transactions.show', $journal->id));
}
Log::debug(sprintf('Journal is %d, opposing is %d', $journal->id, $opposing->id));
$journalLink = new TransactionJournalLink;
$journalLink->linkType()->associate($linkType);
if ($parts[1] === 'inward') {
Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->inward, $opposing->id, $journal->id));
$journalLink->source()->associate($opposing);
$journalLink->destination()->associate($journal);
}
if ($parts[1] === 'outward') {
Log::debug(sprintf('Link type is inwards ("%s"), so %d is source and %d is destination.', $linkType->outward, $journal->id, $opposing->id));
$journalLink->source()->associate($journal);
$journalLink->destination()->associate($opposing);
}
$journalLink->comment = strlen($request->string('comments')) > 0 ? $request->string('comments') : null;
$journalLink->save();
Session::flash('success', trans('firefly.journals_linked'));
return redirect(route('transactions.show', $journal->id));
}
}

5
app/Http/Controllers/TransactionController.php
View File

@@ -161,13 +161,14 @@ class TransactionController extends Controller
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal);
}
$linkTypes = $linkTypeRepository->get();
$linkTypes = $linkTypeRepository->get();
$links = $linkTypeRepository->getLinks($journal);
$events = $tasker->getPiggyBankEvents($journal);
$transactions = $tasker->getTransactionsOverview($journal);
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes'));
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes','links'));
}

40
app/Http/Requests/JournalLinkRequest.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
/**
* JournalLinkRequest.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Requests;
/**
* Class JournalLink
*
*
* @package FireflyIII\Http\Requests
*/
class JournalLinkRequest extends Request
{
/**
* @return bool
*/
public function authorize()
{
// Only allow logged in users
return auth()->check();
}
/**
* @return array
*/
public function rules()
{
return [];
}
}