From 7ea32046af1e25795ac8f5741d267ddc9a142794 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 14 Mar 2020 08:03:43 +0100
Subject: [PATCH] Add icon.

---
 .../Controllers/Budget/IndexController.php    |  1 +
 app/Http/Requests/Request.php                 | 37 ++++++++-----------
 resources/lang/en_US/firefly.php              |  2 +
 resources/views/v1/budgets/index.twig         |  8 ++++
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index f783877877..32644396bc 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -160,6 +160,7 @@ class IndexController extends Controller
             $array             = $current->toArray();
             $array['spent']    = [];
             $array['budgeted'] = [];
+            $array['auto_budget'] = $this->repository->getAutoBudget($current);
             $budgetLimits      = $this->blRepository->getBudgetLimits($current, $start, $end);
 
             /** @var BudgetLimit $limit */
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index efbdad3311..b57524fd38 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -25,7 +25,6 @@ namespace FireflyIII\Http\Requests;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Exception;
-use FireflyIII\Models\AutoBudget;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
 use Log;
@@ -402,27 +401,21 @@ class Request extends FormRequest
         if (is_numeric($type)) {
             $type = (int)$type;
         }
-
-        switch ($type) {
-            case AutoBudget::AUTO_BUDGET_RESET:
-            case AutoBudget::AUTO_BUDGET_ROLLOVER:
-            case 'reset':
-            case 'rollover':
-                // basic float check:
-                if ('' === $amount) {
-                    $validator->errors()->add('auto_budget_amount', (string)trans('validation.amount_required_for_auto_budget'));
-                }
-                if (1 !== bccomp((string)$amount, '0')) {
-                    $validator->errors()->add('auto_budget_amount', (string)trans('validation.auto_budget_amount_positive'));
-                }
-                if ('' === $period) {
-                    $validator->errors()->add('auto_budget_period', (string)trans('validation.auto_budget_period_mandatory'));
-                }
-                if('' === $currencyCode && '' === $currencyId) {
-                    $validator->errors()->add('auto_budget_amount', (string)trans('validation.require_currency_info'));
-                }
-
-                break;
+        if (0 === $type || 'none' === $type) {
+            return;
+        }
+        // basic float check:
+        if ('' === $amount) {
+            $validator->errors()->add('auto_budget_amount', (string)trans('validation.amount_required_for_auto_budget'));
+        }
+        if (1 !== bccomp((string)$amount, '0')) {
+            $validator->errors()->add('auto_budget_amount', (string)trans('validation.auto_budget_amount_positive'));
+        }
+        if ('' === $period) {
+            $validator->errors()->add('auto_budget_period', (string)trans('validation.auto_budget_period_mandatory'));
+        }
+        if ('' === $currencyCode && '' === $currencyId) {
+            $validator->errors()->add('auto_budget_amount', (string)trans('validation.require_currency_info'));
         }
     }
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 55372eb1dd..04553a8a45 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -793,6 +793,8 @@ return [
     'auto_budget_period_half_year'              => 'Every half year',
     'auto_budget_period_yearly'                 => 'Yearly',
     'auto_budget_help'                          => 'You can read more about this feature in the help. Click the top-right (?) icon.',
+    'auto_budget_reset_icon'                    => 'This budget will be set periodically',
+    'auto_budget_rollover_icon'                 => 'The budget amount will increase periodically',
 
     // bills:
     'match_between_amounts'                     => 'Bill matches transactions between :low and :high.',
diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig
index 549b6b9bf4..12495926c8 100644
--- a/resources/views/v1/budgets/index.twig
+++ b/resources/views/v1/budgets/index.twig
@@ -234,6 +234,14 @@
                                     </div>
                                 </td>
                                 <td data-value="{{ budget.name }}">
+                                    {% if budget.auto_budget %}
+                                    {% if 1 == budget.auto_budget.auto_budget_type %}
+                                        <i class="fa fa-fw fa-calendar-check-o" title="{{ 'auto_budget_reset_icon'|_ }}"></i>
+                                    {% endif %}
+                                    {% if 2 == budget.auto_budget.auto_budget_type %}
+                                        <i class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></i>
+                                    {% endif %}
+                                    {% endif %}
                                     <a href="{{ route('budgets.show',budget.id) }}" data-id="{{ budget.id }}">{{ budget.name }}</a>
                                 </td>
                                 <td data-value="-1">