mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-19 19:01:58 +00:00
Mass edit #241
This commit is contained in:
@@ -7,10 +7,10 @@ use Config;
|
||||
use ExpandedForm;
|
||||
use FireflyIII\Events\TransactionJournalStored;
|
||||
use FireflyIII\Events\TransactionJournalUpdated;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
|
||||
use FireflyIII\Http\Requests\JournalFormRequest;
|
||||
use FireflyIII\Http\Requests\MassJournalRequest;
|
||||
use FireflyIII\Http\Requests\MassDeleteJournalRequest;
|
||||
use FireflyIII\Http\Requests\MassEditJournalRequest;
|
||||
use FireflyIII\Models\PiggyBank;
|
||||
use FireflyIII\Models\PiggyBankEvent;
|
||||
use FireflyIII\Models\Transaction;
|
||||
@@ -243,12 +243,12 @@ class TransactionController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* @param MassJournalRequest $request
|
||||
* @param MassDeleteJournalRequest $request
|
||||
* @param JournalRepositoryInterface $repository
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function massDestroy(MassJournalRequest $request, JournalRepositoryInterface $repository)
|
||||
public function massDestroy(MassDeleteJournalRequest $request, JournalRepositoryInterface $repository)
|
||||
{
|
||||
$ids = $request->get('confirm_mass_delete');
|
||||
$set = new Collection;
|
||||
@@ -263,14 +263,16 @@ class TransactionController extends Controller
|
||||
}
|
||||
}
|
||||
unset($journal);
|
||||
$count = 0;
|
||||
|
||||
/** @var TransactionJournal $journal */
|
||||
foreach ($set as $journal) {
|
||||
$repository->delete($journal);
|
||||
$count++;
|
||||
}
|
||||
|
||||
Preferences::mark();
|
||||
|
||||
Session::flash('success', trans('firefly.mass_deleted_transactions_success'));
|
||||
Session::flash('success', trans('firefly.mass_deleted_transactions_success', ['amount' => $count]));
|
||||
|
||||
// redirect to previous URL:
|
||||
return redirect(session('transactions.mass-delete.url'));
|
||||
@@ -282,15 +284,84 @@ class TransactionController extends Controller
|
||||
*/
|
||||
public function massEdit(Collection $journals)
|
||||
{
|
||||
throw new FireflyException('Mass editing of journals is not yet supported.');
|
||||
$subTitle = trans('firefly.mass_edit_journals');
|
||||
/** @var ARI $accountRepository */
|
||||
$accountRepository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
|
||||
$accountList = ExpandedForm::makeSelectList($accountRepository->getAccounts(['Default account', 'Asset account']));
|
||||
|
||||
// put previous url in session
|
||||
Session::put('transactions.mass-edit.url', URL::previous());
|
||||
Session::flash('gaEventCategory', 'transactions');
|
||||
Session::flash('gaEventAction', 'mass-edit');
|
||||
|
||||
return view('transactions.mass-edit', compact('journals', 'subTitle', 'accountList'));
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function massUpdate()
|
||||
public function massUpdate(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
|
||||
{
|
||||
$journalIds = Input::get('journals');
|
||||
$count = 0;
|
||||
if (is_array($journalIds)) {
|
||||
foreach ($journalIds as $journalId) {
|
||||
$journal = $repository->find(intval($journalId));
|
||||
if ($journal) {
|
||||
// do update.
|
||||
|
||||
// get optional fields:
|
||||
$what = strtolower(TransactionJournal::transactionTypeStr($journal));
|
||||
$sourceAccountId = $request->get('source_account_id')[$journal->id] ?? 0;
|
||||
$destAccountId = $request->get('destination_account_id')[$journal->id] ?? 0;
|
||||
$expenseAccount = $request->get('expense_account')[$journal->id] ?? '';
|
||||
$revenueAccount = $request->get('revenue_account')[$journal->id] ?? '';
|
||||
$budgetId = $journal->budgets->first() ? $journal->budgets->first()->id : 0;
|
||||
$category = $journal->categories->first() ? $journal->categories->first()->name : '';
|
||||
$tags = $journal->tags->pluck('tag')->toArray();
|
||||
|
||||
// for a deposit, the 'account_id' is the account the money is deposited on.
|
||||
// needs a better way of handling.
|
||||
// more uniform source/destination field names
|
||||
$accountId = $sourceAccountId;
|
||||
if ($what == 'deposit') {
|
||||
$accountId = $destAccountId;
|
||||
}
|
||||
|
||||
// build data array
|
||||
$data = [
|
||||
'id' => $journal->id,
|
||||
'what' => $what,
|
||||
'description' => $request->get('description')[$journal->id],
|
||||
'account_id' => intval($accountId),
|
||||
'account_from_id' => intval($sourceAccountId),
|
||||
'account_to_id' => intval($destAccountId),
|
||||
'expense_account' => $expenseAccount,
|
||||
'revenue_account' => $revenueAccount,
|
||||
'amount' => round($request->get('amount')[$journal->id], 4),
|
||||
'user' => Auth::user()->id,
|
||||
'amount_currency_id_amount' => intval($request->get('amount_currency_id_amount_' . $journal->id)),
|
||||
'date' => new Carbon($request->get('date')[$journal->id]),
|
||||
'interest_date' => $journal->interest_date,
|
||||
'book_date' => $journal->book_date,
|
||||
'process_date' => $journal->process_date,
|
||||
'budget_id' => $budgetId,
|
||||
'category' => $category,
|
||||
'tags' => $tags,
|
||||
|
||||
];
|
||||
// call repository update function.
|
||||
$repository->update($journal, $data);
|
||||
|
||||
$count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
Preferences::mark();
|
||||
Session::flash('success', trans('firefly.mass_edited_transactions_success', ['amount' => $count]));
|
||||
|
||||
// redirect to previous URL:
|
||||
return redirect(session('transactions.mass-edit.url'));
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user