diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index efe15e03bb..95f6d2167d 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -122,6 +122,9 @@ class IndexController extends Controller $availableBudgets = $this->getAllAvailableBudgets($start, $end); // get all active budgets: $budgets = $this->getAllBudgets($start, $end, $currencies, $this->primaryCurrency); + +// echo '
';
+// var_dump($budgets[0]);exit;
$sums = $this->getSums($budgets);
// get budgeted for default currency:
diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index 014742cc74..b80d34798d 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -366,13 +366,21 @@
{% endif %}
- {% if spentInfo.currency_id == budgetLimit.currency_id and not budgetLimit.in_range %}
+ {% if spentInfo.currency_id == budgetLimit.currency_id and not budgetLimit.in_range and 0.0 == budgetLimit.total_days %}
{{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
({{ 'unknown'|_ }})
{% endif %}
+ {% if spentInfo.currency_id == budgetLimit.currency_id and not budgetLimit.in_range and 0.0 != budgetLimit.total_days %}
+
+ {{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
+
+ ({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / budgetLimit.total_days, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+ {% endif %}
+
{% endfor %}
{% if countLimit == 0 %}