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

Add budget list, expand view. #1078

Browse Source
This commit is contained in:
James Cole
2017-12-30 13:05:19 +01:00
parent 717e101b80
commit 73051d7d42
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,10 +24,12 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use ExpandedForm;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassEditBulkJournalRequest;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Support\Collection;
use Preferences;
@@ -65,8 +67,8 @@ class BulkController extends Controller
*/
public function edit(Collection $journals)
{
$subTitle = trans('firefly.mass_bulk_journals');
$subTitle = trans('firefly.mass_bulk_journals');
// skip transactions that have multiple destinations, multiple sources or are an opening balance.
$filtered = new Collection;
@@ -104,9 +106,11 @@ class BulkController extends Controller
// put previous url in session
$this->rememberPreviousUri('transactions.mass-edit-bulk.uri');
Session::flash('gaEventCategory', 'transactions');
Session::flash('gaEventAction', 'mass-edit-bulk');
// get list of budgets:
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
$budgetList = ExpandedForm::makeSelectListWithEmpty($repository->getActiveBudgets());
// collect some useful meta data for the mass edit:
$filtered->each(
function (TransactionJournal $journal) {
@@ -120,7 +124,7 @@ class BulkController extends Controller
$journals = $filtered;
return view('transactions.bulk.edit', compact('journals', 'subTitle'));
return view('transactions.bulk.edit', compact('journals', 'subTitle','budgetList'));
}

29
resources/views/transactions/bulk/edit.twig
View File

@@ -79,21 +79,48 @@
<td>
<input class="form-control" placeholder="" name="category" type="text" value="">
</td>
<td>
<div class="checkbox">
<label>
<input name="ignore_category" type="checkbox" value="1">
{{ 'no_bulk_category'|_ }}
</label>
</div>
</td>
</tr>
<tr>
<th>{{ trans('list.budget') }}</th>
<td>
<select class="form-control" name="budget_id">
<option value="0">(none)</option>
{% for id, budget in budgetList %}
<option value="{{ id }}" label="{{ budget }}">{{ budget }}</option>
{% endfor %}
</select>
</td>
<td>
<div class="checkbox">
<label>
<input name="ignore_budget" type="checkbox" value="1">
{{ 'no_bulk_budget'|_ }}
</label>
</div>
</td>
</tr>
<tr>
<th>{{ trans('list.tags') }}</th>
<td>
<input class="form-control" placeholder="" name="tags" type="text" value="">
</td>
<td>
<div class="checkbox">
<label>
<input name="ignore_tags" type="checkbox" value="1">
{{ 'no_bulk_tags'|_ }}
</label>
</div>
</td>
</tr>
</table>
</div>
</div>