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

Fix #1425

Browse Source
This commit is contained in:
James Cole
2018-05-29 07:25:04 +02:00
parent 5b4967acb9
commit 3de36901b8
9 changed files with 146 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Transaction;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Helpers\Filter\NegativeAmountFilter;
use FireflyIII\Helpers\Filter\TransactionViewFilter;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\MassDeleteJournalRequest;
use FireflyIII\Http\Requests\MassEditJournalRequest;
@@ -145,22 +146,24 @@ class MassController extends Controller
$collector->setUser(auth()->user());
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$collector->setJournals($journals);
$collector->addFilter(NegativeAmountFilter::class);
$transactions = $collector->getJournals();
$collector->addFilter(TransactionViewFilter::class);
$collection = $collector->getJournals();
// add some filters:
// transform to array
$journals = $transactions->map(
$transactions = $collection->map(
function (Transaction $transaction) use ($transformer) {
$result = $transformer->transform($transaction);
return $result;
$transaction= $transformer->transform($transaction);
// make sure amount is positive:
$transaction['amount'] = app('steam')->positive((string)$transaction['amount']);
$transaction['foreign_amount'] = app('steam')->positive((string)$transaction['foreign_amount']);
return $transaction;
}
);
return view('transactions.mass.edit', compact('journals', 'subTitle', 'accounts', 'budgets'));
return view('transactions.mass.edit', compact('transactions', 'subTitle', 'accounts', 'budgets'));
}
/**