kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-19 04:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Mass edit #241

Browse Source
This commit is contained in:
James Cole
2016-04-24 07:18:39 +02:00
parent 8883d185fe
commit b8e1944d20
12 changed files with 298 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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'));
}

6
app/Http/Requests/MassJournalRequest.php → app/Http/Requests/MassDeleteJournalRequest.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* MassJournalRequest.php
* MassDeleteJournalRequest.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms
@@ -21,12 +21,12 @@ namespace FireflyIII\Http\Requests;
use Auth;
/**
* Class MassJournalRequest
* Class MassDeleteJournalRequest
*
*
* @package FireflyIII\Http\Requests
*/
class MassJournalRequest extends Request
class MassDeleteJournalRequest extends Request
{
/**
* @return bool

53
app/Http/Requests/MassEditJournalRequest.php Normal file
View File

@@ -0,0 +1,53 @@
<?php
/**
* MassEditJournalRequest.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
declare(strict_types = 1);
/**
* MassJournalRequest.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms
* of the MIT license. See the LICENSE file for details.
*/
namespace FireflyIII\Http\Requests;
use Auth;
/**
* Class MassEditJournalRequest
*
*
* @package FireflyIII\Http\Requests
*/
class MassEditJournalRequest extends Request
{
/**
* @return bool
*/
public function authorize()
{
// Only allow logged in users
return Auth::check();
}
/**
* @return array
*/
public function rules()
{
return [
'description.*' => 'required|min:1,max:255',
'source_account_id.*' => 'numeric|belongsToUser:accounts,id',
'destination_account_id.*' => 'numeric|belongsToUser:accounts,id',
'revenue_account' => 'max:255',
'expense_account' => 'max:255',
];
}
}

2
app/Http/routes.php
View File

@@ -380,7 +380,7 @@ Route::group(
// mass edit and mass delete.
Route::get('/transactions/mass-edit/{journalList}', ['uses' => 'TransactionController@massEdit', 'as' => 'transactions.mass-edit']);
Route::get('/transactions/mass-delete/{journalList}', ['uses' => 'TransactionController@massDelete', 'as' => 'transactions.mass-delete']);
Route::post('/transactions/mass-update/{journalList}', ['uses' => 'TransactionController@massUpdate', 'as' => 'transactions.mass-update']);
Route::post('/transactions/mass-update', ['uses' => 'TransactionController@massUpdate', 'as' => 'transactions.mass-update']);
Route::post('/transactions/mass-destroy', ['uses' => 'TransactionController@massDestroy', 'as' => 'transactions.mass-destroy']);
/**

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

@@ -407,15 +407,17 @@ class JournalRepository implements JournalRepositoryInterface
$fromAccount = Account::find($data['account_from_id']);
$toAccount = Account::find($data['account_to_id']);
break;
default:
throw new FireflyException('Did not recognise transaction type.');
}
if (is_null($toAccount)) {
Log::error('"to"-account is null, so we cannot continue!');
Log::error('"to"-account is null, so we cannot continue!', ['data' => $data]);
throw new FireflyException('"to"-account is null, so we cannot continue!');
}
if (is_null($fromAccount)) {
Log::error('"from"-account is null, so we cannot continue!');
Log::error('"from"-account is null, so we cannot continue!', ['data' => $data]);
throw new FireflyException('"from"-account is null, so we cannot continue!');
}

26
app/Support/ExpandedForm.php
View File

@@ -20,6 +20,31 @@ use Session;
class ExpandedForm
{
/**
* @param $name
* @param null $value
* @param array $options
*
* @return string
*/
public function amountSmall(string $name, $value = null, array $options = []): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
$options['step'] = 'any';
$options['min'] = '0.01';
$defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
$currencies = Amt::getAllCurrencies();
unset($options['currency']);
unset($options['placeholder']);
$html = view('form.amount-small', compact('defaultCurrency', 'currencies', 'classes', 'name', 'value', 'options'))->render();
return $html;
}
/**
* @param $name
* @param null $value
@@ -261,6 +286,7 @@ class ExpandedForm
return $html;
}
/**
* @param $name