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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2018-03-02 16:31:02 +01:00
parent 91909a70d7
commit 139c2284b8
11 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ use FireflyIII\Models\Note;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use FireflyIII\User;
use Log;
use Validator;
@@ -66,11 +67,9 @@ trait AccountServiceTrait
// opening balance data? update it!
if (null !== $openingBalance) {
Log::debug('Opening balance journal found, delete journal.');
try {
$openingBalance->delete();
} catch (Exception $e) {
Log::error(sprintf('Could not delete opening balance: %s', $e->getMessage()));
}
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
$service->destroy($openingBalance);
return true;
}
@@ -277,11 +276,9 @@ 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));
try {
$journal->delete();
} catch (Exception $e) {
Log::error(sprintf('Could not delete opening balance: %s', $e->getMessage()));
}
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
$service->destroy($journal);
return true;