kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 15:18:05 +00:00
Code Issues Projects Releases Wiki Activity

Update code for reconciliation.

Browse Source
This commit is contained in:
James Cole
2017-11-22 16:54:49 +01:00
parent 4b87e5be55
commit 69bb76b6fe
10 changed files with 196 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -27,7 +27,9 @@ use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Navigation;
@@ -68,16 +70,38 @@ class ReconcileController extends Controller
*/
public function overview(Request $request, Account $account, Carbon $start, Carbon $end)
{
$startBalance = $request->get('startBalance');
$endBalance = $request->get('endBalance');
$transactions = $request->get('transactions');
$startBalance = $request->get('startBalance');
$endBalance = $request->get('endBalance');
$transactionIds = $request->get('transactions') ?? [];
$clearedIds = $request->get('cleared') ?? [];
$amount = '0';
$clearedAmount = '0';
$route = route('accounts.reconcile.submit', [$account->id, $start->format('Ymd'), $end->format('Ymd')]);
// get sum of transaction amounts:
/** @var JournalRepositoryInterface $repository */
$repository = app(JournalRepositoryInterface::class);
$transactions = $repository->getTransactionsById($transactionIds);
$cleared = $repository->getTransactionsById($clearedIds);
/** @var Transaction $transaction */
foreach ($transactions as $transaction) {
$amount = bcadd($amount, $transaction->amount);
}
/** @var Transaction $transaction */
foreach ($cleared as $transaction) {
$clearedAmount = bcadd($clearedAmount, $transaction->amount);
}
$return = [
'is_zero' => false,
'post_uri' => route('accounts.reconcile.submit', [$account->id, $start->format('Ymd'), $end->format('Ymd')]),
'post_uri' => $route,
'html' => '',
];
$return['html'] = view('accounts.reconcile.overview', compact('account', 'start', 'end'))->render();
$return['html'] = view(
'accounts.reconcile.overview',
compact('account', 'start', 'end', 'clearedIds', 'transactionIds', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route')
)->render();
return Response::json($return);
}
@@ -175,4 +199,13 @@ class ReconcileController extends Controller
return Response::json(['html' => $html]);
}
/**
* @param Account $account
* @param Carbon $start
* @param Carbon $end
*/
public function submit(Request $request, Account $account, Carbon $start, Carbon $end) {
var_dump($request->all());
}
}