kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-01 10:31:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7008 from firefly-iii/fix-5234

Browse Source 
Fix 5234
This commit is contained in:
James Cole
2023-02-11 07:39:18 +01:00
committed by GitHub
parent 79e98cf8a2 b909841eae
commit 0060c46cdb
53 changed files with 235 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.ci/php-cs-fixer/composer.lock generated
View File

@@ -379,16 +379,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v3.14.3", "version": "v3.14.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "b418036b95b4936a33fe906245d3044395935e73" "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b418036b95b4936a33fe906245d3044395935e73", "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/1b3d9dba63d93b8a202c31e824748218781eae6b",
"reference": "b418036b95b4936a33fe906245d3044395935e73", "reference": "1b3d9dba63d93b8a202c31e824748218781eae6b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -399,7 +399,7 @@
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
"sebastian/diff": "^4.0", "sebastian/diff": "^4.0 || ^5.0",
"symfony/console": "^5.4 || ^6.0", "symfony/console": "^5.4 || ^6.0",
"symfony/event-dispatcher": "^5.4 || ^6.0", "symfony/event-dispatcher": "^5.4 || ^6.0",
"symfony/filesystem": "^5.4 || ^6.0", "symfony/filesystem": "^5.4 || ^6.0",
@@ -457,7 +457,7 @@
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.3" "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.14.4"
}, },
"funding": [ "funding": [
{ {
@@ -465,7 +465,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-01-30T00:24:29+00:00" "time": "2023-02-09T21:49:13+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@@ -671,29 +671,29 @@
}, },
{ {
"name": "sebastian/diff", "name": "sebastian/diff",
"version": "4.0.4", "version": "5.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/diff.git", "url": "https://github.com/sebastianbergmann/diff.git",
"reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
"reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.3" "php": ">=8.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.3", "phpunit/phpunit": "^10.0",
"symfony/process": "^4.2 || ^5" "symfony/process": "^4.2 || ^5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-main": "5.0-dev"
} }
}, },
"autoload": { "autoload": {
@@ -725,7 +725,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/diff/issues", "issues": "https://github.com/sebastianbergmann/diff/issues",
"source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
}, },
"funding": [ "funding": [
{ {
@@ -733,7 +733,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-10-26T13:10:38+00:00" "time": "2023-02-03T07:00:31+00:00"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",

4
app/Api/V1/Controllers/Summary/BasicController.php
View File

@@ -350,11 +350,11 @@ class BasicController extends Controller
{ {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
$date = Carbon::now()->startOfDay(); $date = today(config('app.timezone'))->startOfDay();
// start and end in the future? use $end // start and end in the future? use $end
if ($this->notInDateRange($date, $start, $end)) { if ($this->notInDateRange($date, $start, $end)) {
/** @var Carbon $date */ /** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth()); $date = session('end', today(config('app.timezone'))->endOfMonth());
} }
/** @var NetWorthInterface $netWorthHelper */ /** @var NetWorthInterface $netWorthHelper */

4
app/Api/V1/Requests/Data/Export/ExportRequest.php
View File

@@ -42,8 +42,8 @@ class ExportRequest extends FormRequest
public function getAll(): array public function getAll(): array
{ {
$result = [ $result = [
'start' => $this->getCarbonDate('start') ?? Carbon::now()->subYear(), 'start' => $this->getCarbonDate('start') ?? today(config('app.timezone'))->subYear(),
'end' => $this->getCarbonDate('end') ?? Carbon::now(), 'end' => $this->getCarbonDate('end') ?? today(config('app.timezone')),
'type' => $this->convertString('type'), 'type' => $this->convertString('type'),
]; ];
$parts = explode(',', $this->convertString('accounts')); $parts = explode(',', $this->convertString('accounts'));

2
app/Api/V1/Requests/System/CronRequest.php
View File

@@ -56,7 +56,7 @@ class CronRequest extends FormRequest
{ {
$data = [ $data = [
'force' => false, 'force' => false,
'date' => Carbon::now(), 'date' => today(config('app.timezone')),
]; ];
if ($this->has('force')) { if ($this->has('force')) {
$data['force'] = $this->boolean('force'); $data['force'] = $this->boolean('force');

4
app/Console/Commands/Export/ExportData.php
View File

@@ -191,7 +191,7 @@ class ExportData extends Command
*/ */
private function getDateParameter(string $field): Carbon private function getDateParameter(string $field): Carbon
{ {
$date = Carbon::now()->subYear(); $date = today(config('app.timezone'))->subYear();
$error = false; $error = false;
if (null !== $this->option($field)) { if (null !== $this->option($field)) {
try { try {
@@ -209,7 +209,7 @@ class ExportData extends Command
if (true === $error && 'start' === $field) { if (true === $error && 'start' === $field) {
$journal = $this->journalRepository->firstNull(); $journal = $this->journalRepository->firstNull();
$date = null === $journal ? Carbon::now()->subYear() : $journal->date; $date = null === $journal ? today(config('app.timezone'))->subYear() : $journal->date;
$date->startOfDay(); $date->startOfDay();
} }

4
app/Console/Commands/Tools/ApplyRules.php
View File

@@ -282,7 +282,7 @@ class ApplyRules extends Command
private function verifyInputDates(): void private function verifyInputDates(): void
{ {
// parse start date. // parse start date.
$inputStart = Carbon::now()->startOfMonth(); $inputStart = today(config('app.timezone'))->startOfMonth();
$startString = $this->option('start_date'); $startString = $this->option('start_date');
if (null === $startString) { if (null === $startString) {
/** @var JournalRepositoryInterface $repository */ /** @var JournalRepositoryInterface $repository */
@@ -298,7 +298,7 @@ class ApplyRules extends Command
} }
// parse end date // parse end date
$inputEnd = Carbon::now(); $inputEnd = today(config('app.timezone'));
$endString = $this->option('end_date'); $endString = $this->option('end_date');
if (null !== $endString && '' !== $endString) { if (null !== $endString && '' !== $endString) {
$inputEnd = Carbon::createFromFormat('Y-m-d', $endString); $inputEnd = Carbon::createFromFormat('Y-m-d', $endString);

2
app/Handlers/Events/PiggyBankEventHandler.php
View File

@@ -45,7 +45,7 @@ class PiggyBankEventHandler
if (null !== $event->transactionGroup) { if (null !== $event->transactionGroup) {
$journal = $event->transactionGroup->transactionJournals()->first(); $journal = $event->transactionGroup->transactionJournals()->first();
} }
$date = $journal?->date ?? Carbon::now(); $date = $journal?->date ?? today(config('app.timezone'));
// sanity check: event must not already exist for this journal and piggy bank. // sanity check: event must not already exist for this journal and piggy bank.
if (null !== $journal) { if (null !== $journal) {

2
app/Helpers/Report/ReportHelper.php
View File

@@ -123,7 +123,7 @@ class ReportHelper implements ReportHelperInterface
$fiscalHelper = app(FiscalHelperInterface::class); $fiscalHelper = app(FiscalHelperInterface::class);
$start = clone $date; $start = clone $date;
$start->startOfMonth(); $start->startOfMonth();
$end = Carbon::now(); $end = today(config('app.timezone'));
$end->endOfMonth(); $end->endOfMonth();
$months = []; $months = [];

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

@@ -93,9 +93,9 @@ class IndexController extends Controller
$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);
unset($collection); unset($collection);
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$start->subDay(); $start->subDay();
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();
@@ -156,9 +156,9 @@ class IndexController extends Controller
unset($collection); unset($collection);
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$start->subDay(); $start->subDay();
$ids = $accounts->pluck('id')->toArray(); $ids = $accounts->pluck('id')->toArray();

2
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -100,7 +100,7 @@ class ReconcileController extends Controller
$currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency(); $currency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
// no start or end: // no start or end:
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(false);
// get start and end // get start and end

2
app/Http/Controllers/Account/ShowController.php
View File

@@ -182,7 +182,7 @@ class ShowController extends Controller
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
$end = today(config('app.timezone')); $end = today(config('app.timezone'));
$today = today(config('app.timezone')); $today = today(config('app.timezone'));
$start = $this->repository->oldestJournalDate($account) ?? Carbon::now()->startOfMonth(); $start = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
$subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type); $subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
$page = (int)$request->get('page'); $page = (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;

2
app/Http/Controllers/Bill/IndexController.php
View File

@@ -154,7 +154,7 @@ class IndexController extends Controller
private function getSums(array $bills): array private function getSums(array $bills): array
{ {
$sums = []; $sums = [];
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(false);
/** @var array $group */ /** @var array $group */
foreach ($bills as $groupOrder => $group) { foreach ($bills as $groupOrder => $group) {

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

@@ -104,8 +104,8 @@ class IndexController extends Controller
Log::debug('Start of IndexController::index()'); Log::debug('Start of IndexController::index()');
// collect some basic vars: // collect some basic vars:
$range = (string)app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
$start = $start ?? session('start', Carbon::now()->startOfMonth()); $start = $start ?? session('start', today(config('app.timezone'))->startOfMonth());
$end = $end ?? app('navigation')->endOfPeriod($start, $range); $end = $end ?? app('navigation')->endOfPeriod($start, $range);
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
$currencies = $this->currencyRepository->get(); $currencies = $this->currencyRepository->get();

4
app/Http/Controllers/Budget/ShowController.php
View File

@@ -159,7 +159,7 @@ class ShowController extends Controller
public function show(Request $request, Budget $budget) public function show(Request $request, Budget $budget)
{ {
/** @var Carbon $allStart */ /** @var Carbon $allStart */
$allStart = session('first', Carbon::now()->startOfYear()); $allStart = session('first', today(config('app.timezone'))->startOfYear());
$allEnd = today(); $allEnd = today();
$page = (int)$request->get('page'); $page = (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
@@ -221,7 +221,7 @@ class ShowController extends Controller
$groups = $collector->getPaginatedGroups(); $groups = $collector->getPaginatedGroups();
$groups->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); $groups->setPath(route('budgets.show', [$budget->id, $budgetLimit->id]));
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('first', Carbon::now()->startOfYear()); $start = session('first', today(config('app.timezone'))->startOfYear());
$end = today(config('app.timezone')); $end = today(config('app.timezone'));
$attachments = $this->repository->getAttachments($budget); $attachments = $this->repository->getAttachments($budget);
$limits = $this->getLimits($budget, $start, $end); $limits = $this->getLimits($budget, $start, $end);

6
app/Http/Controllers/Category/ShowController.php
View File

@@ -88,14 +88,14 @@ class ShowController extends Controller
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
{ {
/** @var Carbon $start */ /** @var Carbon $start */
$start = $start ?? session('start', Carbon::now()->startOfMonth()); $start = $start ?? session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = $end ?? session('end', Carbon::now()->endOfMonth()); $end = $end ?? session('end', today(config('app.timezone'))->endOfMonth());
$subTitleIcon = 'fa-bookmark'; $subTitleIcon = 'fa-bookmark';
$page = (int)$request->get('page'); $page = (int)$request->get('page');
$attachments = $this->repository->getAttachments($category); $attachments = $this->repository->getAttachments($category);
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data; $pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$oldest = $this->repository->firstUseDate($category) ?? Carbon::now()->startOfYear(); $oldest = $this->repository->firstUseDate($category) ?? today(config('app.timezone'))->startOfYear();
$periods = $this->getCategoryPeriodOverview($category, $oldest, $end); $periods = $this->getCategoryPeriodOverview($category, $oldest, $end);
$path = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $path = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$subTitle = trans( $subTitle = trans(

24
app/Http/Controllers/Chart/AccountController.php
View File

@@ -90,9 +90,9 @@ class AccountController extends Controller
public function expenseAccounts(): JsonResponse public function expenseAccounts(): JsonResponse
{ {
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
@@ -184,8 +184,8 @@ class AccountController extends Controller
*/ */
public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account): JsonResponse public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
{ {
$start = $repository->oldestJournalDate($account) ?? Carbon::now()->startOfMonth(); $start = $repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
$end = Carbon::now(); $end = today(config('app.timezone'));
return $this->expenseBudget($account, $start, $end); return $this->expenseBudget($account, $start, $end);
} }
@@ -259,8 +259,8 @@ class AccountController extends Controller
*/ */
public function expenseCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse public function expenseCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
{ {
$start = $repository->oldestJournalDate($account) ?? Carbon::now()->startOfMonth(); $start = $repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
$end = Carbon::now(); $end = today(config('app.timezone'));
return $this->expenseCategory($account, $start, $end); return $this->expenseCategory($account, $start, $end);
} }
@@ -334,8 +334,8 @@ class AccountController extends Controller
*/ */
public function frontpage(AccountRepositoryInterface $repository): JsonResponse public function frontpage(AccountRepositoryInterface $repository): JsonResponse
{ {
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray(); $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
Log::debug('Default set is ', $defaultSet); Log::debug('Default set is ', $defaultSet);
$frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet);
@@ -360,8 +360,8 @@ class AccountController extends Controller
*/ */
public function incomeCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse public function incomeCategoryAll(AccountRepositoryInterface $repository, Account $account): JsonResponse
{ {
$start = $repository->oldestJournalDate($account) ?? Carbon::now()->startOfMonth(); $start = $repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
$end = Carbon::now(); $end = today(config('app.timezone'));
return $this->incomeCategory($account, $start, $end); return $this->incomeCategory($account, $start, $end);
} }
@@ -540,9 +540,9 @@ class AccountController extends Controller
public function revenueAccounts(): JsonResponse public function revenueAccounts(): JsonResponse
{ {
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);

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

@@ -62,8 +62,8 @@ class BillController extends Controller
*/ */
public function frontpage(BillRepositoryInterface $repository): JsonResponse public function frontpage(BillRepositoryInterface $repository): JsonResponse
{ {
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);

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

@@ -214,7 +214,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId); $cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-asset'); $cache->addProperty('chart.budget.expense-asset');
$start = session('first', Carbon::now()->startOfYear()); $start = session('first', today(config('app.timezone'))->startOfYear());
$end = today(); $end = today();
if (null !== $budgetLimit) { if (null !== $budgetLimit) {
@@ -282,7 +282,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId); $cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-category'); $cache->addProperty('chart.budget.expense-category');
$start = session('first', Carbon::now()->startOfYear()); $start = session('first', today(config('app.timezone'))->startOfYear());
$end = today(); $end = today();
if (null !== $budgetLimit) { if (null !== $budgetLimit) {
$start = $budgetLimit->start_date; $start = $budgetLimit->start_date;
@@ -346,7 +346,7 @@ class BudgetController extends Controller
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty($budgetLimitId); $cache->addProperty($budgetLimitId);
$cache->addProperty('chart.budget.expense-expense'); $cache->addProperty('chart.budget.expense-expense');
$start = session('first', Carbon::now()->startOfYear()); $start = session('first', today(config('app.timezone'))->startOfYear());
$end = today(); $end = today();
if (null !== $budgetLimit) { if (null !== $budgetLimit) {
$start = $budgetLimit->start_date; $start = $budgetLimit->start_date;
@@ -402,8 +402,8 @@ class BudgetController extends Controller
*/ */
public function frontpage(): JsonResponse public function frontpage(): JsonResponse
{ {
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
// chart properties for cache: // chart properties for cache:
$cache = new CacheProperties(); $cache = new CacheProperties();

8
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -89,7 +89,7 @@ class CategoryController extends Controller
/** @var CategoryRepositoryInterface $repository */ /** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class); $repository = app(CategoryRepositoryInterface::class);
$start = $repository->firstUseDate($category) ?? $this->getDate(); $start = $repository->firstUseDate($category) ?? $this->getDate();
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(false);
$start = app('navigation')->startOfPeriod($start, $range); $start = app('navigation')->startOfPeriod($start, $range);
$end = $this->getDate(); $end = $this->getDate();
@@ -118,8 +118,8 @@ class CategoryController extends Controller
*/ */
public function frontPage(): JsonResponse public function frontPage(): JsonResponse
{ {
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
// chart properties for cache: // chart properties for cache:
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
@@ -293,7 +293,7 @@ class CategoryController extends Controller
*/ */
public function specificPeriod(Category $category, Carbon $date): JsonResponse public function specificPeriod(Category $category, Carbon $date): JsonResponse
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(false);
$start = app('navigation')->startOfPeriod($date, $range); $start = app('navigation')->startOfPeriod($date, $range);
$end = session()->get('end'); $end = session()->get('end');
if ($end < $start) { if ($end < $start) {

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

@@ -120,7 +120,7 @@ class DebugController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
// basic scope information: // basic scope information:
$now = Carbon::now()->format('Y-m-d H:i:s e'); $now = today(config('app.timezone'))->format('Y-m-d H:i:s e');
$buildNr = '(unknown)'; $buildNr = '(unknown)';
$buildDate = '(unknown)'; $buildDate = '(unknown)';
$expectedDBversion = config('firefly.db_version'); $expectedDBversion = config('firefly.db_version');

4
app/Http/Controllers/HomeController.php
View File

@@ -119,9 +119,9 @@ class HomeController extends Controller
$transactions = []; $transactions = [];
$frontPage = app('preferences')->getFresh('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray()); $frontPage = app('preferences')->getFresh('frontPageAccounts', $repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray());
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$accounts = $repository->getAccountsById($frontPage->data); $accounts = $repository->getAccountsById($frontPage->data);
$today = today(config('app.timezone')); $today = today(config('app.timezone'));

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

@@ -157,9 +157,9 @@ class JavascriptController extends Controller
public function variablesV2(Request $request): Response public function variablesV2(Request $request): Response
{ {
/** @var Carbon $start */ /** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth()); $start = clone session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = clone session('end', Carbon::now()->endOfMonth()); $end = clone session('end', today(config('app.timezone'))->endOfMonth());
$data = [ $data = [
'start' => $start->format('Y-m-d'), 'start' => $start->format('Y-m-d'),

12
app/Http/Controllers/Json/BoxController.php
View File

@@ -60,9 +60,9 @@ class BoxController extends Controller
/** @var AvailableBudgetRepositoryInterface $abRepository */ /** @var AvailableBudgetRepositoryInterface $abRepository */
$abRepository = app(AvailableBudgetRepositoryInterface::class); $abRepository = app(AvailableBudgetRepositoryInterface::class);
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$today = today(config('app.timezone')); $today = today(config('app.timezone'));
$display = 2; // see method docs. $display = 2; // see method docs.
$boxTitle = (string)trans('firefly.spent'); $boxTitle = (string)trans('firefly.spent');
@@ -135,9 +135,9 @@ class BoxController extends Controller
{ {
// Cache result, return cache if present. // Cache result, return cache if present.
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$cache = new CacheProperties(); $cache = new CacheProperties();
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
@@ -216,12 +216,12 @@ class BoxController extends Controller
*/ */
public function netWorth(): JsonResponse public function netWorth(): JsonResponse
{ {
$date = Carbon::now()->endOfDay(); $date = today(config('app.timezone'))->endOfDay();
// start and end in the future? use $end // start and end in the future? use $end
if ($this->notInSessionRange($date)) { if ($this->notInSessionRange($date)) {
/** @var Carbon $date */ /** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth()); $date = session('end', today(config('app.timezone'))->endOfMonth());
} }
/** @var NetWorthInterface $netWorthHelper */ /** @var NetWorthInterface $netWorthHelper */

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

@@ -152,7 +152,7 @@ class RecurrenceController extends Controller
{ {
$request->validate(['date' => ['required', 'date'],]); $request->validate(['date' => ['required', 'date'],]);
$string = $request->get('date') ?? date('Y-m-d'); $string = $request->get('date') ?? date('Y-m-d');
$today = Carbon::now()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
$date = Carbon::createFromFormat('Y-m-d', $string)->startOfDay(); $date = Carbon::createFromFormat('Y-m-d', $string)->startOfDay();
$preSelected = (string)$request->get('pre_select'); $preSelected = (string)$request->get('pre_select');
$locale = app('steam')->getLocale(); $locale = app('steam')->getLocale();

2
app/Http/Controllers/PiggyBank/IndexController.php
View File

@@ -87,7 +87,7 @@ class IndexController extends Controller
$collection = $this->piggyRepos->getPiggyBanks(); $collection = $this->piggyRepos->getPiggyBanks();
$accounts = []; $accounts = [];
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
// transform piggies using the transformer: // transform piggies using the transformer:
$parameters = new ParameterBag(); $parameters = new ParameterBag();

2
app/Http/Controllers/PiggyBank/ShowController.php
View File

@@ -71,7 +71,7 @@ class ShowController extends Controller
public function show(PiggyBank $piggyBank) public function show(PiggyBank $piggyBank)
{ {
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
// transform piggies using the transformer: // transform piggies using the transformer:
$parameters = new ParameterBag(); $parameters = new ParameterBag();
$parameters->set('end', $end); $parameters->set('end', $end);

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

@@ -96,7 +96,7 @@ class PreferencesController extends Controller
ksort($groupedAccounts); ksort($groupedAccounts);
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$viewRangePref = app('preferences')->get('viewRange', '1M'); $viewRangePref = app('navigation')->getViewRange(false);
$viewRange = $viewRangePref->data; $viewRange = $viewRangePref->data;
$frontPageAccounts = app('preferences')->get('frontPageAccounts', $accountIds); $frontPageAccounts = app('preferences')->get('frontPageAccounts', $accountIds);

2
app/Http/Controllers/Recurring/TriggerController.php
View File

@@ -68,7 +68,7 @@ class TriggerController extends Controller
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
foreach ($group->transactionJournals as $journal) { foreach ($group->transactionJournals as $journal) {
Log::debug(sprintf('Set date of journal #%d to today!', $journal->id)); Log::debug(sprintf('Set date of journal #%d to today!', $journal->id));
$journal->date = Carbon::today(); $journal->date = today(config('app.timezone'));
$journal->save(); $journal->save();
} }
} }

4
app/Http/Controllers/Rule/SelectController.php
View File

@@ -118,8 +118,8 @@ class SelectController extends Controller
return redirect(route('rules.index')); return redirect(route('rules.index'));
} }
// does the user have shared accounts? // does the user have shared accounts?
$first = session('first', Carbon::now()->subYear())->format('Y-m-d'); $first = session('first', today(config('app.timezone'))->subYear())->format('Y-m-d');
$today = Carbon::now()->format('Y-m-d'); $today = today(config('app.timezone'))->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle')); return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));

2
app/Http/Controllers/RuleGroup/ExecutionController.php
View File

@@ -110,7 +110,7 @@ class ExecutionController extends Controller
public function selectTransactions(RuleGroup $ruleGroup) public function selectTransactions(RuleGroup $ruleGroup)
{ {
$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$today = Carbon::now()->format('Y-m-d'); $today = today(config('app.timezone'))->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]); $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle')); return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));

2
app/Http/Middleware/Range.php
View File

@@ -106,7 +106,7 @@ class Range
setlocale(LC_TIME, $localeArray); setlocale(LC_TIME, $localeArray);
$moneyResult = setlocale(LC_MONETARY, $localeArray); $moneyResult = setlocale(LC_MONETARY, $localeArray);
// send error to view if could not set money format // send error to view, if could not set money format
if (false === $moneyResult) { if (false === $moneyResult) {
Log::error('Could not set locale. The following array doesnt work: ', $localeArray); Log::error('Could not set locale. The following array doesnt work: ', $localeArray);
app('view')->share('invalidMonetaryLocale', true); app('view')->share('invalidMonetaryLocale', true);

2
app/Http/Requests/RecurrenceFormRequest.php
View File

@@ -194,7 +194,7 @@ class RecurrenceFormRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
$today = today(config('app.timezone')); $today = today(config('app.timezone'));
$tomorrow = Carbon::now()->addDay(); $tomorrow = today(config('app.timezone'))->addDay();
$rules = [ $rules = [
// mandatory info for recurrence. // mandatory info for recurrence.
'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title',

2
app/Http/Requests/SelectTransactionsRequest.php
View File

@@ -47,7 +47,7 @@ class SelectTransactionsRequest extends FormRequest
/** @var Carbon $sessionFirst */ /** @var Carbon $sessionFirst */
$sessionFirst = clone session('first'); $sessionFirst = clone session('first');
$first = $sessionFirst->subDay()->format('Y-m-d'); $first = $sessionFirst->subDay()->format('Y-m-d');
$today = Carbon::now()->addDay()->format('Y-m-d'); $today = today(config('app.timezone'))->addDay()->format('Y-m-d');
return [ return [
'start' => 'required|date|after:'.$first, 'start' => 'required|date|after:'.$first,

2
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -357,7 +357,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return $savePerMonth; return $savePerMonth;
} }
if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) { if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) {
$now = Carbon::now(); $now = today(config('app.timezone'));
$startDate = null !== $piggyBank->startdate && $piggyBank->startdate->gte($now) ? $piggyBank->startdate : $now; $startDate = null !== $piggyBank->startdate && $piggyBank->startdate->gte($now) ? $piggyBank->startdate : $now;
$diffInMonths = $startDate->diffInMonths($piggyBank->targetdate, false); $diffInMonths = $startDate->diffInMonths($piggyBank->targetdate, false);
$remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount); $remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount);

2
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -534,7 +534,7 @@ class RecurringRepository implements RecurringRepositoryInterface
} }
if ('yearly' === $repetition->repetition_type) { if ('yearly' === $repetition->repetition_type) {
// //
$today = Carbon::now()->endOfYear(); $today = today(config('app.timezone'))->endOfYear();
$repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment); $repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment);
$diffInYears = $today->diffInYears($repDate); $diffInYears = $today->diffInYears($repDate);
$repDate->addYears($diffInYears); // technically not necessary. $repDate->addYears($diffInYears); // technically not necessary.

4
app/Repositories/User/UserRepository.php
View File

@@ -282,7 +282,7 @@ class UserRepository implements UserRepositoryInterface
*/ */
public function inviteUser(User $user, string $email): InvitedUser public function inviteUser(User $user, string $email): InvitedUser
{ {
$now = Carbon::now(); $now = today(config('app.timezone'));
$now->addDays(2); $now->addDays(2);
$invitee = new InvitedUser(); $invitee = new InvitedUser();
$invitee->user()->associate($user); $invitee->user()->associate($user);
@@ -463,7 +463,7 @@ class UserRepository implements UserRepositoryInterface
*/ */
public function validateInviteCode(string $code): bool public function validateInviteCode(string $code): bool
{ {
$now = Carbon::now(); $now = today(config('app.timezone'));
$invitee = InvitedUser::where('invite_code', $code)->where('expires', '>', $now->format('Y-m-d H:i:s'))->where('redeemed', 0)->first(); $invitee = InvitedUser::where('invite_code', $code)->where('expires', '>', $now->format('Y-m-d H:i:s'))->where('redeemed', 0)->first();
return null !== $invitee; return null !== $invitee;
} }

4
app/Services/FireflyIIIOrg/Update/UpdateRequest.php
View File

@@ -74,7 +74,7 @@ class UpdateRequest implements UpdateRequestInterface
// always fall back to current version: // always fall back to current version:
$return = [ $return = [
'version' => config('firefly.version'), 'version' => config('firefly.version'),
'date' => Carbon::today()->startOfDay(), 'date' => today(config('app.timezone'))->startOfDay(),
'level' => 'error', 'level' => 'error',
'message' => (string)trans('firefly.unknown_error'), 'message' => (string)trans('firefly.unknown_error'),
]; ];
@@ -171,7 +171,7 @@ class UpdateRequest implements UpdateRequestInterface
// a newer version is available! // a newer version is available!
/** @var Carbon $released */ /** @var Carbon $released */
$released = $information['date']; $released = $information['date'];
$today = Carbon::today()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
$diff = $today->diffInDays($released); $diff = $today->diffInDays($released);
$expectedDiff = config('firefly.update_minimum_age') ?? 6; $expectedDiff = config('firefly.update_minimum_age') ?? 6;
// it's still very fresh, and user wants a stable release: // it's still very fresh, and user wants a stable release:

2
app/Services/Internal/Update/GroupCloneService.php
View File

@@ -65,7 +65,7 @@ class GroupCloneService
{ {
$newJournal = $journal->replicate(); $newJournal = $journal->replicate();
$newJournal->transaction_group_id = $newGroup->id; $newJournal->transaction_group_id = $newGroup->id;
$newJournal->date = Carbon::now(); $newJournal->date = today(config('app.timezone'));
$newJournal->save(); $newJournal->save();
foreach ($journal->transactions as $transaction) { foreach ($journal->transactions as $transaction) {

24
app/Support/Binder/Date.php
View File

@@ -48,20 +48,20 @@ class Date implements BinderInterface
$fiscalHelper = app(FiscalHelperInterface::class); $fiscalHelper = app(FiscalHelperInterface::class);
$magicWords = [ $magicWords = [
'currentMonthStart' => Carbon::now()->startOfMonth(), 'currentMonthStart' => today(config('app.timezone'))->startOfMonth(),
'currentMonthEnd' => Carbon::now()->endOfMonth(), 'currentMonthEnd' => today(config('app.timezone'))->endOfMonth(),
'currentYearStart' => Carbon::now()->startOfYear(), 'currentYearStart' => today(config('app.timezone'))->startOfYear(),
'currentYearEnd' => Carbon::now()->endOfYear(), 'currentYearEnd' => today(config('app.timezone'))->endOfYear(),
'previousMonthStart' => Carbon::now()->startOfMonth()->subDay()->startOfMonth(), 'previousMonthStart' => today(config('app.timezone'))->startOfMonth()->subDay()->startOfMonth(),
'previousMonthEnd' => Carbon::now()->startOfMonth()->subDay()->endOfMonth(), 'previousMonthEnd' => today(config('app.timezone'))->startOfMonth()->subDay()->endOfMonth(),
'previousYearStart' => Carbon::now()->startOfYear()->subDay()->startOfYear(), 'previousYearStart' => today(config('app.timezone'))->startOfYear()->subDay()->startOfYear(),
'previousYearEnd' => Carbon::now()->startOfYear()->subDay()->endOfYear(), 'previousYearEnd' => today(config('app.timezone'))->startOfYear()->subDay()->endOfYear(),
'currentFiscalYearStart' => $fiscalHelper->startOfFiscalYear(Carbon::now()), 'currentFiscalYearStart' => $fiscalHelper->startOfFiscalYear(today(config('app.timezone'))),
'currentFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(Carbon::now()), 'currentFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(today(config('app.timezone'))),
'previousFiscalYearStart' => $fiscalHelper->startOfFiscalYear(Carbon::now())->subYear(), 'previousFiscalYearStart' => $fiscalHelper->startOfFiscalYear(today(config('app.timezone')))->subYear(),
'previousFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(Carbon::now())->subYear(), 'previousFiscalYearEnd' => $fiscalHelper->endOfFiscalYear(today(config('app.timezone')))->subYear(),
]; ];
if (array_key_exists($value, $magicWords)) { if (array_key_exists($value, $magicWords)) {
$return = $magicWords[$value]; $return = $magicWords[$value];

2
app/Support/Cronjobs/AutoBudgetCronjob.php
View File

@@ -43,7 +43,7 @@ class AutoBudgetCronjob extends AbstractCronjob
$config = app('fireflyconfig')->get('last_ab_job', 0); $config = app('fireflyconfig')->get('last_ab_job', 0);
$lastTime = (int)$config->data; $lastTime = (int)$config->data;
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = Carbon::now()->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Auto budget cron-job has never fired before.'); Log::info('Auto budget cron-job has never fired before.');
} }

2
app/Support/Cronjobs/BillWarningCronjob.php
View File

@@ -48,7 +48,7 @@ class BillWarningCronjob extends AbstractCronjob
$config = app('fireflyconfig')->get('last_bw_job', 0); $config = app('fireflyconfig')->get('last_bw_job', 0);
$lastTime = (int)$config->data; $lastTime = (int)$config->data;
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = Carbon::now()->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('The bill warning cron-job has never fired before.'); Log::info('The bill warning cron-job has never fired before.');

2
app/Support/Cronjobs/ExchangeRatesCronjob.php
View File

@@ -43,7 +43,7 @@ class ExchangeRatesCronjob extends AbstractCronjob
$config = app('fireflyconfig')->get('last_cer_job', 0); $config = app('fireflyconfig')->get('last_cer_job', 0);
$lastTime = (int)$config->data; $lastTime = (int)$config->data;
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = Carbon::now()->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Exchange rates cron-job has never fired before.'); Log::info('Exchange rates cron-job has never fired before.');
} }

2
app/Support/Cronjobs/RecurringCronjob.php
View File

@@ -48,7 +48,7 @@ class RecurringCronjob extends AbstractCronjob
$config = app('fireflyconfig')->get('last_rt_job', 0); $config = app('fireflyconfig')->get('last_rt_job', 0);
$lastTime = (int)$config->data; $lastTime = (int)$config->data;
$diff = time() - $lastTime; $diff = time() - $lastTime;
$diffForHumans = Carbon::now()->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
if (0 === $lastTime) { if (0 === $lastTime) {
Log::info('Recurring transactions cron-job has never fired before.'); Log::info('Recurring transactions cron-job has never fired before.');

2
app/Support/Http/Api/ConvertsExchangeRates.php
View File

@@ -158,7 +158,7 @@ trait ConvertsExchangeRates
private function convertAmount(string $amount, TransactionCurrency $from, TransactionCurrency $to, ?Carbon $date = null): string private function convertAmount(string $amount, TransactionCurrency $from, TransactionCurrency $to, ?Carbon $date = null): string
{ {
Log::debug(sprintf('Converting %s from %s to %s', $amount, $from->code, $to->code)); Log::debug(sprintf('Converting %s from %s to %s', $amount, $from->code, $to->code));
$date = $date ?? Carbon::now(); $date = $date ?? today(config('app.timezone'));
$rate = $this->getRate($from, $to, $date); $rate = $this->getRate($from, $to, $date);
return bcmul($amount, $rate); return bcmul($amount, $rate);

4
app/Support/Http/Controllers/DateCalculation.php
View File

@@ -45,7 +45,7 @@ trait DateCalculation
public function activeDaysLeft(Carbon $start, Carbon $end): int public function activeDaysLeft(Carbon $start, Carbon $end): int
{ {
$difference = $start->diffInDays($end) + 1; $difference = $start->diffInDays($end) + 1;
$today = Carbon::now()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) { if ($start->lte($today) && $end->gte($today)) {
$difference = $today->diffInDays($end); $difference = $today->diffInDays($end);
@@ -67,7 +67,7 @@ trait DateCalculation
protected function activeDaysPassed(Carbon $start, Carbon $end): int protected function activeDaysPassed(Carbon $start, Carbon $end): int
{ {
$difference = $start->diffInDays($end) + 1; $difference = $start->diffInDays($end) + 1;
$today = Carbon::now()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
if ($start->lte($today) && $end->gte($today)) { if ($start->lte($today) && $end->gte($today)) {
$difference = $start->diffInDays($today) + 1; $difference = $start->diffInDays($today) + 1;

34
app/Support/Http/Controllers/GetConfigurationData.php
View File

@@ -95,7 +95,7 @@ trait GetConfigurationData
*/ */
protected function getDateRangeConfig(): array // get configuration + get preferences. protected function getDateRangeConfig(): array // get configuration + get preferences.
{ {
$viewRange = (string)app('preferences')->get('viewRange', '1M')->data; $viewRange = app('navigation')->getViewRange(false);
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start'); $start = session('start');
/** @var Carbon $end */ /** @var Carbon $end */
@@ -117,18 +117,20 @@ trait GetConfigurationData
$customPeriodEnd = app('navigation')->endOfPeriod($customPeriodStart, $viewRange); $customPeriodEnd = app('navigation')->endOfPeriod($customPeriodStart, $viewRange);
$ranges[$index] = [$customPeriodStart, $customPeriodEnd]; $ranges[$index] = [$customPeriodStart, $customPeriodEnd];
} }
// then add previous range and next range // then add previous range and next range, but skip this for the lastX and YTD stuff.
$previousDate = app('navigation')->subtractPeriod($start, $viewRange); if (!in_array($viewRange, config('firefly.dynamic_date_ranges', []), true)) {
$index = app('navigation')->periodShow($previousDate, $viewRange); $previousDate = app('navigation')->subtractPeriod($start, $viewRange);
$previousStart = app('navigation')->startOfPeriod($previousDate, $viewRange); $index = app('navigation')->periodShow($previousDate, $viewRange);
$previousEnd = app('navigation')->endOfPeriod($previousStart, $viewRange); $previousStart = app('navigation')->startOfPeriod($previousDate, $viewRange);
$ranges[$index] = [$previousStart, $previousEnd]; $previousEnd = app('navigation')->endOfPeriod($previousStart, $viewRange);
$ranges[$index] = [$previousStart, $previousEnd];
$nextDate = app('navigation')->addPeriod($start, $viewRange, 0); $nextDate = app('navigation')->addPeriod($start, $viewRange, 0);
$index = app('navigation')->periodShow($nextDate, $viewRange); $index = app('navigation')->periodShow($nextDate, $viewRange);
$nextStart = app('navigation')->startOfPeriod($nextDate, $viewRange); $nextStart = app('navigation')->startOfPeriod($nextDate, $viewRange);
$nextEnd = app('navigation')->endOfPeriod($nextStart, $viewRange); $nextEnd = app('navigation')->endOfPeriod($nextStart, $viewRange);
$ranges[$index] = [$nextStart, $nextEnd]; $ranges[$index] = [$nextStart, $nextEnd];
}
// today: // today:
/** @var Carbon $todayStart */ /** @var Carbon $todayStart */
@@ -140,22 +142,22 @@ trait GetConfigurationData
} }
// last seven days: // last seven days:
$seven = Carbon::now()->subDays(7); $seven = today(config('app.timezone'))->subDays(7);
$index = (string)trans('firefly.last_seven_days'); $index = (string)trans('firefly.last_seven_days');
$ranges[$index] = [$seven, new Carbon()]; $ranges[$index] = [$seven, new Carbon()];
// last 30 days: // last 30 days:
$thirty = Carbon::now()->subDays(30); $thirty = today(config('app.timezone'))->subDays(30);
$index = (string)trans('firefly.last_thirty_days'); $index = (string)trans('firefly.last_thirty_days');
$ranges[$index] = [$thirty, new Carbon()]; $ranges[$index] = [$thirty, new Carbon()];
// month to date: // month to date:
$monthBegin = Carbon::now()->startOfMonth(); $monthBegin = today(config('app.timezone'))->startOfMonth();
$index = (string)trans('firefly.month_to_date'); $index = (string)trans('firefly.month_to_date');
$ranges[$index] = [$monthBegin, new Carbon()]; $ranges[$index] = [$monthBegin, new Carbon()];
// year to date: // year to date:
$yearBegin = Carbon::now()->startOfYear(); $yearBegin = today(config('app.timezone'))->startOfYear();
$index = (string)trans('firefly.year_to_date'); $index = (string)trans('firefly.year_to_date');
$ranges[$index] = [$yearBegin, new Carbon()]; $ranges[$index] = [$yearBegin, new Carbon()];

14
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -85,7 +85,7 @@ trait PeriodOverview
*/ */
protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
[$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
// properties for cache // properties for cache
@@ -95,7 +95,7 @@ trait PeriodOverview
$cache->addProperty('account-show-period-entries'); $cache->addProperty('account-show-period-entries');
$cache->addProperty($account->id); $cache->addProperty($account->id);
if ($cache->has()) { if ($cache->has()) {
// return $cache->get(); return $cache->get();
} }
/** @var array $dates */ /** @var array $dates */
$dates = app('navigation')->blockPeriods($start, $end, $range); $dates = app('navigation')->blockPeriods($start, $end, $range);
@@ -276,7 +276,7 @@ trait PeriodOverview
*/ */
protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
[$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
// properties for entries with their amounts. // properties for entries with their amounts.
@@ -356,7 +356,7 @@ trait PeriodOverview
*/ */
protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
[$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
@@ -412,7 +412,7 @@ trait PeriodOverview
protected function getNoCategoryPeriodOverview(Carbon $theDate): array protected function getNoCategoryPeriodOverview(Carbon $theDate): array
{ {
Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d'))); Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d')));
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
$first = $this->journalRepos->firstNull(); $first = $this->journalRepos->firstNull();
$start = null === $first ? new Carbon() : $first->date; $start = null === $first ? new Carbon() : $first->date;
$end = clone $theDate; $end = clone $theDate;
@@ -483,7 +483,7 @@ trait PeriodOverview
*/ */
protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags. protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags.
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
[$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];
// properties for cache // properties for cache
@@ -558,7 +558,7 @@ trait PeriodOverview
*/ */
protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array
{ {
$range = app('preferences')->get('viewRange', '1M')->data; $range = app('navigation')->getViewRange(true);
$types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType)); $types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));
[$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];

8
app/Support/Http/Controllers/RequestInformation.php
View File

@@ -145,9 +145,9 @@ trait RequestInformation
final protected function notInSessionRange(Carbon $date): bool // Validate a preference final protected function notInSessionRange(Carbon $date): bool // Validate a preference
{ {
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', today(config('app.timezone'))->endOfMonth());
$result = false; $result = false;
if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) { if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
$result = true; $result = true;
@@ -175,7 +175,7 @@ trait RequestInformation
$attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate'])->startOfDay(); $attributes['startDate'] = Carbon::createFromFormat('Ymd', $attributes['startDate'])->startOfDay();
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage())); Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::now()->startOfMonth(); $date = today(config('app.timezone'))->startOfMonth();
$attributes['startDate'] = $date; $attributes['startDate'] = $date;
} }
@@ -183,7 +183,7 @@ trait RequestInformation
$attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate'])->endOfDay(); $attributes['endDate'] = Carbon::createFromFormat('Ymd', $attributes['endDate'])->endOfDay();
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
Log::debug(sprintf('Not important error message: %s', $e->getMessage())); Log::debug(sprintf('Not important error message: %s', $e->getMessage()));
$date = Carbon::now()->startOfMonth(); $date = today(config('app.timezone'))->startOfMonth();
$attributes['endDate'] = $date; $attributes['endDate'] = $date;
} }

42
app/Support/Navigation.php
View File

@@ -255,9 +255,9 @@ class Navigation
// and end added to $theCurrentEnd // and end added to $theCurrentEnd
if ('custom' === $repeatFreq) { if ('custom' === $repeatFreq) {
/** @var Carbon $tStart */ /** @var Carbon $tStart */
$tStart = session('start', Carbon::now()->startOfMonth()); $tStart = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $tEnd */ /** @var Carbon $tEnd */
$tEnd = session('end', Carbon::now()->endOfMonth()); $tEnd = session('end', today(config('app.timezone'))->endOfMonth());
$diffInDays = $tStart->diffInDays($tEnd); $diffInDays = $tStart->diffInDays($tEnd);
$currentEnd->addDays($diffInDays); $currentEnd->addDays($diffInDays);
@@ -428,6 +428,35 @@ class Navigation
return $date->format('Y-m-d'); return $date->format('Y-m-d');
} }
/**
* Returns the user's view range and if necessary, corrects the dynamic view
* range to a normal range.
* @param bool $correct
* @return string
*/
public function getViewRange(bool $correct): string
{
$range = (string)app('preferences')->get('viewRange', '1M')?->data ?? '1M';
if (!$correct) {
return $range;
}
switch ($range) {
default:
return $range;
case 'last7':
return '1W';
case 'last30':
case 'MTD':
return '1M';
case 'last90':
case 'QTD':
return '3M';
case 'last365':
case 'YTD':
return '1Y';
}
}
/** /**
* If the date difference between start and end is less than a month, method returns trans(config.month_and_day). If the difference is less than a year, * If the date difference between start and end is less than a month, method returns trans(config.month_and_day). If the difference is less than a year,
* method returns "config.month". If the date difference is larger, method returns "config.year". * method returns "config.month". If the date difference is larger, method returns "config.year".
@@ -573,9 +602,9 @@ class Navigation
// this is then subtracted from $theDate (* $subtract). // this is then subtracted from $theDate (* $subtract).
if ('custom' === $repeatFreq) { if ('custom' === $repeatFreq) {
/** @var Carbon $tStart */ /** @var Carbon $tStart */
$tStart = session('start', Carbon::now()->startOfMonth()); $tStart = session('start', today(config('app.timezone'))->startOfMonth());
/** @var Carbon $tEnd */ /** @var Carbon $tEnd */
$tEnd = session('end', Carbon::now()->endOfMonth()); $tEnd = session('end', today(config('app.timezone'))->endOfMonth());
$diffInDays = $tStart->diffInDays($tEnd); $diffInDays = $tStart->diffInDays($tEnd);
$date->subDays($diffInDays * $subtract); $date->subDays($diffInDays * $subtract);
@@ -621,6 +650,7 @@ class Navigation
*/ */
public function updateEndDate(string $range, Carbon $start): Carbon public function updateEndDate(string $range, Carbon $start): Carbon
{ {
Log::debug(sprintf('updateEndDate("%s", "%s")', $range, $start->format('Y-m-d')));
$functionMap = [ $functionMap = [
'1D' => 'endOfDay', '1D' => 'endOfDay',
'1W' => 'endOfWeek', '1W' => 'endOfWeek',
@@ -664,6 +694,9 @@ class Navigation
'MTD', 'MTD',
]; ];
if (in_array($range, $list, true)) { if (in_array($range, $list, true)) {
$end = today(config('app.timezone'));
$end->endOfDay();
Log::debug(sprintf('updateEndDate returns "%s"', $end->format('Y-m-d')));
return $end; return $end;
} }
@@ -680,6 +713,7 @@ class Navigation
*/ */
public function updateStartDate(string $range, Carbon $start): Carbon public function updateStartDate(string $range, Carbon $start): Carbon
{ {
Log::debug(sprintf('updateStartDate("%s", "%s")', $range, $start->format('Y-m-d')));
$functionMap = [ $functionMap = [
'1D' => 'startOfDay', '1D' => 'startOfDay',
'1W' => 'startOfWeek', '1W' => 'startOfWeek',

4
app/Support/ParseDateString.php
View File

@@ -128,7 +128,7 @@ class ParseDateString
*/ */
protected function parseKeyword(string $keyword): Carbon protected function parseKeyword(string $keyword): Carbon
{ {
$today = Carbon::today()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
return match ($keyword) { return match ($keyword) {
default => $today, default => $today,
@@ -164,7 +164,7 @@ class ParseDateString
{ {
Log::debug(sprintf('Now in parseRelativeDate("%s")', $date)); Log::debug(sprintf('Now in parseRelativeDate("%s")', $date));
$parts = explode(' ', $date); $parts = explode(' ', $date);
$today = Carbon::today()->startOfDay(); $today = today(config('app.timezone'))->startOfDay();
$functions = [ $functions = [
[ [
'd' => 'subDays', 'd' => 'subDays',

2
app/Support/Twig/General.php
View File

@@ -67,7 +67,7 @@ class General extends AbstractExtension
return '0'; return '0';
} }
/** @var Carbon $date */ /** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth()); $date = session('end', today(config('app.timezone'))->endOfMonth());
return app('steam')->balance($account, $date); return app('steam')->balance($account, $date);
} }

3
config/firefly.php
View File

@@ -878,6 +878,9 @@ return [
'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'], 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'], 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
// dynamic date ranges are as follows:
'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
// only used in v1 // only used in v1
'allowed_sort_parameters' => ['order', 'name', 'iban'], 'allowed_sort_parameters' => ['order', 'name', 'iban'],
]; ];

50
resources/views/preferences/index.twig
View File

@@ -193,6 +193,14 @@
</label> </label>
</div> </div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="last7" {% if viewRange == 'last7' %} checked {% endif %}>
{{ 'pref_last7'|_ }}
</label>
</div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="viewRange" <input type="radio" name="viewRange"
@@ -200,6 +208,20 @@
{{ 'pref_1M'|_ }} {{ 'pref_1M'|_ }}
</label> </label>
</div> </div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="last30" {% if viewRange == 'last30' %} checked {% endif %}>
{{ 'pref_last30'|_ }}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="MTD" {% if viewRange == 'MTD' %} checked {% endif %}>
{{ 'pref_MTD'|_ }}
</label>
</div>
<div class="radio"> <div class="radio">
<label> <label>
@@ -208,6 +230,20 @@
{{ 'pref_3M'|_ }} {{ 'pref_3M'|_ }}
</label> </label>
</div> </div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="last90" {% if viewRange == 'last90' %} checked {% endif %}>
{{ 'pref_last90'|_ }}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="QTD" {% if viewRange == 'QTD' %} checked {% endif %}>
{{ 'pref_QTD'|_ }}
</label>
</div>
<div class="radio"> <div class="radio">
<label> <label>
@@ -223,6 +259,20 @@
{{ 'pref_1Y'|_ }} {{ 'pref_1Y'|_ }}
</label> </label>
</div> </div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="YTD" {% if viewRange == 'YTD' %} checked {% endif %}>
{{ 'pref_YTD'|_ }}
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="viewRange"
value="last365" {% if viewRange == 'last365' %} checked {% endif %}>
{{ 'pref_last365'|_ }}
</label>
</div>
</div> </div>
</div> </div>