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

Fixed #940

Browse Source
This commit is contained in:
James Cole
2017-10-19 18:08:50 +02:00
parent 783f587a8a
commit eec076c745
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,7 @@ class BillController extends Controller
{ {
$billData = $request->getBillData(); $billData = $request->getBillData();
$bill = $repository->store($billData); $bill = $repository->store($billData);
$request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)]))); $request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => $bill->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('create_another')) === 1) { if (intval($request->get('create_another')) === 1) {
@@ -269,7 +269,7 @@ class BillController extends Controller
$billData = $request->getBillData(); $billData = $request->getBillData();
$bill = $repository->update($bill, $billData); $bill = $repository->update($bill, $billData);
$request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)]))); $request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => $bill->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) { if (intval($request->get('return_to_edit')) === 1) {

6
app/Http/Controllers/BudgetController.php
View File

@@ -135,7 +135,7 @@ class BudgetController extends Controller
$name = $budget->name; $name = $budget->name;
$this->repository->destroy($budget); $this->repository->destroy($budget);
$request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => $name])));
Preferences::mark(); Preferences::mark();
return redirect($this->getPreviousUri('budgets.delete.uri')); return redirect($this->getPreviousUri('budgets.delete.uri'));
@@ -464,7 +464,7 @@ class BudgetController extends Controller
$data = $request->getBudgetData(); $data = $request->getBudgetData();
$budget = $this->repository->store($data); $budget = $this->repository->store($data);
$request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); $request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => $budget->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('create_another')) === 1) { if (intval($request->get('create_another')) === 1) {
@@ -489,7 +489,7 @@ class BudgetController extends Controller
$data = $request->getBudgetData(); $data = $request->getBudgetData();
$this->repository->update($budget, $data); $this->repository->update($budget, $data);
$request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); $request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => $budget->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) { if (intval($request->get('return_to_edit')) === 1) {

6
app/Http/Controllers/CategoryController.php
View File

@@ -108,7 +108,7 @@ class CategoryController extends Controller
$name = $category->name; $name = $category->name;
$repository->destroy($category); $repository->destroy($category);
$request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); $request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => $name])));
Preferences::mark(); Preferences::mark();
return redirect($this->getPreviousUri('categories.delete.uri')); return redirect($this->getPreviousUri('categories.delete.uri'));
@@ -292,7 +292,7 @@ class CategoryController extends Controller
$data = $request->getCategoryData(); $data = $request->getCategoryData();
$category = $repository->store($data); $category = $repository->store($data);
$request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)]))); $request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => $category->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('create_another')) === 1) { if (intval($request->get('create_another')) === 1) {
@@ -319,7 +319,7 @@ class CategoryController extends Controller
$data = $request->getCategoryData(); $data = $request->getCategoryData();
$repository->update($category, $data); $repository->update($category, $data);
$request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)]))); $request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => $category->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) { if (intval($request->get('return_to_edit')) === 1) {

10
app/Http/Controllers/PiggyBankController.php
View File

@@ -149,7 +149,7 @@ class PiggyBankController extends Controller
*/ */
public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
{ {
Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)]))); Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => $piggyBank->name])));
Preferences::mark(); Preferences::mark();
$repository->destroy($piggyBank); $repository->destroy($piggyBank);
@@ -297,7 +297,7 @@ class PiggyBankController extends Controller
'error', strval( 'error', strval(
trans( trans(
'firefly.cannot_add_amount_piggy', 'firefly.cannot_add_amount_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)] ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
) )
) )
); );
@@ -337,7 +337,7 @@ class PiggyBankController extends Controller
'error', strval( 'error', strval(
trans( trans(
'firefly.cannot_remove_from_piggy', 'firefly.cannot_remove_from_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)] ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
) )
) )
); );
@@ -395,7 +395,7 @@ class PiggyBankController extends Controller
$data = $request->getPiggyBankData(); $data = $request->getPiggyBankData();
$piggyBank = $repository->store($data); $piggyBank = $repository->store($data);
Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => e($piggyBank->name)]))); Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('create_another')) === 1) { if (intval($request->get('create_another')) === 1) {
@@ -421,7 +421,7 @@ class PiggyBankController extends Controller
$data = $request->getPiggyBankData(); $data = $request->getPiggyBankData();
$piggyBank = $repository->update($piggyBank, $data); $piggyBank = $repository->update($piggyBank, $data);
Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => e($piggyBank->name)]))); Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => $piggyBank->name])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) { if (intval($request->get('return_to_edit')) === 1) {

6
app/Http/Controllers/TagController.php
View File

@@ -118,7 +118,7 @@ class TagController extends Controller
$tagName = $tag->tag; $tagName = $tag->tag;
$this->repository->destroy($tag); $this->repository->destroy($tag);
Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => e($tagName)]))); Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => $tagName])));
Preferences::mark(); Preferences::mark();
return redirect($this->getPreviousUri('tags.delete.uri')); return redirect($this->getPreviousUri('tags.delete.uri'));
@@ -262,7 +262,7 @@ class TagController extends Controller
$data = $request->collectTagData(); $data = $request->collectTagData();
$this->repository->store($data); $this->repository->store($data);
Session::flash('success', strval(trans('firefly.created_tag', ['tag' => e($data['tag'])]))); Session::flash('success', strval(trans('firefly.created_tag', ['tag' => $data['tag']])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('create_another')) === 1) { if (intval($request->get('create_another')) === 1) {
@@ -288,7 +288,7 @@ class TagController extends Controller
$data = $request->collectTagData(); $data = $request->collectTagData();
$this->repository->update($tag, $data); $this->repository->update($tag, $data);
Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => e($data['tag'])]))); Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => $data['tag']])));
Preferences::mark(); Preferences::mark();
if (intval($request->get('return_to_edit')) === 1) { if (intval($request->get('return_to_edit')) === 1) {

6
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -222,7 +222,7 @@ class SingleController extends Controller
} }
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
$type = $transactionJournal->transactionTypeStr(); $type = $transactionJournal->transactionTypeStr();
Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => $transactionJournal->description])));
$this->repository->delete($transactionJournal); $this->repository->delete($transactionJournal);
@@ -355,7 +355,7 @@ class SingleController extends Controller
event(new StoredTransactionJournal($journal, $data['piggy_bank_id'])); event(new StoredTransactionJournal($journal, $data['piggy_bank_id']));
Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)]))); Session::flash('success', strval(trans('firefly.stored_journal', ['description' => $journal->description])));
Preferences::mark(); Preferences::mark();
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
@@ -408,7 +408,7 @@ class SingleController extends Controller
// update, get events by date and sort DESC // update, get events by date and sort DESC
$type = strtolower($journal->transactionTypeStr()); $type = strtolower($journal->transactionTypeStr());
Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['description'])]))); Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => $data['description']])));
Preferences::mark(); Preferences::mark();
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart

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

@@ -161,7 +161,7 @@ class SplitController extends Controller
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
$type = strtolower($journal->transactionTypeStr()); $type = strtolower($journal->transactionTypeStr());
Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['journal_description'])]))); Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => $data['journal_description']])));
Preferences::mark(); Preferences::mark();
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart

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

@@ -168,7 +168,7 @@ class TransactionController extends Controller
$events = $tasker->getPiggyBankEvents($journal); $events = $tasker->getPiggyBankEvents($journal);
$transactions = $tasker->getTransactionsOverview($journal); $transactions = $tasker->getTransactionsOverview($journal);
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"'; $subTitle = trans('firefly.' . $what) . ' "' . $journal->description . '"';
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links')); return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links'));