diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index ce2ac3c304..8d981d79de 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -192,7 +192,7 @@ class MassController extends Controller $destAccountName = $request->get('destination_account_name')[$journal->id] ?? ''; $budgetId = $journal->budgets->first() ? $journal->budgets->first()->id : 0; - $category = $journal->categories->first() ? $journal->categories->first()->name : ''; + $category = $request->get('category')[$journal->id]; $tags = $journal->tags->pluck('tag')->toArray(); // build data array diff --git a/public/js/ff/transactions/create-edit.js b/public/js/ff/transactions/create-edit.js index 2561dbe90d..8a83c9968d 100644 --- a/public/js/ff/transactions/create-edit.js +++ b/public/js/ff/transactions/create-edit.js @@ -81,9 +81,13 @@ $(document).ready(function () { } // also for multi input: - if ($('input[name="category[]"]').length > 0) { + if ($('input[name^="category["]').length > 0) { $.getJSON('json/categories').done(function (data) { - $('input[name="category[]"]').typeahead({source: data}); + $('input[name^="category["]').typeahead({source: data}); }); } + + + + }); \ No newline at end of file diff --git a/resources/views/transactions/mass-edit.twig b/resources/views/transactions/mass-edit.twig index 7ad49060f9..59260f2603 100644 --- a/resources/views/transactions/mass-edit.twig +++ b/resources/views/transactions/mass-edit.twig @@ -20,12 +20,14 @@

- - - - - - + + + + + + + + {% for journal in journals %} {% if journal.transaction_count == 2 %} @@ -76,7 +78,10 @@ {{ Form.input('text', 'destination_account_name['~journal.id~']', journal.destination_account_name, {'class': 'form-control', 'placeholder': trans('form.expense_account')}) }} {% endif %} - + + + {% endif %}
 {{ trans('list.description') }}{{ trans('list.amount') }}{{ trans('list.date') }}{{ trans('list.from') }}{{ trans('list.to') }}
 {{ trans('list.description') }}{{ trans('list.amount') }}{{ trans('list.date') }}{{ trans('list.from') }}{{ trans('list.to') }}{{ trans('list.category') }}
+ {{ Form.input('text', 'category['~journal.id~']', journal.categories[0].name, {'class': 'form-control', 'placeholder': trans('form.category')}) }}