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

Start with edit and view screens.

Browse Source
This commit is contained in:
James Cole
2016-05-11 23:03:13 +02:00
parent 7c39a04c4b
commit b7c446f7db
4 changed files with 124 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/HomeController.php
View File

@@ -153,10 +153,10 @@ class HomeController extends Controller
{
// these routes are not relevant for the help pages:
$ignore = [
'logout', 'register', 'bills.rescan', 'attachments.download', 'attachments.preview',
'budgets.income', 'csv.download-config', 'currency.default', 'export.status', 'export.download',
'json.', 'help.', 'piggy-banks.addMoney', 'piggy-banks.removeMoney', 'rules.rule.up', 'rules.rule.down',
'rules.rule-group.up', 'rules.rule-group.down', 'debugbar',
// 'logout', 'register', 'bills.rescan', 'attachments.download', 'attachments.preview',
// 'budgets.income', 'csv.download-config', 'currency.default', 'export.status', 'export.download',
// 'json.', 'help.', 'piggy-banks.addMoney', 'piggy-banks.removeMoney', 'rules.rule.up', 'rules.rule.down',
// 'rules.rule-group.up', 'rules.rule-group.down', 'debugbar',
];
$routes = Route::getRoutes();
/** @var \Illuminate\Routing\Route $route */
@@ -166,9 +166,7 @@ class HomeController extends Controller
$methods = $route->getMethods();
if (!is_null($name) && in_array('GET', $methods) && !$this->startsWithAny($ignore, $name)) {
foreach (array_keys(config('firefly.languages')) as $lang) {
echo 'touch ' . $lang . '/' . $name . '.md<br>';
}
echo $name . '<br>';
}
}

11
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -15,6 +15,7 @@ use FireflyIII\Crud\Split\JournalInterface;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\SplitJournalFormRequest;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -41,6 +42,13 @@ class SplitController extends Controller
View::share('title', trans('firefly.split-transactions'));
}
public function edit(TransactionJournal $journal)
{
$count = $journal->transactions()->count();
if ($count === 2) {
return redirect(route('transactions.edit', [$journal->id]));
}
}
/**
* @param Request $request
@@ -88,7 +96,8 @@ class SplitController extends Controller
* @param SplitJournalFormRequest $request
* @param JournalInterface $repository
*
* @return mixed
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws FireflyException
*/
public function postJournalFromStore(SplitJournalFormRequest $request, JournalInterface $repository)
{

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

@@ -12,6 +12,7 @@ namespace FireflyIII\Http\Controllers;
use Amount;
use Auth;
use Carbon\Carbon;
use DB;
use ExpandedForm;
use FireflyIII\Events\TransactionJournalStored;
use FireflyIII\Events\TransactionJournalUpdated;
@@ -21,7 +22,6 @@ use FireflyIII\Http\Requests\MassDeleteJournalRequest;
use FireflyIII\Http\Requests\MassEditJournalRequest;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -147,6 +147,10 @@ class TransactionController extends Controller
*/
public function edit(TransactionJournal $journal)
{
$count = $journal->transactions()->count();
if ($count > 2) {
return redirect(route('split.journal.edit', [$journal->id]));
}
/** @var ARI $accountRepository */
$accountRepository = app(ARI::class);
/** @var BudgetRepositoryInterface $budgetRepository */
@@ -400,12 +404,11 @@ class TransactionController extends Controller
}
/**
* @param JournalRepositoryInterface $repository
* @param TransactionJournal $journal
* @param TransactionJournal $journal
*
* @return \Illuminate\View\View
*/
public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
public function show(TransactionJournal $journal)
{
/** @var Collection $set */
@@ -415,17 +418,13 @@ class TransactionController extends Controller
$event->piggyBank = $event->piggyBank()->withTrashed()->first();
}
);
$journal->transactions->each(
function (Transaction $t) use ($journal, $repository) {
$t->before = $repository->getAmountBefore($journal, $t);
$t->after = bcadd($t->before, $t->amount);
}
$transactions = $journal->transactions()->groupBy('transactions.account_id')->orderBy('amount', 'ASC')->get(
['transactions.*', DB::raw('SUM(`transactions`.`amount`) as `sum`')]
);
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
$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'));
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions'));
}
/**