diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 03e1df4d77..67aa55fef0 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -93,6 +93,7 @@ class AccountController extends Controller $currency = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency; $useCurrency = $currency; if (in_array($account->accountType->type, $this->balanceTypes, true)) { + // this one is correct. Log::debug(sprintf('accounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); $balance = Steam::finalAccountBalance($account, $date); $key = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance'; diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index bfa87e9b80..fff2b3afb4 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -136,6 +136,7 @@ class MonthReportGenerator implements ReportGeneratorInterface ; $journals = $collector->getExtractedJournals(); $journals = array_reverse($journals, true); + // this call is correct. Log::debug(sprintf('getAuditReport: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); $dayBeforeBalance = Steam::finalAccountBalance($account, $date); $startBalance = $dayBeforeBalance['balance']; @@ -171,6 +172,7 @@ class MonthReportGenerator implements ReportGeneratorInterface $journals[$index]['invoice_date'] = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date'); } $locale = app('steam')->getLocale(); + // call is correct. Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String())); return [ 'journals' => $journals, diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index d0fd078e87..ee018d8bf2 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -115,6 +115,7 @@ class ReconcileController extends Controller $startDate = clone $start; $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59 + // both are validated and are correct. Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String())); Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); $startBalance = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places); diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index c5f7ce8bcf..28d6bdcf3f 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -136,6 +136,7 @@ class ShowController extends Controller $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')])); $showAll = false; + // correct Log::debug(sprintf('show: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); $balances = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency); @@ -202,6 +203,7 @@ class ShowController extends Controller $groups->setPath(route('accounts.show.all', [$account->id])); $chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $showAll = true; + // correct Log::debug(sprintf('showAll: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); $balances = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 709f1da811..649d973c3e 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -424,6 +424,7 @@ class AccountController extends Controller { $start->startOfDay(); $end->endOfDay(); + // TODO not sure if these date ranges will work as expected. Log::debug(sprintf('Now in period("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s'))); $chartData = []; $cache = new CacheProperties(); @@ -456,6 +457,7 @@ class AccountController extends Controller // temp, get end balance. Log::debug('temp get end balance'); Log::debug(sprintf('period: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); + // correct Steam::finalAccountBalance($account, $end); Log::debug('END temp get end balance done'); diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 3f2be33aac..5469be7251 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -195,6 +195,7 @@ class ReconcileController extends Controller $startDate->subDay(); $currency = $this->accountRepos->getAccountCurrency($account) ?? $this->defaultCurrency; + // correct Log::debug(sprintf('transactions: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String())); Log::debug(sprintf('transactions2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); $startBalance = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);