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

Update views and routes for #1078

Browse Source
This commit is contained in:
James Cole
2017-12-30 14:25:11 +01:00
parent 73051d7d42
commit 3fba741f1b
11 changed files with 153 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -26,12 +26,14 @@ namespace FireflyIII\Http\Controllers\Transaction;
use ExpandedForm;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassEditBulkJournalRequest;
use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Session;
use View;
@@ -65,7 +67,7 @@ class BulkController extends Controller
*
* @return View
*/
public function edit(Collection $journals)
public function edit(Request $request, Collection $journals)
{
$subTitle = trans('firefly.mass_bulk_journals');
@@ -101,11 +103,11 @@ class BulkController extends Controller
}
if (count($messages) > 0) {
Session::flash('info', $messages);
$request->session()->flash('info', $messages);
}
// put previous url in session
$this->rememberPreviousUri('transactions.mass-edit-bulk.uri');
$this->rememberPreviousUri('transactions.bulk-edit.uri');
// get list of budgets:
/** @var BudgetRepositoryInterface $repository */
@@ -119,33 +121,58 @@ class BulkController extends Controller
);
if (0 === $filtered->count()) {
Session::flash('error', trans('firefly.no_edit_multiple_left'));
$request->session()->flash('error', trans('firefly.no_edit_multiple_left'));
}
$journals = $filtered;
return view('transactions.bulk.edit', compact('journals', 'subTitle','budgetList'));
return view('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
}
/**
* @param MassEditBulkJournalRequest $request
* @param BulkEditJournalRequest $request
* @param JournalRepositoryInterface $repository
*
* @return mixed
*/
public function updateBulk(MassEditBulkJournalRequest $request, JournalRepositoryInterface $repository)
public function update(BulkEditJournalRequest $request, JournalRepositoryInterface $repository)
{
$journalIds = $request->get('journals');
$count = 0;
$journalIds = $request->get('journals');
$ignoreCategory = intval($request->get('ignore_category')) === 1;
$ignoreBudget = intval($request->get('ignore_budget')) === 1;
$ignoreTags = intval($request->get('ignore_tags')) === 1;
$count = 0;
if (is_array($journalIds)) {
$count = $repository->updateBulk($journalIds, $request->get('category'), $request->get('tags'));
foreach ($journalIds as $journalId) {
$journal = $repository->find(intval($journalId));
if (!is_null($journal)) {
$count++;
Log::debug(sprintf('Found journal #%d', $journal->id));
// update category if not told to ignore
if ($ignoreCategory === false) {
Log::debug(sprintf('Set category to %s', $request->string('category')));
$repository->updateCategory($journal, $request->string('category'));
}
// update budget if not told to ignore (and is withdrawal)
if ($ignoreBudget === false) {
Log::debug(sprintf('Set budget to %d', $request->integer('budget_id')));
$repository->updateBudget($journal, $request->integer('budget_id'));
}
if ($ignoreTags === false) {
Log::debug(sprintf('Set tags to %s', $request->string('budget_id')));
$repository->updateTags($journal, explode(',', $request->string('tags')));
}
// update tags if not told to ignore (and is withdrawal)
}
}
}
Preferences::mark();
Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
$request->session()->flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-edit-bulk.uri'));
return redirect($this->getPreviousUri('transactions.bulk-edit.uri'));
}
}

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

