IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some code for #1272

Browse Source
This commit is contained in:
James Cole
2018-04-24 19:26:16 +02:00
parent 798d9ee876
commit f78b8f9267
28 changed files with 172 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Transaction/SplitController.php
View File

@@ -42,7 +42,6 @@ use FireflyIII\Transformers\TransactionTransformer;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Preferences;
use Session;
use Steam;
use Symfony\Component\HttpFoundation\ParameterBag;
use View;
@@ -143,7 +142,7 @@ class SplitController extends Controller
if ($this->isOpeningBalance($journal)) {
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
$data = $request->getAll();
$data = $request->getAll();
// keep current bill:
$data['bill_id'] = $journal->bill_id;
@@ -221,7 +220,7 @@ class SplitController extends Controller
$array['transactions'] = $this->updateWithPrevious($array['transactions'], $request->old());
// update journal amount and foreign amount:
$array['journal_amount'] = array_sum(array_column($array['transactions'], 'amount'));
$array['journal_amount'] = array_sum(array_column($array['transactions'], 'amount'));
$array['journal_foreign_amount'] = array_sum(array_column($array['transactions'], 'foreign_amount'));
return $array;