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

This is a fix for #487

Browse Source
This commit is contained in:
James Cole 2016-12-21 20:31:44 +01:00
parent 3250c4830d
commit 6fc971c4cb
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/AccountController.php
View File

@ -243,12 +243,12 @@ class AccountController extends Controller
$subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
$subTitle = $account->name; $subTitle = $account->name;
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;
$start = session('start', Navigation::startOfPeriod(new Carbon, $range));
$end = session('end', Navigation::endOfPeriod(new Carbon, $range));
$page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$chartUri = route('chart.account.single', [$account->id]);
$start = session('start', Navigation::startOfPeriod(new Carbon, $range));
$end = session('end', Navigation::endOfPeriod(new Carbon, $range));
$page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$chartUri = route('chart.account.single', [$account->id]);
// grab those journals: // grab those journals:
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();

9
app/Repositories/Account/AccountRepository.php
View File

@ -438,7 +438,7 @@ class AccountRepository implements AccountRepositoryInterface
{ {
$amount = $data['openingBalance']; $amount = $data['openingBalance'];
$name = $data['name']; $name = $data['name'];
$opposing = $this->storeOpposingAccount($amount, $name); $opposing = $this->storeOpposingAccount($name);
$transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
$journal = TransactionJournal::create( $journal = TransactionJournal::create(
[ [
@ -481,17 +481,16 @@ class AccountRepository implements AccountRepositoryInterface
* *
* @return Account * @return Account
*/ */
protected function storeOpposingAccount(float $amount, string $name): Account protected function storeOpposingAccount(string $name): Account
{ {
$type = $amount < 0 ? 'expense' : 'revenue';
$opposingData = [ $opposingData = [
'accountType' => $type, 'accountType' => 'initial',
'name' => $name . ' initial balance', 'name' => $name . ' initial balance',
'active' => false, 'active' => false,
'iban' => '', 'iban' => '',
'virtualBalance' => 0, 'virtualBalance' => 0,
]; ];
Log::debug('Going to create an opening balance opposing account'); Log::debug('Going to create an opening balance opposing account.');
return $this->storeAccount($opposingData); return $this->storeAccount($opposingData);
} }