kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Update repository for #972

Browse Source
This commit is contained in:
James Cole
2017-11-01 19:30:13 +01:00
parent d937a8c897
commit e0a0dbb6da
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,8 +221,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
protected function openingBalanceTransaction(Account $account): TransactionJournal protected function openingBalanceTransaction(Account $account): TransactionJournal
{ {
$journal = TransactionJournal::sortCorrectly() $journal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $account->id) ->where('transactions.account_id', $account->id)
->transactionTypes([TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::OPENING_BALANCE])
->first(['transaction_journals.*']); ->first(['transaction_journals.*']);
@@ -288,6 +287,8 @@ class AccountRepository implements AccountRepositoryInterface
} }
/** /**
* At this point strlen of amount > 0.
*
* @param Account $account * @param Account $account
* @param array $data * @param array $data
* *
@@ -296,6 +297,7 @@ class AccountRepository implements AccountRepositoryInterface
protected function storeInitialBalance(Account $account, array $data): TransactionJournal protected function storeInitialBalance(Account $account, array $data): TransactionJournal
{ {
$amount = strval($data['openingBalance']); $amount = strval($data['openingBalance']);
Log::debug(sprintf('Submitted amount is %s',$amount));
if (bccomp($amount, '0') === 0) { if (bccomp($amount, '0') === 0) {
return new TransactionJournal; return new TransactionJournal;
@@ -322,12 +324,15 @@ class AccountRepository implements AccountRepositoryInterface
$secondAccount = $opposing; $secondAccount = $opposing;
$firstAmount = $amount; $firstAmount = $amount;
$secondAmount = bcmul($amount, '-1'); $secondAmount = bcmul($amount, '-1');
Log::debug(sprintf('First amount is %s, second amount is %s', $firstAmount, $secondAmount));
if ($data['openingBalance'] < 0) { if (bccomp($amount,'0') === -1) {
Log::debug(sprintf('%s is a negative number.', $amount));
$firstAccount = $opposing; $firstAccount = $opposing;
$secondAccount = $account; $secondAccount = $account;
$firstAmount = bcmul($amount, '-1'); $firstAmount = bcmul($amount, '-1');
$secondAmount = $amount; $secondAmount = $amount;
Log::debug(sprintf('First amount is %s, second amount is %s', $firstAmount, $secondAmount));
} }
$one = new Transaction( $one = new Transaction(
@@ -374,6 +379,7 @@ class AccountRepository implements AccountRepositoryInterface
} }
/** /**
*
* @param Account $account * @param Account $account
* @param array $data * @param array $data
* *
@@ -381,6 +387,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
protected function updateInitialBalance(Account $account, array $data): bool protected function updateInitialBalance(Account $account, array $data): bool
{ {
Log::debug(sprintf('updateInitialBalance() for account #%d', $account->id));
$openingBalance = $this->openingBalanceTransaction($account); $openingBalance = $this->openingBalanceTransaction($account);
// no opening balance journal? create it: // no opening balance journal? create it:
@@ -457,6 +464,8 @@ class AccountRepository implements AccountRepositoryInterface
$amount = strval($data['openingBalance']); $amount = strval($data['openingBalance']);
$currencyId = intval($data['currency_id']); $currencyId = intval($data['currency_id']);
Log::debug(sprintf('Submitted amount for opening balance to update is %s', $amount));
if (bccomp($amount, '0') === 0) { if (bccomp($amount, '0') === 0) {
$journal->delete(); $journal->delete();
@@ -471,12 +480,15 @@ class AccountRepository implements AccountRepositoryInterface
/** @var Transaction $transaction */ /** @var Transaction $transaction */
foreach ($journal->transactions()->get() as $transaction) { foreach ($journal->transactions()->get() as $transaction) {
if ($account->id === $transaction->account_id) { if ($account->id === $transaction->account_id) {
Log::debug(sprintf('Will change transaction #%d amount from %s to %s', $transaction->id, $transaction->amount, $amount));
$transaction->amount = $amount; $transaction->amount = $amount;
$transaction->transaction_currency_id = $currencyId; $transaction->transaction_currency_id = $currencyId;
$transaction->save(); $transaction->save();
} }
if ($account->id !== $transaction->account_id) { if ($account->id !== $transaction->account_id) {
$transaction->amount = bcmul($amount, '-1'); $negativeAmount = bcmul($amount, '-1');
Log::debug(sprintf('Will change transaction #%d amount from %s to %s', $transaction->id, $transaction->amount, $negativeAmount));
$transaction->amount = $negativeAmount;
$transaction->transaction_currency_id = $currencyId; $transaction->transaction_currency_id = $currencyId;
$transaction->save(); $transaction->save();
} }
@@ -495,7 +507,9 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
protected function validOpeningBalanceData(array $data): bool protected function validOpeningBalanceData(array $data): bool
{ {
if (isset($data['openingBalance']) && isset($data['openingBalanceDate'])) { $data['openingBalance'] = strval($data['openingBalance']);
if (isset($data['openingBalance']) && !is_null($data['openingBalance']) && strlen($data['openingBalance']) > 0 &&
isset($data['openingBalanceDate'])) {
Log::debug('Array has valid opening balance data.'); Log::debug('Array has valid opening balance data.');
return true; return true;