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

Was not able to remove opening balance.

Browse Source
This commit is contained in:
James Cole
2017-06-02 13:00:24 +02:00
parent c05f344371
commit 74664afa68
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,7 +466,12 @@ class AccountRepository implements AccountRepositoryInterface
*/
protected function storeInitialBalance(Account $account, array $data): TransactionJournal
{
$amount = $data['openingBalance'];
$amount = strval($data['openingBalance']);
if (bccomp($amount, '0') === 0) {
return new TransactionJournal;
}
$name = $data['name'];
$currencyId = $data['currency_id'];
$opposing = $this->storeOpposingAccount($name);
@@ -487,12 +492,12 @@ class AccountRepository implements AccountRepositoryInterface
$firstAccount = $account;
$secondAccount = $opposing;
$firstAmount = $amount;
$secondAmount = $amount * -1;
$secondAmount = bcmul($amount, '-1');
if ($data['openingBalance'] < 0) {
$firstAccount = $opposing;
$secondAccount = $account;
$firstAmount = $amount * -1;
$firstAmount = bcmul($amount, '-1');
$secondAmount = $amount;
}
@@ -606,9 +611,15 @@ class AccountRepository implements AccountRepositoryInterface
protected function updateOpeningBalanceJournal(Account $account, TransactionJournal $journal, array $data): bool
{
$date = $data['openingBalanceDate'];
$amount = $data['openingBalance'];
$amount = strval($data['openingBalance']);
$currencyId = intval($data['currency_id']);
if (bccomp($amount, '0') === 0) {
$journal->delete();
return true;
}
// update date:
$journal->date = $date;
$journal->transaction_currency_id = $currencyId;
@@ -621,7 +632,7 @@ class AccountRepository implements AccountRepositoryInterface
$transaction->save();
}
if ($account->id != $transaction->account_id) {
$transaction->amount = $amount * -1;
$transaction->amount = bcmul($amount, '-1');
$transaction->save();
}
}
@@ -631,6 +642,7 @@ class AccountRepository implements AccountRepositoryInterface
}
/**
* @param array $data
*
@@ -638,9 +650,7 @@ class AccountRepository implements AccountRepositoryInterface
*/
protected function validOpeningBalanceData(array $data): bool
{
if (isset($data['openingBalance']) && isset($data['openingBalanceDate'])
&& bccomp(strval($data['openingBalance']), '0') !== 0
) {
if (isset($data['openingBalance']) && isset($data['openingBalanceDate'])) {
Log::debug('Array has valid opening balance data.');
return true;