Skip to content

Firefly III: a personal finances manager

Fix #10399

James Colec5cbceb81ab8
diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php
index 4ad02aefd5..48b901c3e4 100644
--- a/app/Http/Requests/SelectTransactionsRequest.php
+++ b/app/Http/Requests/SelectTransactionsRequest.php
@@ -41,15 +41,9 @@ class SelectTransactionsRequest extends FormRequest
*/
public function rules(): array
{
- // fixed
- /** @var Carbon $sessionFirst */
- $sessionFirst = clone session('first');
- $first = $sessionFirst->subDay()->format('Y-m-d');
- $today = today(config('app.timezone'))->addDay()->format('Y-m-d');
-
return [
- 'start' => 'required|date|after:'.$first,
- 'end' => 'required|date|before:'.$today,
+ 'start' => 'required|date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
+ 'end' => 'required|date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
'accounts' => 'required',
'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
];
diff --git a/app/Support/Http/Api/ExchangeRateConverter.php b/app/Support/Http/Api/ExchangeRateConverter.php
index 2149545a69..acaf0b907f 100644
--- a/app/Support/Http/Api/ExchangeRateConverter.php
+++ b/app/Support/Http/Api/ExchangeRateConverter.php
@@ -79,12 +79,12 @@ class ExchangeRateConverter
public function getCurrencyRate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): string
{
if (false === $this->enabled()) {
- Log::debug('ExchangeRateConverter: disabled, return "1".');
+ // Log::debug('ExchangeRateConverter: disabled, return "1".');
return '1';
}
if ($from->id === $to->id) {
- Log::debug('ExchangeRateConverter: From and to are the same, return "1".');
+// Log::debug('ExchangeRateConverter: From and to are the same, return "1".');
return '1';
}
diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php
index 8104d133e3..1fae6214dd 100644
--- a/app/Support/Http/Controllers/PeriodOverview.php
+++ b/app/Support/Http/Controllers/PeriodOverview.php
@@ -35,6 +35,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Debug\Timer;
+use Illuminate\Support\Facades\Log;
/**
* Trait PeriodOverview.
@@ -77,6 +78,7 @@ trait PeriodOverview
*/
protected function getAccountPeriodOverview(Account $account, Carbon $start, Carbon $end): array
{
+ Log::debug('Now in getAccountPeriodOverview()');
Timer::start('account-period-total');
$this->accountRepository = app(AccountRepositoryInterface::class);
$range = app('navigation')->getViewRange(true);
@@ -100,6 +102,7 @@ trait PeriodOverview
$transactions = $this->accountRepository->periodCollection($account, $start, $end);
// loop dates
+ Log::debug(sprintf('Count of loops: %d', count($dates)));
foreach ($dates as $currentDate) {
$title = app('navigation')->periodShow($currentDate['start'], $currentDate['period']);
[$transactions, $spent] = $this->filterTransactionsByType(TransactionTypeEnum::WITHDRAWAL, $transactions, $currentDate['start'], $currentDate['end']);
@@ -119,6 +122,7 @@ trait PeriodOverview
}
$cache->store($entries);
Timer::stop('account-period-total');
+ Log::debug('End of getAccountPeriodOverview()');
return $entries;
}
diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig
index 5c1354023f..e17abb91fb 100644
--- a/resources/views/list/groups.twig
+++ b/resources/views/list/groups.twig
@@ -163,6 +163,7 @@
{% endif %}
</td>
<td style="{{ style|raw }};text-align:right">
+
{# deposit #}
{% if transaction.transaction_type_type == 'Deposit' %}
{# amount of deposit #}