kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix #10799

Browse Source
This commit is contained in:
James Cole
2025-08-22 06:49:16 +02:00
parent 1ba641c279
commit 96a66b894a
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,6 @@ class IndexController extends Controller
$spent = $spentArr[$this->primaryCurrency->id]['sum'] ?? '0'; $spent = $spentArr[$this->primaryCurrency->id]['sum'] ?? '0';
unset($spentArr); unset($spentArr);
} }
// number of days for consistent budgeting. // number of days for consistent budgeting.
$activeDaysPassed = $this->activeDaysPassed($start, $end); // see method description. $activeDaysPassed = $this->activeDaysPassed($start, $end); // see method description.
$activeDaysLeft = $this->activeDaysLeft($start, $end); // see method description. $activeDaysLeft = $this->activeDaysLeft($start, $end); // see method description.

3
app/Repositories/Webhook/WebhookRepository.php
View File

@@ -55,6 +55,9 @@ class WebhookRepository implements WebhookRepositoryInterface, UserGroupInterfac
public function destroy(Webhook $webhook): void public function destroy(Webhook $webhook): void
{ {
// force delete all messages and attempts:
$webhook->webhookMessages()->delete();
$webhook->delete(); $webhook->delete();
} }

15
resources/views/budgets/index.twig
View File

@@ -356,16 +356,17 @@
</span> </span>
<br/> <br/>
{% endif %} {% endif %}
{% if spentInfo.currency_id == budgetLimit.currency_id and not budgetLimit.in_range %}
<span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
{{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
</span>
<span class="text-muted">({{ 'unknown'|_ }})</span>
{% endif %}
{% endfor %} {% endfor %}
{% if countLimit == 0 %} {% if countLimit == 0 %}
{# display nothing #}
{# this code is used for budget limits OUTSIDE the current view range. #}
<span class="left_span" data-id="{{ budget.id }}" data-currency="{{ spentInfo.currency_id }}" data-limit="0"
class="amount_left" data-value="{{ spentInfo.spent }}">
{{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
</span>
<br/>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% for budgetLimit in budget.budgeted %} {% for budgetLimit in budget.budgeted %}