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

A fairly primitive data validation routine for split transactions.

Browse Source
This commit is contained in:
James Cole
2016-12-04 17:13:37 +01:00
parent 86ea9db37e
commit 89e4c3de25
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,21 @@ class SplitController extends Controller
return $this->redirectToAccount($journal); return $this->redirectToAccount($journal);
} }
$data = $this->arrayFromInput($request); $data = $this->arrayFromInput($request);
// need to do some validation!
// sum of amount must be > 0
// TODO move to proper validator
$sum = '0';
foreach ($data['transactions'] as $transaction) {
Session::flash('error',strval(trans('validation.amount_zero')));
$sum = bcadd($sum, strval($transaction['amount']));
}
if (bccomp($sum, '0') === 0) {
return redirect(route('transactions.edit-split', [$journal->id]))->withInput();
}
$journal = $repository->updateSplitJournal($journal, $data); $journal = $repository->updateSplitJournal($journal, $data);
// save attachments: // save attachments:
@@ -249,8 +263,8 @@ class SplitController extends Controller
$transactions = $this->tasker->getTransactionsOverview($journal); $transactions = $this->tasker->getTransactionsOverview($journal);
$return = []; $return = [];
/** @var array $transaction */ /** @var array $transaction */
foreach ($transactions as $transaction) { foreach ($transactions as $index => $transaction) {
$return[] = [ $set = [
'description' => $transaction['description'], 'description' => $transaction['description'],
'source_account_id' => $transaction['source_account_id'], 'source_account_id' => $transaction['source_account_id'],
'source_account_name' => $transaction['source_account_name'], 'source_account_name' => $transaction['source_account_name'],
@@ -260,6 +274,15 @@ class SplitController extends Controller
'budget_id' => isset($transaction['budget_id']) ? intval($transaction['budget_id']) : 0, 'budget_id' => isset($transaction['budget_id']) ? intval($transaction['budget_id']) : 0,
'category' => $transaction['category'], 'category' => $transaction['category'],
]; ];
// set initial category and/or budget:
if (count($transactions) === 1 && $index === 0) {
$set['budget_id'] = TransactionJournal::budgetId($journal);
$set['category'] = TransactionJournal::categoryAsString($journal);
}
$return[] = $set;
} }
return $return; return $return;