kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-17 20:08:52 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-12-17

Browse Source
This commit is contained in:
JC5
2025-12-17 08:47:31 +01:00
parent 486e0d5ed5
commit 012df6bb24
50 changed files with 419 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Account/EditController.php
View File

@@ -38,6 +38,7 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class EditController
@@ -148,9 +149,9 @@ class EditController extends Controller
'BIC' => $repository->getMetaValue($account, 'BIC'),
'opening_balance_date' => substr((string) $openingBalanceDate, 0, 10),
'liability_type_id' => $account->account_type_id,
'opening_balance' => \FireflyIII\Support\Facades\Steam::bcround($openingBalanceAmount, $currency->decimal_places),
'opening_balance' => Steam::bcround($openingBalanceAmount, $currency->decimal_places),
'liability_direction' => $this->repository->getMetaValue($account, 'liability_direction'),
'virtual_balance' => \FireflyIII\Support\Facades\Steam::bcround($virtualBalance, $currency->decimal_places),
'virtual_balance' => Steam::bcround($virtualBalance, $currency->decimal_places),
'currency_id' => $currency->id,
'include_net_worth' => $hasOldInput ? (bool) $request->old('include_net_worth') : $includeNetWorth,
'interest' => $repository->getMetaValue($account, 'interest'),

5
app/Http/Controllers/Bill/EditController.php
View File

