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

Expand factory tests.

Browse Source
This commit is contained in:
James Cole
2018-03-01 20:54:50 +01:00
parent 5b8479f3a4
commit 06dc8a499b
25 changed files with 2384 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Services\Internal\Support;
use FireflyIII\Exceptions\FireflyException;
use Exception;
use FireflyIII\Factory\AccountFactory;
use FireflyIII\Factory\AccountMetaFactory;
use FireflyIII\Factory\TransactionFactory;
@@ -57,7 +57,6 @@ trait AccountServiceTrait
* @param Account $account
*
* @return bool
* @throws \Exception
*/
public function deleteIB(Account $account): bool
{
@@ -67,7 +66,11 @@ trait AccountServiceTrait
// opening balance data? update it!
if (null !== $openingBalance) {
Log::debug('Opening balance journal found, delete journal.');
$openingBalance->delete();
try {
$openingBalance->delete();
} catch (Exception $e) {
Log::error(sprintf('Could not delete opening balance: %s', $e->getMessage()));
}
return true;
}
@@ -126,7 +129,6 @@ trait AccountServiceTrait
* @param array $data
*
* @return TransactionJournal|null
* @throws \FireflyIII\Exceptions\FireflyException
*/
public function storeIBJournal(Account $account, array $data): ?TransactionJournal
{
@@ -233,8 +235,6 @@ trait AccountServiceTrait
* @param array $data
*
* @return bool
* @throws FireflyException
* @throws \Exception
*/
public function updateIB(Account $account, array $data): bool
{
@@ -266,8 +266,6 @@ trait AccountServiceTrait
* @param array $data
*
* @return bool
*
* @throws \Exception
*/
public function updateIBJournal(Account $account, TransactionJournal $journal, array $data): bool
{
@@ -279,7 +277,12 @@ trait AccountServiceTrait
Log::debug(sprintf('Submitted amount for opening balance to update is "%s"', $amount));
if (0 === bccomp($amount, '0')) {
Log::notice(sprintf('Amount "%s" is zero, delete opening balance.', $amount));
$journal->delete();
try {
$journal->delete();
} catch (Exception $e) {
Log::error(sprintf('Could not delete opening balance: %s', $e->getMessage()));
}
return true;
}