@@ -214,7 +214,7 @@ class MassController extends Controller
if (is_array($journalIds)) {
foreach ($journalIds as $journalId) {
$journal = $repository->find(intval($journalId));
if ($journal) {
if (!is_null($journal)) {
// get optional fields:
$what = strtolower($journal->transactionTypeStr());
$sourceAccountId = $request->get('source_account_id')[$journal->id] ?? 0;

10
app/Http/Requests/MassEditBulkJournalRequest.php → app/Http/Requests/BulkEditJournalRequest.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* MassEditJournalRequest.php
* BulkEditJournalRequest.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
@@ -25,7 +25,7 @@ namespace FireflyIII\Http\Requests;
/**
* Class MassEditBulkJournalRequest.
*/
class MassEditBulkJournalRequest extends Request
class BulkEditJournalRequest extends Request
{
/**
* @return bool
@@ -41,8 +41,10 @@ class MassEditBulkJournalRequest extends Request
*/
public function rules()
{
// fixed
return [];
// fixed
return [
'journals.*' => 'required|belongsToUser:transaction_journals,id',
];
}
}

2
app/Http/Requests/Request.php
View File

@@ -143,7 +143,7 @@ class Request extends FormRequest
*
* @return int
*/
protected function integer(string $field): int
public function integer(string $field): int
{
return intval($this->get($field));
}

107
app/Repositories/Journal/JournalRepository.php
View File

@@ -22,14 +22,15 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\Journal;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Category;
use FireflyIII\Models\Note;
use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\User;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
@@ -435,44 +436,40 @@ class JournalRepository implements JournalRepositoryInterface
}
/**
* @param array $journals
* @param var $category
* @param var $tags
* @param TransactionJournal $journal
* @param int $budgetId
*
* @return int
* @return TransactionJournal
*/
public function updateBulk(array $journals, $category, $tags): int
public function updateBudget(TransactionJournal $journal, int $budgetId): TransactionJournal
{
$count = 0;
foreach ($journals as $journalId) {
$journal = $this->find(intval($journalId));
if ($journal) {
// update category:
if (isset($category)) {
$categoryToReplace = Category::firstOrCreateEncrypted(['name' => strval($category), 'user_id' => $journal->user->id]);
$journal->categories()->sync([$categoryToReplace->id]);
/** @var Transaction $transaction */
foreach ($journal->transactions()->getResults() as $transaction) {
$transaction->categories()->sync([$categoryToReplace->id]);
$transaction->touch();
}
}
if ($budgetId === 0) {
$journal->budgets()->detach();
$journal->save();
// update tags:
if (isset($tags)) {
$tagsToReplace = [];
foreach (explode(',', strval($tags)) as $tag) {
array_push($tagsToReplace, Tag::firstOrCreateEncrypted(['tag' => $tag, 'user_id' => $journal->user->id])->id);
}
$journal->tags()->sync($tagsToReplace);
}
$journal->touch();
++$count;
}
return $journal;
}
$this->storeBudgetWithJournal($journal, $budgetId);
return $count;
return $journal;
}
/**
* @param TransactionJournal $journal
* @param string $category
*
* @return TransactionJournal
*/
public function updateCategory(TransactionJournal $journal, string $category): TransactionJournal
{
Log::debug(sprintf('In updateCategory("%s")', $category));
$journal->categories()->detach();
if (strlen($category) === 0) {
return $journal;
}
$this->storeCategoryWithJournal($journal, $category);
return $journal;
}
/**
@@ -535,4 +532,48 @@ class JournalRepository implements JournalRepositoryInterface
return $journal;
}
/**
* Update tags.
*
* @param TransactionJournal $journal
* @param array $array
*
* @return bool
*/
public function updateTags(TransactionJournal $journal, array $array): bool
{
// create tag repository
/** @var TagRepositoryInterface $tagRepository */
$tagRepository = app(TagRepositoryInterface::class);
// find or create all tags:
$tags = [];
$ids = [];
foreach ($array as $name) {
if (strlen(trim($name)) > 0) {
$tag = Tag::firstOrCreateEncrypted(['tag' => $name, 'user_id' => $journal->user_id]);
$tags[] = $tag;
$ids[] = $tag->id;
}
}
// delete all tags connected to journal not in this array:
if (count($ids) > 0) {
DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->whereNotIn('tag_id', $ids)->delete();
}
// if count is zero, delete them all:
if (0 === count($ids)) {
DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->delete();
}
// connect each tag to journal (if not yet connected):
/** @var Tag $tag */
foreach ($tags as $tag) {
Log::debug(sprintf('Will try to connect tag #%d to journal #%d.', $tag->id, $journal->id));
$tagRepository->connect($journal, $tag);
}
return true;
}
}

25
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -161,13 +161,20 @@ interface JournalRepositoryInterface
public function update(TransactionJournal $journal, array $data): TransactionJournal;
/**
* @param array $journals
* @param var $category
* @param var $tags
* @param TransactionJournal $journal
* @param int $budgetId
*
* @return int
* @return TransactionJournal
*/
public function updateBulk(array $journals, $category, $tags): int;
public function updateBudget(TransactionJournal $journal, int $budgetId): TransactionJournal;
/**
* @param TransactionJournal $journal
* @param string $category
*
* @return TransactionJournal
*/
public function updateCategory(TransactionJournal $journal, string $category): TransactionJournal;
/**
* @param TransactionJournal $journal
@@ -176,4 +183,12 @@ interface JournalRepositoryInterface
* @return TransactionJournal
*/
public function updateSplitJournal(TransactionJournal $journal, array $data): TransactionJournal;
/**
* @param TransactionJournal $journal
* @param array $tags
*
* @return bool
*/
public function updateTags(TransactionJournal $journal, array $tags): bool;
}

2
app/Repositories/Journal/SupportJournalsTrait.php
View File

@@ -100,6 +100,7 @@ trait SupportJournalsTrait
$budget = Budget::find($budgetId);
$journal->budgets()->save($budget);
}
$journal->touch();
}
/**
@@ -112,6 +113,7 @@ trait SupportJournalsTrait
$category = Category::firstOrCreateEncrypted(['name' => $category, 'user_id' => $journal->user_id]);
$journal->categories()->save($category);
}
$journal->touch();
}
/**

43
app/Repositories/Journal/UpdateJournalsTrait.php
View File

@@ -37,6 +37,7 @@ use Log;
*/
trait UpdateJournalsTrait
{
/**
* When the user edits a split journal, each line is missing crucial data:.
*
@@ -121,47 +122,5 @@ trait UpdateJournalsTrait
$transaction->save();
}
/**
* Update tags.
*
* @param TransactionJournal $journal
* @param array $array
*
* @return bool
*/
protected function updateTags(TransactionJournal $journal, array $array): bool
{
// create tag repository
/** @var TagRepositoryInterface $tagRepository */
$tagRepository = app(TagRepositoryInterface::class);
// find or create all tags:
$tags = [];
$ids = [];
foreach ($array as $name) {
if (strlen(trim($name)) > 0) {
$tag = Tag::firstOrCreateEncrypted(['tag' => $name, 'user_id' => $journal->user_id]);
$tags[] = $tag;
$ids[] = $tag->id;
}
}
// delete all tags connected to journal not in this array:
if (count($ids) > 0) {
DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->whereNotIn('tag_id', $ids)->delete();
}
// if count is zero, delete them all:
if (0 === count($ids)) {
DB::table('tag_transaction_journal')->where('transaction_journal_id', $journal->id)->delete();
}
// connect each tag to journal (if not yet connected):
/** @var Tag $tag */
foreach ($tags as $tag) {
Log::debug(sprintf('Will try to connect tag #%d to journal #%d.', $tag->id, $journal->id));
$tagRepository->connect($journal, $tag);
}
return true;
}
}