@@ -35,6 +35,7 @@ use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use FireflyIII\Support\Facades\Steam;
/**
* Class EditController
@@ -84,8 +85,8 @@ class EditController extends Controller
$this->rememberPreviousUrl('bills.edit.url');
}
$bill->amount_min = \FireflyIII\Support\Facades\Steam::bcround($bill->amount_min, $bill->transactionCurrency->decimal_places);
$bill->amount_max = \FireflyIII\Support\Facades\Steam::bcround($bill->amount_max, $bill->transactionCurrency->decimal_places);
$bill->amount_min = Steam::bcround($bill->amount_min, $bill->transactionCurrency->decimal_places);
$bill->amount_max = Steam::bcround($bill->amount_max, $bill->transactionCurrency->decimal_places);
$rules = $this->repository->getRulesForBill($bill);
// code to handle active-checkboxes

3
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@@ -44,6 +44,7 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Collection;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class BudgetLimitController
@@ -274,7 +275,7 @@ class BudgetLimitController extends Controller
$array['left_per_day'] = 0 === $daysLeft ? bcadd((string) $array['spent'], (string) $array['amount']) : bcdiv(bcadd((string) $array['spent'], (string) $array['amount']), $array['days_left']);
// left per day formatted.
$array['amount'] = \FireflyIII\Support\Facades\Steam::bcround($limit['amount'], $limit->transactionCurrency->decimal_places);
$array['amount'] = Steam::bcround($limit['amount'], $limit->transactionCurrency->decimal_places);
$array['left_per_day_formatted'] = app('amount')->formatAnything($limit->transactionCurrency, $array['left_per_day']);
if ('true' === $request->get('redirect')) {
return redirect(route('budgets.index'));

3
app/Http/Controllers/Budget/EditController.php
View File

@@ -37,6 +37,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class EditController
@@ -104,7 +105,7 @@ class EditController extends Controller
$amount = '0';
}
$amount = (string) $amount;
$preFilled['auto_budget_amount'] = \FireflyIII\Support\Facades\Steam::bcround($amount, $autoBudget->transactionCurrency->decimal_places);
$preFilled['auto_budget_amount'] = Steam::bcround($amount, $autoBudget->transactionCurrency->decimal_places);
}
// put previous url in session if not redirect from store (not "return_to_edit").

3
app/Http/Controllers/Budget/IndexController.php
View File

@@ -46,6 +46,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class IndexController
@@ -203,7 +204,7 @@ class IndexController extends Controller
foreach ($budgetLimits as $limit) {
Log::debug(sprintf('Working on budget limit #%d', $limit->id));
$currency = $limit->transactionCurrency ?? $primaryCurrency;
$amount = \FireflyIII\Support\Facades\Steam::bcround($limit->amount, $currency->decimal_places);
$amount = Steam::bcround($limit->amount, $currency->decimal_places);
$array['budgeted'][] = [
'id' => $limit->id,
'amount' => $amount,

3
app/Http/Controllers/Chart/BillController.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\Bill;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Illuminate\Http\JsonResponse;
use FireflyIII\Support\Facades\Steam;
/**
* Class BillController.
@@ -113,7 +114,7 @@ class BillController extends Controller
if ($cache->has()) {
return response()->json($cache->get());
}
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);

13
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -44,6 +44,7 @@ use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
use FireflyIII\Support\Facades\Steam;
/**
* Class BudgetController.
@@ -166,7 +167,7 @@ class BudgetController extends Controller
if ($cache->has()) {
return response()->json($cache->get());
}
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
$entries = [];
$amount = $budgetLimit->amount ?? '0';
$budgetCollection = new Collection()->push($budget);
@@ -531,13 +532,13 @@ class BudgetController extends Controller
// get budget limit in this period for this currency.
$limit = $this->blRepository->find($budget, $currency, $currentStart, $currentEnd);
if ($limit instanceof BudgetLimit) {
$chartData[1]['entries'][$title] = \FireflyIII\Support\Facades\Steam::bcround($limit->amount, $currency->decimal_places);
$chartData[1]['entries'][$title] = Steam::bcround($limit->amount, $currency->decimal_places);
}
// get spent amount in this period for this currency.
$sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);
$amount = \FireflyIII\Support\Facades\Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[0]['entries'][$title] = \FireflyIII\Support\Facades\Steam::bcround($amount, $currency->decimal_places);
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);
$currentStart = clone $currentEnd;
$currentStart->addDay()->startOfDay();
@@ -574,8 +575,8 @@ class BudgetController extends Controller
$currentEnd = Navigation::endOfPeriod($currentStart, $preferredRange);
$title = $currentStart->isoFormat($titleFormat);
$sum = $this->nbRepository->sumExpenses($currentStart, $currentEnd, $accounts, $currency);
$amount = \FireflyIII\Support\Facades\Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[$title] = \FireflyIII\Support\Facades\Steam::bcround($amount, $currency->decimal_places);
$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');
$chartData[$title] = Steam::bcround($amount, $currency->decimal_places);
$currentStart = Navigation::addPeriod($currentStart, $preferredRange, 0);
}

3
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -33,6 +33,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\DateCalculation;
use Illuminate\Http\JsonResponse;
use FireflyIII\Support\Facades\Steam;
/**
* Class PiggyBankController.
@@ -70,7 +71,7 @@ class PiggyBankController extends Controller
}
$set = $repository->getEvents($piggyBank);
$set = $set->reverse();
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
// get first event or start date of piggy bank or today
$startDate = $piggyBank->start_date ?? today(config('app.timezone'));

2
app/Http/Controllers/JavascriptController.php
View File

@@ -105,7 +105,7 @@ class JavascriptController extends Controller
if ($account instanceof Account) {
$currency = $repository->getAccountCurrency($account) ?? $this->primaryCurrency;
}
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
$accounting = app('amount')->getJsConfig();
$accounting['frac_digits'] = $currency->decimal_places;
$pref = Preferences::get('language', config('firefly.default_language', 'en_US'));

4
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -278,9 +278,9 @@ class ReconcileController extends Controller
}
if ($inverse) {
$journal['amount'] = \FireflyIII\Support\Facades\Steam::positive($journal['amount']);
$journal['amount'] = Steam::positive($journal['amount']);
if (null !== $journal['foreign_amount']) {
$journal['foreign_amount'] = \FireflyIII\Support\Facades\Steam::positive($journal['foreign_amount']);
$journal['foreign_amount'] = Steam::positive($journal['foreign_amount']);
}
}

3
app/Http/Controllers/Json/RecurrenceController.php
View File

@@ -33,6 +33,7 @@ use FireflyIII\Models\RecurrenceRepetition;
use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use FireflyIII\Support\Facades\Steam;
/**
* Class RecurrenceController
@@ -167,7 +168,7 @@ class RecurrenceController extends Controller
}
$date->startOfDay();
$preSelected = (string) $request->get('pre_select');
$locale = \FireflyIII\Support\Facades\Steam::getLocale();
$locale = Steam::getLocale();
Log::debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true)));
Log::debug(sprintf('past = true? %s', var_export('true' === (string) $request->get('past'), true)));

3
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -35,6 +35,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class EditController
@@ -89,7 +90,7 @@ class EditController extends Controller
$preFilled = [
'name' => $piggyBank->name,
'transaction_currency_id' => (int) $piggyBank->transaction_currency_id,
'target_amount' => \FireflyIII\Support\Facades\Steam::bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
'target_amount' => Steam::bcround($piggyBank->target_amount, $piggyBank->transactionCurrency->decimal_places),
'target_date' => $targetDate,
'start_date' => $startDate,
'accounts' => [],

3
app/Http/Controllers/PreferencesController.php
View File

@@ -44,6 +44,7 @@ use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use JsonException;
use Safe\Exceptions\FilesystemException;
use FireflyIII\Support\Facades\Steam;
use function Safe\file_get_contents;
use function Safe\json_decode;
@@ -108,7 +109,7 @@ class PreferencesController extends Controller
if (!is_array($frontpageAccounts)) {
$frontpageAccounts = $accountIds;
}
$language = \FireflyIII\Support\Facades\Steam::getLanguage();
$language = Steam::getLanguage();
$languages = config('firefly.languages');
$locale = Preferences::get('locale', config('firefly.default_locale', 'equal'))->data;
$listPageSize = Preferences::get('listPageSize', 50)->data;

3
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -38,6 +38,7 @@ use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use FireflyIII\Support\Facades\Steam;
/**
* Class DeleteController
@@ -83,7 +84,7 @@ class DeleteController extends Controller
}
$objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = (string) trans('firefly.delete_'.$objectType, ['description' => $group->title ?? $journal->description]);
$previous = \FireflyIII\Support\Facades\Steam::getSafePreviousUrl();
$previous = Steam::getSafePreviousUrl();
// put previous url in session
Log::debug('Will try to remember previous URL');
$this->rememberPreviousUrl('transactions.delete.url');

3
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -36,6 +36,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class LinkController.
@@ -145,6 +146,6 @@ class LinkController extends Controller
$linkId = (int) $request->get('id');
$this->repository->switchLinkById($linkId);
return redirect(\FireflyIII\Support\Facades\Steam::getSafePreviousUrl());
return redirect(Steam::getSafePreviousUrl());
}
}

5
app/Http/Controllers/Transaction/MassController.php
View File

@@ -43,6 +43,7 @@ use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View as IlluminateView;
use InvalidArgumentException;
use FireflyIII\Support\Facades\Steam;
/**
* Class MassController.
@@ -142,9 +143,9 @@ class MassController extends Controller
// reverse amounts
foreach ($journals as $index => $journal) {
$journals[$index]['amount'] = \FireflyIII\Support\Facades\Steam::bcround(\FireflyIII\Support\Facades\Steam::positive($journal['amount']), $journal['currency_decimal_places']);
$journals[$index]['amount'] = Steam::bcround(Steam::positive($journal['amount']), $journal['currency_decimal_places']);
$journals[$index]['foreign_amount'] = null === $journal['foreign_amount']
? null : \FireflyIII\Support\Facades\Steam::positive($journal['foreign_amount']);
? null : Steam::positive($journal['foreign_amount']);
}
$this->rememberPreviousUrl('transactions.mass-edit.url');