kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 20:22:07 +00:00
Code Issues Projects Releases Wiki Activity

Add upgrade command.

Browse Source
This commit is contained in:
James Cole
2021-05-02 06:39:18 +02:00
parent 3f4697b6c3
commit 6d466af424
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Console/Commands/Upgrade/UpgradeDatabase.php
View File

@@ -74,6 +74,7 @@ class UpgradeDatabase extends Command
'firefly-iii:migrate-recurrence-meta', 'firefly-iii:migrate-recurrence-meta',
'firefly-iii:migrate-tag-locations', 'firefly-iii:migrate-tag-locations',
'firefly-iii:migrate-recurrence-type', 'firefly-iii:migrate-recurrence-type',
'firefly-iii:upgrade-liabilities',
// there are 16 verify commands. // there are 16 verify commands.
'firefly-iii:fix-piggies', 'firefly-iii:fix-piggies',

7
app/Http/Controllers/Account/IndexController.php
View File

@@ -165,14 +165,11 @@ class IndexController extends Controller
$account->endBalance = $this->isInArray($endBalances, $account->id); $account->endBalance = $this->isInArray($endBalances, $account->id);
$account->difference = bcsub($account->endBalance, $account->startBalance); $account->difference = bcsub($account->endBalance, $account->startBalance);
$account->interest = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', ''); $account->interest = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', '');
$account->interestPeriod = (string)trans( $account->interestPeriod = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))
);
$account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type)); $account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
$account->location = $this->repository->getLocation($account); $account->location = $this->repository->getLocation($account);
$account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction'); $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
$account->current_debt = $this->repository->getMetaValue($account, 'current_debt') ?? '-'; $account->current_debt = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
} }
); );
// make paginator: // make paginator:

1
app/Http/Controllers/System/InstallController.php
View File

@@ -85,6 +85,7 @@ class InstallController extends Controller
'firefly-iii:migrate-recurrence-meta' => [], 'firefly-iii:migrate-recurrence-meta' => [],
'firefly-iii:migrate-tag-locations' => [], 'firefly-iii:migrate-tag-locations' => [],
'firefly-iii:migrate-recurrence-type' => [], 'firefly-iii:migrate-recurrence-type' => [],
'firefly-iii:upgrade-liabilities' => [],
// verify commands // verify commands
'firefly-iii:fix-piggies' => [], 'firefly-iii:fix-piggies' => [],

11
app/Models/Account.php
View File

@@ -88,7 +88,16 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @method static Builder|Account withTrashed() * @method static Builder|Account withTrashed()
* @method static Builder|Account withoutTrashed() * @method static Builder|Account withoutTrashed()
* @mixin Eloquent * @mixin Eloquent
* @property Carbon $lastActivityDate * @property Carbon $lastActivityDate
* @property string $startBalance
* @property string $endBalance
* @property string $difference
* @property string $interest
* @property string $interestPeriod
* @property string $accountTypeString
* @property string $location
* @property string $liability_direction
* @property string $current_debt
*/ */
class Account extends Model class Account extends Model
{ {

1
resources/lang/en_US/firefly.php
View File

@@ -1332,6 +1332,7 @@ return [
'liability_direction_debit' => 'I owe this debt to somebody else', 'liability_direction_debit' => 'I owe this debt to somebody else',
'liability_direction_credit_short' => 'Owed this debt', 'liability_direction_credit_short' => 'Owed this debt',
'liability_direction_debit_short' => 'Owe this debt', 'liability_direction_debit_short' => 'Owe this debt',
'liability_direction__short' => 'Unknown',
'Liability credit' => 'Liability credit', 'Liability credit' => 'Liability credit',
'budgets' => 'Budgets', 'budgets' => 'Budgets',
'tags' => 'Tags', 'tags' => 'Tags',