mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 23:45:10 +00:00
🤖 Auto commit for release 'develop' on 2025-08-10
This commit is contained in:
@@ -85,7 +85,7 @@ class AccountController extends Controller
|
|||||||
$query = $data['query'];
|
$query = $data['query'];
|
||||||
$date = $data['date'] ?? today(config('app.timezone'));
|
$date = $data['date'] ?? today(config('app.timezone'));
|
||||||
$return = [];
|
$return = [];
|
||||||
$timer = Timer::getInstance();
|
$timer = Timer::getInstance();
|
||||||
$timer->start(sprintf('AC accounts "%s"', $query));
|
$timer->start(sprintf('AC accounts "%s"', $query));
|
||||||
$result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
|
$result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
|
||||||
|
|
||||||
|
@@ -82,7 +82,7 @@ class ShowController extends Controller
|
|||||||
* */
|
* */
|
||||||
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
|
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
|
||||||
{
|
{
|
||||||
if(0 === $account->id) {
|
if (0 === $account->id) {
|
||||||
throw new NotFoundHttpException();
|
throw new NotFoundHttpException();
|
||||||
}
|
}
|
||||||
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
|
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
|
||||||
@@ -119,7 +119,7 @@ class ShowController extends Controller
|
|||||||
$firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
|
$firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
|
||||||
|
|
||||||
Log::debug('Start period overview');
|
Log::debug('Start period overview');
|
||||||
$timer = Timer::getInstance();
|
$timer = Timer::getInstance();
|
||||||
$timer->start('period-overview');
|
$timer->start('period-overview');
|
||||||
$periods = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
|
$periods = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
|
||||||
|
|
||||||
|
@@ -188,7 +188,7 @@ class ReportController extends Controller
|
|||||||
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
||||||
$end->endOfDay();
|
$end->endOfDay();
|
||||||
|
|
||||||
app('view')->share('subTitle', trans('firefly.report_default', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
|
app('view')->share('subTitle', trans('firefly.report_default', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]));
|
||||||
|
|
||||||
$generator = ReportGeneratorFactory::reportGenerator('Standard', $start, $end);
|
$generator = ReportGeneratorFactory::reportGenerator('Standard', $start, $end);
|
||||||
$generator->setAccounts($accounts);
|
$generator->setAccounts($accounts);
|
||||||
@@ -213,7 +213,7 @@ class ReportController extends Controller
|
|||||||
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
$start->endOfDay(); // end of day so the final balance is at the end of that day.
|
||||||
$end->endOfDay();
|
$end->endOfDay();
|
||||||
|
|
||||||
app('view')->share('subTitle', trans('firefly.report_double', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
|
app('view')->share('subTitle', trans('firefly.report_double', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]));
|
||||||
|
|
||||||
$generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
|
$generator = ReportGeneratorFactory::reportGenerator('Account', $start, $end);
|
||||||
$generator->setAccounts($accounts);
|
$generator->setAccounts($accounts);
|
||||||
|
@@ -80,7 +80,7 @@ trait PeriodOverview
|
|||||||
protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
|
protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
|
||||||
{
|
{
|
||||||
Log::debug('Now in getAccountPeriodOverview()');
|
Log::debug('Now in getAccountPeriodOverview()');
|
||||||
$timer = Timer::getInstance();
|
$timer = Timer::getInstance();
|
||||||
$timer->start('account-period-total');
|
$timer->start('account-period-total');
|
||||||
$this->accountRepository = app(AccountRepositoryInterface::class);
|
$this->accountRepository = app(AccountRepositoryInterface::class);
|
||||||
$range = Navigation::getViewRange(true);
|
$range = Navigation::getViewRange(true);
|
||||||
|
@@ -78,8 +78,8 @@ return [
|
|||||||
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
|
||||||
// see cer.php for exchange rates feature flag.
|
// see cer.php for exchange rates feature flag.
|
||||||
],
|
],
|
||||||
'version' => 'develop/2025-08-09',
|
'version' => 'develop/2025-08-10',
|
||||||
'build_time' => 1754766074,
|
'build_time' => 1754800876,
|
||||||
'api_version' => '2.1.0', // field is no longer used.
|
'api_version' => '2.1.0', // field is no longer used.
|
||||||
'db_version' => 26,
|
'db_version' => 26,
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user