mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-18 18:44:16 +00:00
Remove ability to see balance.
This commit is contained in:
@@ -27,7 +27,6 @@ namespace FireflyIII\Support\Form;
|
|||||||
use FireflyIII\Models\Account;
|
use FireflyIII\Models\Account;
|
||||||
use FireflyIII\Models\AccountType;
|
use FireflyIII\Models\AccountType;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use Log;
|
use Log;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
|
||||||
@@ -50,20 +49,10 @@ class AccountForm
|
|||||||
}
|
}
|
||||||
$accountList = $repository->getActiveAccountsByType($types);
|
$accountList = $repository->getActiveAccountsByType($types);
|
||||||
$liabilityTypes = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN,];
|
$liabilityTypes = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN,];
|
||||||
$balanceTypes = [AccountType::ASSET, AccountType::DEFAULT, AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN,];
|
|
||||||
$defaultCurrency = app('amount')->getDefaultCurrency();
|
|
||||||
$grouped = [];
|
$grouped = [];
|
||||||
|
|
||||||
/** @var Account $account */
|
/** @var Account $account */
|
||||||
foreach ($accountList as $account) {
|
foreach ($accountList as $account) {
|
||||||
$accountWithBalance = $account->name;
|
|
||||||
|
|
||||||
if (in_array($account->accountType->type, $balanceTypes, true)) {
|
|
||||||
$balance = app('steam')->balance($account);
|
|
||||||
$currency = $repository->getAccountCurrency($account) ?? $defaultCurrency;
|
|
||||||
$formatted = app('amount')->formatAnything($currency, $balance, false);
|
|
||||||
$accountWithBalance = sprintf('%s (%s)', $account->name, $formatted);
|
|
||||||
}
|
|
||||||
$role = (string)$repository->getMetaValue($account, 'account_role');
|
$role = (string)$repository->getMetaValue($account, 'account_role');
|
||||||
if (in_array($account->accountType->type, $liabilityTypes, true)) {
|
if (in_array($account->accountType->type, $liabilityTypes, true)) {
|
||||||
$role = sprintf('l_%s', $account->accountType->type);
|
$role = sprintf('l_%s', $account->accountType->type);
|
||||||
@@ -76,8 +65,8 @@ class AccountForm
|
|||||||
$role = 'no_account_type';
|
$role = 'no_account_type';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$key = (string)trans(sprintf('firefly.opt_group_%s', $role));
|
$key = (string) trans(sprintf('firefly.opt_group_%s', $role));
|
||||||
$grouped[$key][$account->id] = $accountWithBalance;
|
$grouped[$key][$account->id] = $account->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $grouped;
|
return $grouped;
|
||||||
@@ -154,7 +143,6 @@ class AccountForm
|
|||||||
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::REVENUE,];
|
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::REVENUE,];
|
||||||
$repository = $this->getAccountRepository();
|
$repository = $this->getAccountRepository();
|
||||||
$grouped = $this->getAccountsGrouped($types, $repository);
|
$grouped = $this->getAccountsGrouped($types, $repository);
|
||||||
|
|
||||||
$cash = $repository->getCashAccount();
|
$cash = $repository->getCashAccount();
|
||||||
$key = (string)trans('firefly.cash_account_type');
|
$key = (string)trans('firefly.cash_account_type');
|
||||||
$grouped[$key][$cash->id] = sprintf('(%s)', (string)trans('firefly.cash'));
|
$grouped[$key][$cash->id] = sprintf('(%s)', (string)trans('firefly.cash'));
|
||||||
|
@@ -47,7 +47,7 @@ class Steam
|
|||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function balance(Account $account, Carbon $date = null, ?TransactionCurrency $currency = null): string
|
public function balance(Account $account, Carbon $date, ?TransactionCurrency $currency = null): string
|
||||||
{
|
{
|
||||||
if ('testing' === config('app.env')) {
|
if ('testing' === config('app.env')) {
|
||||||
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
||||||
@@ -60,9 +60,6 @@ class Steam
|
|||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return $cache->get(); // @codeCoverageIgnore
|
return $cache->get(); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
if (null === $date) {
|
|
||||||
$date = Carbon::now()->endOfMonth();
|
|
||||||
}
|
|
||||||
/** @var AccountRepositoryInterface $repository */
|
/** @var AccountRepositoryInterface $repository */
|
||||||
$repository = app(AccountRepositoryInterface::class);
|
$repository = app(AccountRepositoryInterface::class);
|
||||||
if (null === $currency) {
|
if (null === $currency) {
|
||||||
@@ -260,14 +257,12 @@ class Steam
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets balance at the end of current month by default
|
|
||||||
*
|
|
||||||
* @param \FireflyIII\Models\Account $account
|
* @param \FireflyIII\Models\Account $account
|
||||||
* @param \Carbon\Carbon $date
|
* @param \Carbon\Carbon $date
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function balancePerCurrency(Account $account, Carbon $date = null): array
|
public function balancePerCurrency(Account $account, Carbon $date): array
|
||||||
{
|
{
|
||||||
if ('testing' === config('app.env')) {
|
if ('testing' === config('app.env')) {
|
||||||
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
||||||
@@ -280,9 +275,6 @@ class Steam
|
|||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return $cache->get(); // @codeCoverageIgnore
|
return $cache->get(); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
if (null === $date) {
|
|
||||||
$date = Carbon::now()->endOfMonth();
|
|
||||||
}
|
|
||||||
$query = $account->transactions()
|
$query = $account->transactions()
|
||||||
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
|
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
|
||||||
->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
|
->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'))
|
||||||
@@ -299,14 +291,14 @@ class Steam
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method always ignores the virtual balance. Gets balance at the end of current month by default
|
* This method always ignores the virtual balance.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Support\Collection $accounts
|
* @param \Illuminate\Support\Collection $accounts
|
||||||
* @param \Carbon\Carbon $date
|
* @param \Carbon\Carbon $date
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function balancesByAccounts(Collection $accounts, Carbon $date = null): array
|
public function balancesByAccounts(Collection $accounts, Carbon $date): array
|
||||||
{
|
{
|
||||||
if ('testing' === config('app.env')) {
|
if ('testing' === config('app.env')) {
|
||||||
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
||||||
@@ -334,14 +326,14 @@ class Steam
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same as above, but also groups per currency. Gets balance at the end of current month by default
|
* Same as above, but also groups per currency.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Support\Collection $accounts
|
* @param \Illuminate\Support\Collection $accounts
|
||||||
* @param \Carbon\Carbon $date
|
* @param \Carbon\Carbon $date
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date = null): array
|
public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date): array
|
||||||
{
|
{
|
||||||
if ('testing' === config('app.env')) {
|
if ('testing' === config('app.env')) {
|
||||||
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
Log::warning(sprintf('%s should NOT be called in the TEST environment!', __METHOD__));
|
||||||
|
Reference in New Issue
Block a user